diff --git a/lib-src/libsndfile/0001-Add-support-for-Album-and-Track-tags-in-RIFF-files-for-libsndfile-1.0.24.patch b/lib-src/libsndfile/0001-Add-support-for-Album-and-Track-tags-in-RIFF-files-for-libsndfile-1.0.24.patch deleted file mode 100644 index 6499cb72a..000000000 --- a/lib-src/libsndfile/0001-Add-support-for-Album-and-Track-tags-in-RIFF-files-for-libsndfile-1.0.24.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: src/wav.c -=================================================================== ---- src/wav.c (revision 12460) -+++ src/wav.c (working copy) -@@ -89,6 +89,8 @@ - #define ISRC_MARKER (MAKE_MARKER ('I', 'S', 'R', 'C')) - #define ISBJ_MARKER (MAKE_MARKER ('I', 'S', 'B', 'J')) - #define ICMT_MARKER (MAKE_MARKER ('I', 'C', 'M', 'T')) -+#define IAUT_MARKER (MAKE_MARKER ('I', 'A', 'U', 'T')) -+#define ITRK_MARKER (MAKE_MARKER ('I', 'T', 'R', 'K')) - - /* Weird WAVPACK marker which can show up at the start of the DATA section. */ - #define wvpk_MARKER (MAKE_MARKER ('w', 'v', 'p', 'k')) -@@ -1208,6 +1210,14 @@ - psf_binheader_writef (psf, "ms", IGNR_MARKER, psf->strings [k].str) ; - break ; - -+ case SF_STR_ALBUM : -+ psf_binheader_writef (psf, "ms", IPRD_MARKER, psf->strings [k].str) ; -+ break ; -+ -+ case SF_STR_TRACKNUMBER : -+ psf_binheader_writef (psf, "ms", ITRK_MARKER, psf->strings [k].str) ; -+ break ; -+ - default : - break ; - } ; -@@ -1338,6 +1348,8 @@ - case IPRD_MARKER : - case ISBJ_MARKER : - case ISRC_MARKER : -+ case IAUT_MARKER : -+ case ITRK_MARKER : - bytesread += psf_binheader_readf (psf, "4", &dword) ; - dword += (dword & 1) ; - if (dword >= SIGNED_SIZEOF (psf->u.cbuf)) -@@ -1434,6 +1446,12 @@ - case IGNR_MARKER : - psf_store_string (psf, SF_STR_GENRE, psf->u.cbuf) ; - break ; -+ case IPRD_MARKER : -+ psf_store_string (psf, SF_STR_ALBUM, psf->u.cbuf) ; -+ break ; -+ case ITRK_MARKER : -+ psf_store_string (psf, SF_STR_TRACKNUMBER, psf->u.cbuf) ; -+ break ; - } ; - } ; - diff --git a/lib-src/libsndfile/0001-Add-support-for-Album-and-Track-tags-in-RIFF-files-for-libsndfile-1.0.25.patch b/lib-src/libsndfile/0001-Add-support-for-Album-and-Track-tags-in-RIFF-files-for-libsndfile-1.0.25.patch deleted file mode 100644 index b5635c292..000000000 --- a/lib-src/libsndfile/0001-Add-support-for-Album-and-Track-tags-in-RIFF-files-for-libsndfile-1.0.25.patch +++ /dev/null @@ -1,63 +0,0 @@ ->From 526864fc49542c8be0a117ae39c45902f86a4ccd Mon Sep 17 00:00:00 2001 -From: Richard Ash -Date: Fri, 16 Aug 2013 22:40:15 +0100 -Subject: [PATCH] Add support for Album and Track tags in RIFF files - Add support for Album and Track tags in RIFF files in the LIST chunk of WAV files - as per other formats. Patch by Joel Bouchat against - libsndfile 1.0.24, forward-ported by Richard Ash - ---- - src/wav.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/wav.c b/src/wav.c -index daaba39..d28b18d 100644 ---- a/src/wav.c -+++ b/src/wav.c -@@ -104,6 +104,7 @@ - #define ISBJ_MARKER (MAKE_MARKER ('I', 'S', 'B', 'J')) - #define ICMT_MARKER (MAKE_MARKER ('I', 'C', 'M', 'T')) - #define IAUT_MARKER (MAKE_MARKER ('I', 'A', 'U', 'T')) -+#define ITRK_MARKER (MAKE_MARKER ('I', 'T', 'R', 'K')) - - /* Weird WAVPACK marker which can show up at the start of the DATA section. */ - #define wvpk_MARKER (MAKE_MARKER ('w', 'v', 'p', 'k')) -@@ -1253,6 +1254,14 @@ wav_write_strings (SF_PRIVATE *psf, int location) - psf_binheader_writef (psf, "ms", IGNR_MARKER, psf->strings.storage + psf->strings.data [k].offset) ; - break ; - -+ case SF_STR_ALBUM : -+ psf_binheader_writef (psf, "ms", IPRD_MARKER, psf->strings.storage + psf->strings.data [k].offset) ; -+ break ; -+ -+ case SF_STR_TRACKNUMBER : -+ psf_binheader_writef (psf, "ms", ITRK_MARKER, psf->strings.storage + psf->strings.data [k].offset) ; -+ break ; -+ - default : - break ; - } ; -@@ -1384,6 +1393,7 @@ wav_subchunk_parse (SF_PRIVATE *psf, int chunk, uint32_t length) - case ISBJ_MARKER : - case ISRC_MARKER : - case IAUT_MARKER : -+ case ITRK_MARKER : - bytesread += psf_binheader_readf (psf, "4", &dword) ; - dword += (dword & 1) ; - if (dword >= SIGNED_SIZEOF (buffer)) -@@ -1477,6 +1487,12 @@ wav_subchunk_parse (SF_PRIVATE *psf, int chunk, uint32_t length) - case IGNR_MARKER : - psf_store_string (psf, SF_STR_GENRE, buffer) ; - break ; -+ case IPRD_MARKER : -+ psf_store_string (psf, SF_STR_ALBUM, buffer) ; -+ break ; -+ case ITRK_MARKER : -+ psf_store_string (psf, SF_STR_TRACKNUMBER, buffer) ; -+ break ; - } ; - } ; - --- -1.8.1.5 - diff --git a/lib-src/libsndfile/AUTHORS b/lib-src/libsndfile/AUTHORS index b7e2232b9..b91ec9202 100644 --- a/lib-src/libsndfile/AUTHORS +++ b/lib-src/libsndfile/AUTHORS @@ -12,3 +12,46 @@ apart from code in the following directories: modifications were required to integrate these files into libsndfile. The changes are listed in src/G72x/ChangeLog. + +Others: + + 2013-03-07 Michael Pruett + 2013-02-11 Chris Roberts c.roberts@csrfm.com + 2012-03-17 IOhannes m zmoelnig + 2013-02-21 Jan Starry + 2012-01-20 Bodo + 2011-06-23 Tim van der Molen + 2010-12-01 Tim Blechmann + 2010-10-04 Matti Nykyri + 2010-09-17 Brian Lewis + 2010-02-22 Robin Gareus + 2010-01-07 Christian Weisgerber and Jacob Meuserto + 2009-10-18 Olivier Tristan + 2009-10-14, 2009-08-30 Uli Franke + 2009-06-24, 2008-11-19, 2004-09-22, 2004-06-17, 2003-05-03, 2003-05-02 Conrad Parker + 2009-05-22 Lennart Poettering + 2008-07-03, 2006-10-22, 2006-10-18 Fons Adriaensen + 2008-04-19 David Yeo + 2008-01-20 Yair K. + 2007-12-03 Robs + 2007-07-12 Ed Schouten + 2007-06-07 Trent Apted + 2007-04-14, 2003-12-12 André Pang + 2007-04-14 Reuben Thomas + 2006-11-09 Jonathan Woithe + 2006-03-26 Diego 'Flameeyes' Pettenò + 2006-03-17 Paul Davis + 2006-03-09 Jesse Chappell + 2006-01-09, 2005-12-28 John ffitch + 2005-09-21 David A. van Leeuwen + 2005-08-15 Mo DeJong + 2005-04-30 David Viens + 2004-12-29 Steve Baker + 2004-09-05 Denis Cote + 2004-06-28 Stanko Juzbasic + 2004-02-14 Frank Neumann + 2003-08-15 Axel Röbel + 2003-08-06 Peter Miller + 2003-07-21 Tero Pelander + 2003-02-10 Antoine Mathys + 2002-12-30 Marek Peteraj diff --git a/lib-src/libsndfile/Building-for-Android.md b/lib-src/libsndfile/Building-for-Android.md new file mode 100644 index 000000000..72b302d46 --- /dev/null +++ b/lib-src/libsndfile/Building-for-Android.md @@ -0,0 +1,17 @@ +# Building for Android + +Assuming the Android Ndk is installed at location `/path/to/toolchain`, building +libsndfile for Android (arm-linux-androideabi) should be as simple as: +``` +./autogen.sh +export ANDROID_TOOLCHAIN_HOME=/path/to/android/toolchain +./Scripts/android-configure.sh +make +``` +The `Scripts/android-configure.sh` contains four of variables; `ANDROID_NDK_VER`, +`ANDROID_GCC_VER`, `ANDROID_API_VER` and `ANDROID_TARGET` that can be overridden +by setting them before the script is run. + +Since I (erikd), do almost zero Android development, I am happy accept patches +for this documentation and script to improve its utility for real Android +developers. diff --git a/lib-src/libsndfile/CMakeLists.txt b/lib-src/libsndfile/CMakeLists.txt new file mode 100644 index 000000000..b75d6cb6f --- /dev/null +++ b/lib-src/libsndfile/CMakeLists.txt @@ -0,0 +1,1346 @@ +cmake_minimum_required (VERSION 3.1.3) + +if (POLICY CMP0091) + cmake_policy(SET CMP0091 NEW) +endif () + +project(sndfile VERSION 1.0.29) + +# +# Variables +# + +set (CMAKE_C_STANDARD 99) +set (CMAKE_C_STANDARD_REQUIRED TRUE) +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +set (PACKAGE_NAME lib${PROJECT_NAME}) +set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) +set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) +set (CPACK_PACKAGE_VERSION_STAGE "pre1") +set (CPACK_PACKAGE_VERSION_FULL "${PROJECT_VERSION}${CPACK_PACKAGE_VERSION_STAGE}") + +# +# System-wide includes +# + +# Set proper default documentation install directory based on canonical +# package name, not CMake project name. This option can still be overridden. +if(NOT CMAKE_INSTALL_DOCDIR) + set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/libsndfile") +endif() +include (GNUInstallDirs) +include (FeatureSummary) +include (CMakeDependentOption) +include (CTest) + +# +# Options +# + +option (BUILD_SHARED_LIBS "Build shared libraries" OFF) +if (BUILD_SHARED_LIBS AND BUILD_TESTING) + set (BUILD_TESTING OFF) + message ("Build testing required static libraries. To prevent build errors BUILD_TESTING disabled.") +endif () +option (BUILD_PROGRAMS "Build programs" ON) +option (BUILD_EXAMPLES "Build examples" ON) +option (ENABLE_CPACK "Enable CPack support" ON) +option (ENABLE_EXPERIMENTAL "Enable experimental code" OFF) +option (ENABLE_BOW_DOCS "Enable black-on-white html docs" OFF) +if (MSVC OR MINGW) + option (ENABLE_STATIC_RUNTIME "Enable static runtime" OFF) +endif () +option (ENABLE_PACKAGE_CONFIG "Generate and install package config file" ON) + +list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +# +# Setup definitions +# + +include(SndFileChecks) + + +cmake_dependent_option (BUILD_REGTEST "Build regtest" ON "SQLITE3_FOUND" OFF) +cmake_dependent_option (ENABLE_EXTERNAL_LIBS "Enable FLAC, Vorbis, and Opus codecs" ON "VORBISENC_FOUND;FLAC_FOUND;OPUS_FOUND" OFF) +cmake_dependent_option (ENABLE_CPU_CLIP "Enable tricky cpu specific clipper" ON "CPU_CLIPS_POSITIVE;CPU_CLIPS_NEGATIVE" OFF) +if (NOT ENABLE_CPU_CLIP) + set (CPU_CLIPS_POSITIVE FALSE) + set (CPU_CLIPS_NEGATIVE FALSE) +endif () +cmake_dependent_option (ENABLE_COMPATIBLE_LIBSNDFILE_NAME "Set DLL name to libsndfile-1.dll (canonical name), sndfile.dll otherwise" OFF "WIN32;NOT MINGW;BUILD_SHARED_LIBS" OFF) + +set (HAVE_EXTERNAL_XIPH_LIBS ${ENABLE_EXTERNAL_LIBS}) +set (HAVE_SQLITE3 ${BUILD_REGTEST}) +set (HAVE_ALSA_ASOUNDLIB_H ${ALSA_FOUND}) +set (HAVE_SNDIO_H ${SNDIO_FOUND}) + +set (ENABLE_EXPERIMENTAL_CODE ${ENABLE_EXPERIMENTAL}) +set (HAVE_SPEEX ${ENABLE_EXPERIMENTAL}) +set (HAVE_OPUS ${ENABLE_EXPERIMENTAL}) + +add_feature_info (BUILD_SHARED_LIBS BUILD_SHARED_LIBS "build shared libraries") +add_feature_info (ENABLE_EXTERNAL_LIBS ENABLE_EXTERNAL_LIBS "enable FLAC, Vorbis, and Opus codecs") +add_feature_info (ENABLE_EXPERIMENTAL ENABLE_EXPERIMENTAL "enable experimental code") +add_feature_info (BUILD_TESTING BUILD_TESTING "build tests") +add_feature_info (BUILD_REGTEST BUILD_REGTEST "build regtest") +add_feature_info (ENABLE_CPACK ENABLE_CPACK "enable CPack support") +add_feature_info (ENABLE_CPU_CLIP ENABLE_CPU_CLIP "Enable tricky cpu specific clipper") +add_feature_info (ENABLE_BOW_DOCS ENABLE_BOW_DOCS "enable black-on-white html docs") +add_feature_info (ENABLE_PACKAGE_CONFIG ENABLE_PACKAGE_CONFIG "generate and install package config file") +if (WIN32 AND (NOT MINGW) AND BUILD_SHARED_LIBS) + add_feature_info (ENABLE_COMPATIBLE_LIBSNDFILE_NAME ENABLE_COMPATIBLE_LIBSNDFILE_NAME "Set DLL name to libsndfile-1.dll (canonical name), sndfile.dll otherwise") +endif () + +if (MSVC OR MINGW) + add_feature_info (ENABLE_STATIC_RUNTIME ENABLE_STATIC_RUNTIME "Enable static runtime") +endif () + +set_package_properties (Ogg PROPERTIES + TYPE RECOMMENDED + URL "www.xiph.org/ogg/" + DESCRIPTION "library for manipulating ogg bitstreams" + PURPOSE "Required to enable Vorbis, Speex, and Opus support" + ) +set_package_properties (VorbisEnc PROPERTIES + TYPE RECOMMENDED + URL "www.vorbis.com/" + DESCRIPTION "open source lossy audio codec" + PURPOSE "Enables Vorbis support" + ) +set_package_properties (FLAC PROPERTIES + TYPE RECOMMENDED + URL "www.xiph.org/flac/" + DESCRIPTION "Free Lossless Audio Codec Library" + PURPOSE "Enables FLAC support" + ) +set_package_properties(Opus PROPERTIES + TYPE RECOMMENDED + URL "www.opus-codec.org/" + DESCRIPTION "Standardized open source low-latency fullband codec" + PURPOSE "Enables experimental Opus support" + ) +set_package_properties(Speex PROPERTIES TYPE OPTIONAL + URL "www.speex.org/" + DESCRIPTION "an audio codec tuned for speech" + PURPOSE "Enables experemental Speex support" + ) +set_package_properties (SQLite3 PROPERTIES + TYPE OPTIONAL + URL "www.sqlite.org/" + DESCRIPTION "light weight SQL database engine." + PURPOSE "Enables regtest" + ) +if (BUILD_SHARED_LIBS) + set_package_properties (PythonInterp PROPERTIES + TYPE REQUIRED + URL "www.python.org/" + DESCRIPTION "Python is a widely used high-level programming language." + PURPOSE "Required to build shared libraries" + ) +endif() + +feature_summary (WHAT ALL) + +# +# Setup configuration +# + +configure_file (src/config.h.cmake src/config.h) + +configure_file (src/sndfile.h.in src/sndfile.h) + +set (prefix ${CMAKE_INSTALL_PREFIX}) +set (exec_prefix "\$\{prefix\}") +set (libdir "\$\{prefix\}/${CMAKE_INSTALL_LIBDIR}") +set (includedir "\$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") +set (VERSION ${PROJECT_VERSION}) +if (ENABLE_EXTERNAL_LIBS) + set (EXTERNAL_XIPH_REQUIRE "flac ogg vorbis vorbisenc opus") + if (ENABLE_EXPERIMENTAL) + set (EXTERNAL_XIPH_REQUIRE "${EXTERNAL_XIPH_REQUIRE} speex") + endif () +endif () +configure_file (sndfile.pc.in sndfile.pc @ONLY) + +# +# libsndfile +# + +# Public libsndfile headers +set (sndfile_HDRS + src/sndfile.hh + ${CMAKE_CURRENT_BINARY_DIR}/src/sndfile.h + ) + +# +# libsndfile static library +# + +add_library (sndfile + src/sfconfig.h + src/sfendian.h + src/sf_unistd.h + src/common.h + src/common.c + src/file_io.c + src/command.c + src/pcm.c + src/ulaw.c + src/alaw.c + src/float32.c + src/double64.c + src/ima_adpcm.c + src/ms_adpcm.c + src/gsm610.c + src/dwvw.c + src/vox_adpcm.c + src/interleave.c + src/strings.c + src/dither.c + src/cart.c + src/broadcast.c + src/audio_detect.c + src/ima_oki_adpcm.c + src/ima_oki_adpcm.h + src/alac.c + src/chunk.c + src/ogg.h + src/ogg.c + src/chanmap.h + src/chanmap.c + src/id3.c + $<$:src/windows.c> + $<$,$>:src/version-metadata.rc> + src/sndfile.c + src/aiff.c + src/au.c + src/avr.c + src/caf.c + src/dwd.c + src/flac.c + src/g72x.c + src/htk.c + src/ircam.c + src/macos.c + src/mat4.c + src/mat5.c + src/nist.c + src/paf.c + src/pvf.c + src/raw.c + src/rx2.c + src/sd2.c + src/sds.c + src/svx.c + src/txw.c + src/voc.c + src/wve.c + src/w64.c + src/wavlike.h + src/wavlike.c + src/wav.c + src/xi.c + src/mpc2k.c + src/rf64.c + src/ogg_vorbis.c + src/ogg_speex.c + src/ogg_pcm.c + src/ogg_opus.c + src/ogg_vcomment.c + src/nms_adpcm.c + src/GSM610/config.h + src/GSM610/gsm.h + src/GSM610/gsm610_priv.h + src/GSM610/add.c + src/GSM610/code.c + src/GSM610/decode.c + src/GSM610/gsm_create.c + src/GSM610/gsm_decode.c + src/GSM610/gsm_destroy.c + src/GSM610/gsm_encode.c + src/GSM610/gsm_option.c + src/GSM610/long_term.c + src/GSM610/lpc.c + src/GSM610/preprocess.c + src/GSM610/rpe.c + src/GSM610/short_term.c + src/GSM610/table.c + src/G72x/g72x.h + src/G72x/g72x_priv.h + src/G72x/g721.c + src/G72x/g723_16.c + src/G72x/g723_24.c + src/G72x/g723_40.c + src/G72x/g72x.c + src/ALAC/ALACAudioTypes.h + src/ALAC/ALACBitUtilities.h + src/ALAC/EndianPortable.h + src/ALAC/aglib.h + src/ALAC/dplib.h + src/ALAC/matrixlib.h + src/ALAC/alac_codec.h + src/ALAC/shift.h + src/ALAC/ALACBitUtilities.c + src/ALAC/ag_dec.c + src/ALAC/ag_enc.c + src/ALAC/dp_dec.c + src/ALAC/dp_enc.c + src/ALAC/matrix_dec.c + src/ALAC/matrix_enc.c + src/ALAC/alac_decoder.c + src/ALAC/alac_encoder.c + ${sndfile_HDRS} + ${CMAKE_CURRENT_BINARY_DIR}/src/config.h + ) + +target_include_directories(sndfile + PUBLIC + $ + $ + $ + ) +target_link_libraries (sndfile + PRIVATE + $<$:m> + $<$:Vorbis::VorbisEnc> + $<$:FLAC::FLAC> + $<$,$,$>:Speex::Speex> + $<$:Opus::opus> + ) +set_target_properties (sndfile PROPERTIES + PUBLIC_HEADER "${sndfile_HDRS}" + ) + +if (ENABLE_COMPATIBLE_LIBSNDFILE_NAME) + set_target_properties (sndfile PROPERTIES + RUNTIME_OUTPUT_NAME "libsndfile-1" + ) +endif () + +if (BUILD_SHARED_LIBS) + + if (WIN32) + set (VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) + set (GEN_TOOL cmake) + + set (WIN_RC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR},${CPACK_PACKAGE_VERSION_MINOR},${CPACK_PACKAGE_VERSION_PATCH}") + set (CLEAN_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + set (PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}) + + configure_file (src/version-metadata.rc.in src/version-metadata.rc @ONLY) + endif () + + set_target_properties (sndfile PROPERTIES + SOVERSION ${PROJECT_VERSION_MAJOR} + VERSION ${PROJECT_VERSION} + ) + + # Symbol files generation + + if (WIN32) + set (SYMBOL_FILENAME "sndfile.def") + set (SYMBOL_OS "win32") + elseif ((CMAKE_SYSTEM_NAME MATCHES "Darwin") OR (CMAKE_SYSTEM_NAME MATCHES "Rhapsody")) + set (SYMBOL_FILENAME "Symbols.darwin") + set (SYMBOL_OS "darwin") + elseif (CMAKE_SYSTEM_NAME MATCHES "OS2") + set (SYMBOL_FILENAME "Symbols.os2") + set (SYMBOL_OS "os2") + elseif (UNIX) + set (SYMBOL_FILENAME "Symbols.gnu-binutils") + set (SYMBOL_OS "linux") + endif () + + if (DEFINED SYMBOL_OS) + add_custom_command ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME} + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/create_symbols_file.py ${SYMBOL_OS} ${PROJECT_VERSION_MAJOR} > ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME} + COMMENT "Generating ${SYMBOL_FILENAME}..." + ) + + add_custom_target (GENFILES DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}) + if (SYMBOL_OS MATCHES "win32") + target_sources (sndfile + PRIVATE + ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME} + ) + elseif (SYMBOL_OS MATCHES "darwin") + add_dependencies (sndfile GENFILES) + set_property (TARGET sndfile APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-exported_symbols_list -Wl,${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}" + ) + elseif (SYMBOL_OS MATCHES "os") + add_dependencies (sndfile GENFILES) + set_property (TARGET sndfile APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-export-symbols ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}" + ) + elseif (UNIX) + add_dependencies (sndfile GENFILES) + set_property (TARGET sndfile APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}" + ) + endif() + endif() + +endif () + +# +# Programs +# + +if (BUILD_PROGRAMS) + +# sndfile-info + + add_executable (sndfile-info + programs/sndfile-info.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-info + PRIVATE + sndfile + $<$:m> + ) + +# sndfile-play + + add_executable (sndfile-play + $<$>:programs/sndfile-play.c> + $<$>:programs/common.c> + $<$>:programs/sndfile-play.c> + $<$:programs/sndfile-play-beos.cpp> + ) + target_link_libraries (sndfile-play PRIVATE $<$:m>) + target_link_libraries (sndfile-play PRIVATE sndfile) + if (WIN32) + target_link_libraries(sndfile-play PRIVATE winmm) + # Maybe ALSA & Sndio are present in BeOS. They are not required + # so skip them anyway. + elseif ((NOT BEOS) AND ALSA_FOUND) + target_include_directories (sndfile-play PRIVATE ${ALSA_INCLUDE_DIRS}) + target_link_libraries (sndfile-play PRIVATE ${ALSA_LIBRARIES}) + elseif ((NOT BEOS) AND SNDIO_FOUND) + target_link_libraries (sndfile-play PRIVATE Sndio::Sndio) + endif () + +# sndfile-convert + + add_executable (sndfile-convert + programs/sndfile-convert.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-convert PRIVATE sndfile $<$:m>) + +# sndfile-cmp + + add_executable (sndfile-cmp + programs/sndfile-cmp.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-cmp PRIVATE sndfile $<$:m>) + +# sndfile-metadata-set + + add_executable (sndfile-metadata-set + programs/sndfile-metadata-set.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-metadata-set PRIVATE sndfile $<$:m>) + +# sndfile-metadata-get + + add_executable (sndfile-metadata-get + programs/sndfile-metadata-get.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-metadata-get PRIVATE sndfile $<$:m>) + +# sndfile-interleave + + add_executable (sndfile-interleave + programs/sndfile-interleave.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-interleave PRIVATE sndfile $<$:m>) + +# sndfile-deinterleave + + add_executable (sndfile-deinterleave + programs/sndfile-deinterleave.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-deinterleave PRIVATE sndfile $<$:m>) + +# sndfile-concat + + add_executable (sndfile-concat + programs/sndfile-concat.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-concat PRIVATE sndfile $<$:m>) + +# sndfile-salvage + + add_executable (sndfile-salvage + programs/sndfile-salvage.c + programs/common.c + programs/common.h + ) + target_link_libraries (sndfile-salvage PRIVATE sndfile $<$:m>) + + set (SNDFILE_PROGRAM_TARGETS + sndfile-info + sndfile-play + sndfile-convert + sndfile-cmp + sndfile-metadata-set + sndfile-metadata-get + sndfile-interleave + sndfile-deinterleave + sndfile-concat + sndfile-salvage + ) + + set_target_properties(${SNDFILE_PROGRAM_TARGETS} PROPERTIES FOLDER Programs) + +endif () + +# +# Examples +# + +if (BUILD_EXAMPLES) + +# sndfile-to-text + + add_executable (sndfile-to-text examples/sndfile-to-text.c) + target_link_libraries (sndfile-to-text PRIVATE sndfile) + +# sndfile-loopify + + add_executable (sndfile-loopify examples/sndfile-loopify.c) + target_link_libraries (sndfile-loopify PRIVATE sndfile) + +# make_sine + + add_executable (make_sine examples/make_sine.c) + target_link_libraries (make_sine + PRIVATE + sndfile + $<$:m> + ) + +# sfprocess + + add_executable (sfprocess examples/sfprocess.c) + target_link_libraries (sfprocess + PRIVATE + sndfile + $<$:m> + ) + +# list_formats + + add_executable (list_formats examples/list_formats.c) + target_link_libraries (list_formats + PRIVATE + sndfile + $<$:m> + ) + +# sndfilehandle + + add_executable (sndfilehandle examples/sndfilehandle.cc) + target_link_libraries (sndfilehandle PUBLIC sndfile) + + set (SNDFILE_EXAMPLE_TARGETS + sndfile-to-text + sndfile-loopify + make_sine + sfprocess + list_formats + sndfilehandle + ) + + set_target_properties(${SNDFILE_EXAMPLE_TARGETS} PROPERTIES FOLDER Examples) + + +endif () + +# +# sndfile-regtest +# + +if (BUILD_REGTEST) + + add_executable (sndfile-regtest + regtest/sndfile-regtest.c + regtest/database.c + regtest/checksum.c + ) + target_link_libraries(sndfile-regtest + PRIVATE + sndfile + SQLite3::SQLite3 + $<$:m> + ) + +endif () + +# +# Installation +# + +if (ENABLE_PACKAGE_CONFIG) + + if (WIN32 AND (NOT MINGW) AND (NOT CYGWIN)) + set (CMAKE_INSTALL_PACKAGEDIR cmake) + else () + set (CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SndFile) + endif() + + + install (TARGETS sndfile ${SNDFILE_PROGRAM_TARGETS} + EXPORT SndFileTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + include (CMakePackageConfigHelpers) + + if (ENABLE_EXTERNAL_LIBS) + set (SndFile_WITH_EXTERNAL_LIBS 1) + else () + set (SndFile_WITH_EXTERNAL_LIBS 0) + endif () + + set (INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) + configure_package_config_file(cmake/SndFileConfig.cmake.in SndFileConfig.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} + PATH_VARS INCLUDE_INSTALL_DIR + ) + write_basic_package_version_file (SndFileConfigVersion.cmake COMPATIBILITY SameMajorVersion) + + install(EXPORT SndFileTargets + NAMESPACE SndFile:: + DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} + ) + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/SndFileConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/SndFileConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} + ) + +else () + + install (TARGETS sndfile ${sdnfile_PROGRAMS} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + +endif () + +if (UNIX) + set (man_MANS + man/sndfile-info.1 + man/sndfile-play.1 + man/sndfile-convert.1 + man/sndfile-cmp.1 + man/sndfile-metadata-get.1 + #man/sndfile-metadata-set.1 + man/sndfile-concat.1 + man/sndfile-interleave.1 + #man/sndfile-deinterleave.1 + man/sndfile-salvage.1 + ) + install (FILES ${man_MANS} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +endif () + +if (ENABLE_BOW_DOCS) + set (HTML_BGCOLOUR "white") + set (HTML_FGCOLOUR "black") +else () + set (HTML_BGCOLOUR "black") + set (HTML_FGCOLOUR "white") +endif () +configure_file (doc/libsndfile.css.in doc/libsndfile.css) +set (html_DATA + doc/index.html + doc/libsndfile.jpg + "${CMAKE_CURRENT_BINARY_DIR}/doc/libsndfile.css" + doc/print.css + doc/api.html + doc/command.html + doc/bugs.html + doc/sndfile_info.html + doc/new_file_type.HOWTO + doc/win32.html + doc/FAQ.html + doc/lists.html + doc/embedded_files.html + doc/octave.html + doc/tutorial.html + ) +install (FILES ${html_DATA} DESTINATION ${CMAKE_INSTALL_DOCDIR}) + +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sndfile.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + +# +# Testing +# + +if (BUILD_TESTING) + + enable_testing () + + include (CMakeAutoGen) + + # generate tests sources from autogen templates + lsf_autogen (tests benchmark c) + lsf_autogen (tests floating_point_test c) + lsf_autogen (tests header_test c) + lsf_autogen (tests pcm_test c) + lsf_autogen (tests pipe_test c) + lsf_autogen (tests rdwr_test c) + lsf_autogen (tests scale_clip_test c) + lsf_autogen (tests utils c h) + lsf_autogen (tests write_read_test c) + lsf_autogen (src test_endswap c) + + # utils static library + add_library(test_utils STATIC tests/utils.c) + target_link_libraries(test_utils PRIVATE sndfile) + target_include_directories(test_utils PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/tests") + + ### test_main + + add_executable (test_main + src/test_main.c + src/test_main.h + src/test_conversions.c + src/test_float.c + src/test_endswap.c + src/test_audio_detect.c + src/test_log_printf.c + src/test_file_io.c + src/test_ima_oki_adpcm.c + src/test_strncpy_crlf.c + src/test_broadcast_var.c + src/test_cart_var.c + src/test_binheader_writef.c + src/test_nms_adpcm.c + ) + target_link_libraries (test_main PRIVATE sndfile) + if (MSVC) + target_compile_definitions (test_main PRIVATE _USE_MATH_DEFINES) + endif () + add_test (test_main test_main) + + ### sfversion_test + + add_executable (sfversion tests/sfversion.c) + target_link_libraries (sfversion sndfile) + add_test (sfversion sfversion) + set_tests_properties (sfversion PROPERTIES + PASS_REGULAR_EXPRESSION "${PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_FULL}" + ) + + ### error_test + + add_executable (error_test tests/error_test.c) + target_link_libraries (error_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (error_test error_test) + + ### ulaw_test + add_executable (ulaw_test tests/ulaw_test.c) + target_link_libraries (ulaw_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (ulaw_test ulaw_test) + + ### alaw_test + add_executable (alaw_test tests/alaw_test.c) + target_link_libraries (alaw_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (alaw_test alaw_test) + + ### dwvw_test + + add_executable (dwvw_test tests/dwvw_test.c) + target_link_libraries (dwvw_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (dwvw_test dwvw_test) + + ### command_test + + add_executable (command_test tests/command_test.c) + target_link_libraries (command_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (command_test command_test all) + + ### floating_point_test + + add_executable (floating_point_test + tests/dft_cmp.c + tests/floating_point_test.c + ) + target_link_libraries (floating_point_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + target_include_directories (floating_point_test PRIVATE tests) + add_test (floating_point_test floating_point_test) + + ### checksum_test + + add_executable (checksum_test tests/checksum_test.c) + target_link_libraries (checksum_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (checksum_test checksum_test) + + ### scale_clip_test + + add_executable (scale_clip_test tests/scale_clip_test.c) + target_link_libraries (scale_clip_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (scale_clip_test scale_clip_test) + + ### headerless_test + + add_executable (headerless_test tests/headerless_test.c) + target_link_libraries (headerless_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (headerless_test headerless_test) + + ### rdwr_test + + add_executable (rdwr_test tests/rdwr_test.c) + target_link_libraries (rdwr_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (rdwr_test rdwr_test) + + ### locale_test + + add_executable (locale_test tests/locale_test.c) + target_link_libraries (locale_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (locale_test locale_test) + + ### win32_ordinal_test + +# Disabled because we cannot test with shared sndfile library +# if (WIN32 AND BUILD_SHARED_LIBS) +# add_executable (win32_ordinal_test tests/win32_ordinal_test.c) +# target_link_libraries (win32_ordinal_test PRIVATE sndfile test_utils) +# add_test (win32_ordinal_test win32_ordinal_test) +# endif () + + ### cpp_test + + add_executable (cpp_test tests/cpp_test.cc) + target_link_libraries (cpp_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (cpp_test cpp_test) + + ### external_libs_test + + add_executable (external_libs_test tests/external_libs_test.c) + target_link_libraries (external_libs_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (external_libs_test external_libs_test) + + ### format_check_test + + add_executable (format_check_test tests/format_check_test.c) + target_link_libraries (format_check_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (format_check_test format_check_test) + + ### channel_test + + add_executable (channel_test tests/channel_test.c) + target_link_libraries (channel_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (channel_test channel_test) + + ### pcm_test + + add_executable (pcm_test tests/pcm_test.c) + target_link_libraries (pcm_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + add_test (pcm_test pcm_test) + + ### common test executables + + add_executable (write_read_test + tests/generate.c + tests/write_read_test.c + ) + target_link_libraries (write_read_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + target_include_directories (write_read_test PRIVATE tests) + + add_executable (lossy_comp_test tests/lossy_comp_test.c) + target_link_libraries (lossy_comp_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (peak_chunk_test tests/peak_chunk_test.c) + target_link_libraries (peak_chunk_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (header_test tests/header_test.c) + target_link_libraries (header_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (misc_test tests/misc_test.c) + target_link_libraries (misc_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (string_test tests/string_test.c) + target_link_libraries (string_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (multi_file_test tests/multi_file_test.c) + target_link_libraries (multi_file_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (aiff_rw_test tests/aiff_rw_test.c) + target_link_libraries (aiff_rw_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (chunk_test tests/chunk_test.c) + target_link_libraries (chunk_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (long_read_write_test tests/long_read_write_test.c) + target_link_libraries (long_read_write_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (raw_test tests/raw_test.c) + target_link_libraries (raw_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (compression_size_test tests/compression_size_test.c) + target_link_libraries (compression_size_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (ogg_test tests/ogg_test.c) + target_link_libraries (ogg_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (ogg_opus_test tests/ogg_opus_test.c) + target_link_libraries (ogg_opus_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (stdin_test tests/stdin_test.c) + target_link_libraries (stdin_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + set_target_properties (stdin_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "tests") + + add_executable (stdout_test tests/stdout_test.c) + target_link_libraries (stdout_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + set_target_properties (stdout_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "tests") + + add_executable (stdio_test tests/stdio_test.c) + target_link_libraries (stdio_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (pipe_test tests/pipe_test.c) + target_link_libraries (pipe_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + add_executable (virtual_io_test tests/virtual_io_test.c) + target_link_libraries (virtual_io_test + PRIVATE + sndfile + test_utils + $<$:m> + ) + + ### g72x_test + + add_executable (g72x_test src/G72x/g72x_test.c) + target_link_libraries (g72x_test + PRIVATE + sndfile + $<$:m> + ) + add_test (g72x_test g72x_test all) + + ### aiff-tests + + add_test (write_read_test_aiff write_read_test aiff) + add_test (lossy_comp_test_aiff_ulaw lossy_comp_test aiff_ulaw) + add_test (lossy_comp_test_aiff_alaw lossy_comp_test aiff_alaw) + add_test (lossy_comp_test_aiff_gsm610 lossy_comp_test aiff_gsm610) + add_test (peak_chunk_test_aiff peak_chunk_test aiff) + add_test (header_test_aiff header_test aiff) + add_test (misc_test_aiff misc_test aiff) + add_test (string_test_aiff string_test aiff) + add_test (multi_file_test_aiff multi_file_test aiff) + add_test (aiff_rw_test aiff_rw_test) + + ### au-tests + + add_test (write_read_test_au write_read_test au) + add_test (lossy_comp_test_au_ulaw lossy_comp_test au_ulaw) + add_test (lossy_comp_test_au_alaw lossy_comp_test au_alaw) + add_test (lossy_comp_test_au_g721 lossy_comp_test au_g721) + add_test (lossy_comp_test_au_g723 lossy_comp_test au_g723) + add_test (header_test_au header_test au) + add_test (misc_test_au misc_test au) + add_test (multi_file_test_au multi_file_test au) + + ### caf-tests + + add_test (write_read_test_caf write_read_test caf) + add_test (lossy_comp_test_caf_ulaw lossy_comp_test caf_ulaw) + add_test (lossy_comp_test_caf_alaw lossy_comp_test caf_alaw) + add_test (header_test_caf header_test caf) + add_test (peak_chunk_test_caf peak_chunk_test caf) + add_test (misc_test_caf misc_test caf) + add_test (chunk_test_caf chunk_test caf) + add_test (string_test_caf string_test caf) + add_test (long_read_write_test_alac long_read_write_test alac) + + # wav-tests + add_test (write_read_test_wav write_read_test wav) + add_test (lossy_comp_test_wav_pcm lossy_comp_test wav_pcm) + add_test (lossy_comp_test_wav_ima lossy_comp_test wav_ima) + add_test (lossy_comp_test_wav_msadpcm lossy_comp_test wav_msadpcm) + add_test (lossy_comp_test_wav_ulaw lossy_comp_test wav_ulaw) + add_test (lossy_comp_test_wav_alaw lossy_comp_test wav_alaw) + add_test (lossy_comp_test_wav_gsm610 lossy_comp_test wav_gsm610) + add_test (lossy_comp_test_wav_g721 lossy_comp_test wav_g721) + add_test (lossy_comp_test_wav_nmsadpcm lossy_comp_test wav_nmsadpcm) + add_test (peak_chunk_test_wav peak_chunk_test wav) + add_test (header_test_wav header_test wav) + add_test (misc_test_wav misc_test wav) + add_test (string_test_wav string_test wav) + add_test (multi_file_test_wav multi_file_test wav) + add_test (chunk_test_wav chunk_test wav) + + ### w64-tests + + add_test (write_read_test_w64 write_read_test w64) + add_test (lossy_comp_test_w64_ima lossy_comp_test w64_ima) + add_test (lossy_comp_test_w64_msadpcm lossy_comp_test w64_msadpcm) + add_test (lossy_comp_test_w64_ulaw lossy_comp_test w64_ulaw) + add_test (lossy_comp_test_w64_alaw lossy_comp_test w64_alaw) + add_test (lossy_comp_test_w64_gsm610 lossy_comp_test w64_gsm610) + add_test (header_test_w64 header_test w64) + add_test (misc_test_w64 misc_test w64) + + ### rf64-tests + + add_test (write_read_test_rf64 write_read_test rf64) + add_test (header_test_rf64 header_test rf64) + add_test (misc_test_rf64 misc_test rf64) + add_test (string_test_rf64 string_test rf64) + add_test (peak_chunk_test_rf64 peak_chunk_test rf64) + add_test (chunk_test_rf64 chunk_test rf64) + + ### raw-tests + add_test (write_read_test_raw write_read_test raw) + add_test (lossy_comp_test_raw_ulaw lossy_comp_test raw_ulaw) + add_test (lossy_comp_test_raw_alaw lossy_comp_test raw_alaw) + add_test (lossy_comp_test_raw_gsm610 lossy_comp_test raw_gsm610) + add_test (lossy_comp_test_vox_adpcm lossy_comp_test vox_adpcm) + add_test (raw_test raw_test) + + ### paf-tests + add_test (write_read_test_paf write_read_test paf) + add_test (header_test_paf header_test paf) + add_test (misc_test_paf misc_test paf) + + ### svx-tests + add_test (write_read_test_svx write_read_test svx) + add_test (header_test_svx header_test svx) + add_test (misc_test_svx misc_test svx) + + ### nist-tests + add_test (write_read_test_nist write_read_test nist) + add_test (lossy_comp_test_nist_ulaw lossy_comp_test nist_ulaw) + add_test (lossy_comp_test_nist_alaw lossy_comp_test nist_alaw) + add_test (header_test_nist header_test nist) + add_test (misc_test_nist misc_test nist) + + ### ircam-tests + add_test (write_read_test_ircam write_read_test ircam) + add_test (lossy_comp_test_ircam_ulaw lossy_comp_test ircam_ulaw) + add_test (lossy_comp_test_ircam_alaw lossy_comp_test ircam_alaw) + add_test (header_test_ircam header_test ircam) + add_test (misc_test_ircam misc_test ircam) + + ### voc-tests + add_test (write_read_test_voc write_read_test voc) + add_test (lossy_comp_test_voc_ulaw lossy_comp_test voc_ulaw) + add_test (lossy_comp_test_voc_alaw lossy_comp_test voc_alaw) + add_test (header_test_voc header_test voc) + add_test (misc_test_voc misc_test voc) + + ### mat4-tests + add_test (write_read_test_mat4 write_read_test mat4) + add_test (header_test_mat4 header_test mat4) + add_test (misc_test_mat4 misc_test mat4) + + ### mat5-tests + add_test (write_read_test_mat5 write_read_test mat5) + add_test (header_test_mat5 header_test mat5) + add_test (misc_test_mat5 misc_test mat5) + + ### pvf-tests + add_test (write_read_test_pvf write_read_test pvf) + add_test (header_test_pvf header_test pvf) + add_test (misc_test_pvf misc_test pvf) + + ### xi-tests + add_test (lossy_comp_test_xi_dpcm lossy_comp_test xi_dpcm) + + ### htk-tests + add_test (write_read_test_htk write_read_test htk) + add_test (header_test_htk header_test htk) + add_test (misc_test_htk misc_test htk) + + ### avr-tests + add_test (write_read_test_avr write_read_test avr) + add_test (header_test_avr header_test avr) + add_test (misc_test_avr misc_test avr) + + ### sds-tests + add_test (write_read_test_sds write_read_test sds) + add_test (header_test_sds header_test sds) + add_test (misc_test_sds misc_test sds) + + # sd2-tests + add_test (write_read_test_sd2 write_read_test sd2) + + ### wve-tests + add_test (lossy_comp_test_wve lossy_comp_test wve) + + ### mpc2k-tests + add_test (write_read_test_mpc2k write_read_test mpc2k) + add_test (header_test_mpc2k header_test mpc2k) + add_test (misc_test_mpc2k misc_test mpc2k) + + ### flac-tests + add_test (write_read_test_flac write_read_test flac) + add_test (compression_size_test_flac compression_size_test flac) + add_test (string_test_flac string_test flac) + + ### vorbis-tests + add_test (ogg_test ogg_test) + add_test (compression_size_test_vorbis compression_size_test vorbis) + add_test (lossy_comp_test_ogg_vorbis lossy_comp_test ogg_vorbis) + add_test (string_test_ogg string_test ogg) + add_test (misc_test_ogg misc_test ogg) + + ### opus-tests ### + add_test (ogg_opus_test ogg_opus_test) + add_test (compression_size_test_opus compression_size_test opus) + add_test (lossy_comp_test_ogg_opus lossy_comp_test ogg_opus) + add_test (string_test_opus string_test opus) + + ### io-tests + add_test (stdio_test stdio_test) + add_test (pipe_test pipe_test) + add_test (virtual_io_test virtual_io_test) + + set (SNDFILE_TEST_TARGETS + test_utils + test_main + sfversion + error_test + ulaw_test + alaw_test + dwvw_test + command_test + floating_point_test + checksum_test + scale_clip_test + headerless_test + rdwr_test + locale_test + cpp_test + external_libs_test + format_check_test + channel_test + pcm_test + write_read_test + lossy_comp_test + peak_chunk_test + header_test + misc_test + string_test + multi_file_test + aiff_rw_test + chunk_test + long_read_write_test + raw_test + compression_size_test + ogg_test + stdin_test + stdout_test + stdio_test + pipe_test + virtual_io_test + g72x_test + ) + +# if (WIN32 AND BUILD_SHARED_LIBS) +# list (APPEND SNDFILE_TEST_TARGETS win32_ordinal_test) +# endif () + + set_target_properties(${SNDFILE_TEST_TARGETS} PROPERTIES FOLDER Tests) + +endif () diff --git a/lib-src/libsndfile/CONTRIBUTING.md b/lib-src/libsndfile/CONTRIBUTING.md new file mode 100644 index 000000000..bc5e0da2d --- /dev/null +++ b/lib-src/libsndfile/CONTRIBUTING.md @@ -0,0 +1,23 @@ + ## Submitting Issues. + +* If your issue is that libsndfile is not able to or is incorrectly reading one + of your files, please include the output of the `sndfile-info` program run + against the file. +* If you are writing a program that uses libsndfile and you think there is a bug + in libsndfile, reduce your program to the minimal example, make sure you compile + it with warnings on (for GCC I would recommend at least `-Wall -Wextra`) and that + your program is warning free, and that is is error free when run under Valgrind + or compiled with AddressSanitizer. + +## Submitting Patches. + +* Patches should pass all existing tests +* Patches should pass all pre-commit hook tests. +* Patches should always be submitted via a either Github "pull request" or a + via emailed patches created using "git format-patch". +* Patches for new features should include tests and documentation. +* Patches to fix bugs should either pass all tests, or modify the tests in some + sane way. +* When a new feature is added for a particular file format and that feature + makes sense for other formats, then it should also be implemented for one + or two of the other formats. diff --git a/lib-src/libsndfile/Cfg/compile b/lib-src/libsndfile/Cfg/compile deleted file mode 100755 index 531136b06..000000000 --- a/lib-src/libsndfile/Cfg/compile +++ /dev/null @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/lib-src/libsndfile/Cfg/config.guess b/lib-src/libsndfile/Cfg/config.guess deleted file mode 100755 index b79252d6b..000000000 --- a/lib-src/libsndfile/Cfg/config.guess +++ /dev/null @@ -1,1558 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. - -timestamp='2013-06-10' - -# This file 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 3 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, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner. -# -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -# -# Please send patches with a ChangeLog entry to config-patches@gnu.org. - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - ;; -esac - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi - else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf - fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; - NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; -esac - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/lib-src/libsndfile/Cfg/config.sub b/lib-src/libsndfile/Cfg/config.sub deleted file mode 100755 index 9633db704..000000000 --- a/lib-src/libsndfile/Cfg/config.sub +++ /dev/null @@ -1,1791 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. - -timestamp='2013-08-10' - -# This file 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 3 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, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches with a ChangeLog entry to config-patches@gnu.org. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright 1992-2013 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; - xscaleeb) - basic_machine=armeb-unknown - ;; - - xscaleel) - basic_machine=armel-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -nacl*) - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - c8051-*) - os=-elf - ;; - hexagon-*) - os=-elf - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or1k-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/lib-src/libsndfile/Cfg/depcomp b/lib-src/libsndfile/Cfg/depcomp deleted file mode 100755 index 4ebd5b3a2..000000000 --- a/lib-src/libsndfile/Cfg/depcomp +++ /dev/null @@ -1,791 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2013-05-30.07; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. - -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by 'PROGRAMS ARGS'. - object Object file output by 'PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputting dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -# Get the directory component of the given path, and save it in the -# global variables '$dir'. Note that this directory component will -# be either empty or ending with a '/' character. This is deliberate. -set_dir_from () -{ - case $1 in - */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; - *) dir=;; - esac -} - -# Get the suffix-stripped basename of the given path, and save it the -# global variable '$base'. -set_base_from () -{ - base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` -} - -# If no dependency file was actually created by the compiler invocation, -# we still have to create a dummy depfile, to avoid errors with the -# Makefile "include basename.Plo" scheme. -make_dummy_depfile () -{ - echo "#dummy" > "$depfile" -} - -# Factor out some common post-processing of the generated depfile. -# Requires the auxiliary global variable '$tmpdepfile' to be set. -aix_post_process_depfile () -{ - # If the compiler actually managed to produce a dependency file, - # post-process it. - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependency.h'. - # Do two passes, one to just change these to - # $object: dependency.h - # and one to simply output - # dependency.h: - # which is needed to avoid the deleted-header problem. - { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" - sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" - } > "$depfile" - rm -f "$tmpdepfile" - else - make_dummy_depfile - fi -} - -# A tabulation character. -tab=' ' -# A newline character. -nl=' -' -# Character ranges might be problematic outside the C locale. -# These definitions help. -upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ -lower=abcdefghijklmnopqrstuvwxyz -digits=0123456789 -alpha=${upper}${lower} - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Avoid interferences from the environment. -gccflag= dashmflag= - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp -fi - -if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - -if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. - gccflag=-qmakedep=gcc,-MF - depmode=gcc -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. -## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. -## (see the conditional assignment to $gccflag above). -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). Also, it might not be -## supported by the other compilers which use the 'gcc' depmode. -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The second -e expression handles DOS-style file names with drive - # letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the "deleted header file" problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. -## Some versions of gcc put a space before the ':'. On the theory -## that the space means something, we add a space to the output as -## well. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like '#:fec' to the end of the - # dependency line. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ - | tr "$nl" ' ' >> "$depfile" - echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" - ;; - -xlc) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts '$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - aix_post_process_depfile - ;; - -tcc) - # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 - # FIXME: That version still under development at the moment of writing. - # Make that this statement remains true also for stable, released - # versions. - # It will wrap lines (doesn't matter whether long or short) with a - # trailing '\', as in: - # - # foo.o : \ - # foo.c \ - # foo.h \ - # - # It will put a trailing '\' even on the last line, and will use leading - # spaces rather than leading tabs (at least since its commit 0394caf7 - # "Emit spaces for -MD"). - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. - # We have to change lines of the first kind to '$object: \'. - sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" - # And for each line of the second kind, we have to emit a 'dep.h:' - # dummy dependency, to avoid the deleted-header problem. - sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" - rm -f "$tmpdepfile" - ;; - -## The order of this option in the case statement is important, since the -## shell code in configure will try each of these formats in the order -## listed in this file. A plain '-MD' option would be understood by many -## compilers, so we must ensure this comes after the gcc and icc options. -pgcc) - # Portland's C compiler understands '-MD'. - # Will always output deps to 'file.d' where file is the root name of the - # source file under compilation, even if file resides in a subdirectory. - # The object file name does not affect the name of the '.d' file. - # pgcc 10.2 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\' : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - set_dir_from "$object" - # Use the source, not the object, to determine the base name, since - # that's sadly what pgcc will do too. - set_base_from "$source" - tmpdepfile=$base.d - - # For projects that build the same source file twice into different object - # files, the pgcc approach of using the *source* file root name can cause - # problems in parallel builds. Use a locking strategy to avoid stomping on - # the same $tmpdepfile. - lockdir=$base.d-lock - trap " - echo '$0: caught signal, cleaning up...' >&2 - rmdir '$lockdir' - exit 1 - " 1 2 13 15 - numtries=100 - i=$numtries - while test $i -gt 0; do - # mkdir is a portable test-and-set. - if mkdir "$lockdir" 2>/dev/null; then - # This process acquired the lock. - "$@" -MD - stat=$? - # Release the lock. - rmdir "$lockdir" - break - else - # If the lock is being held by a different process, wait - # until the winning process is done or we timeout. - while test -d "$lockdir" && test $i -gt 0; do - sleep 1 - i=`expr $i - 1` - done - fi - i=`expr $i - 1` - done - trap - 1 2 13 15 - if test $i -le 0; then - echo "$0: failed to acquire lock after $numtries attempts" >&2 - echo "$0: check lockdir '$lockdir'" >&2 - exit 1 - fi - - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" - # Add 'dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - set_dir_from "$object" - set_base_from "$object" - - if test "$libtool" = yes; then - # Libtool generates 2 separate objects for the 2 libraries. These - # two compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir$base.o.d # libtool 1.5 - tmpdepfile2=$dir.libs/$base.o.d # Likewise. - tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - # Same post-processing that is required for AIX mode. - aix_post_process_depfile - ;; - -msvc7) - if test "$libtool" = yes; then - showIncludes=-Wc,-showIncludes - else - showIncludes=-showIncludes - fi - "$@" $showIncludes > "$tmpdepfile" - stat=$? - grep -v '^Note: including file: ' "$tmpdepfile" - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The first sed program below extracts the file names and escapes - # backslashes for cygpath. The second sed program outputs the file - # name when reading, but also accumulates all include files in the - # hold buffer in order to output them again at the end. This only - # works with sed implementations that can handle large buffers. - sed < "$tmpdepfile" -n ' -/^Note: including file: *\(.*\)/ { - s//\1/ - s/\\/\\\\/g - p -}' | $cygpath_u | sort -u | sed -n ' -s/ /\\ /g -s/\(.*\)/'"$tab"'\1 \\/p -s/.\(.*\) \\/\1:/ -H -$ { - s/.*/'"$tab"'/ - G - p -}' >> "$depfile" - echo >> "$depfile" # make sure the fragment doesn't end with a backslash - rm -f "$tmpdepfile" - ;; - -msvc7msys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for ':' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. - "$@" $dashmflag | - sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this sed invocation - # correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no eat=no - for arg - do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - if test $eat = yes; then - eat=no - continue - fi - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix=`echo "$object" | sed 's/^.*\././'` - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - # makedepend may prepend the VPATH from the source file name to the object. - # No need to regex-escape $object, excess matching of '.' is harmless. - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process the last invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed '1,2d' "$tmpdepfile" \ - | tr ' ' "$nl" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E \ - | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - | sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - IFS=" " - for arg - do - case "$arg" in - -o) - shift - ;; - $object) - shift - ;; - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" - echo "$tab" >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/lib-src/libsndfile/Cfg/install-sh b/lib-src/libsndfile/Cfg/install-sh deleted file mode 100755 index 377bb8687..000000000 --- a/lib-src/libsndfile/Cfg/install-sh +++ /dev/null @@ -1,527 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2011-11-20.07; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names problematic for 'test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - dst=$dst_arg - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/lib-src/libsndfile/Cfg/ltmain.sh b/lib-src/libsndfile/Cfg/ltmain.sh deleted file mode 100755 index a356acafa..000000000 --- a/lib-src/libsndfile/Cfg/ltmain.sh +++ /dev/null @@ -1,9661 +0,0 @@ - -# libtool (GNU libtool) 2.4.2 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . - -PROGRAM=libtool -PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" -done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -} - -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "$my_tmpdir" -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac - - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. -func_help () -{ - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi -} - -# func_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - $opt_debug - - func_error "missing argument for $1." - exit_cmd=exit -} - - -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... -# Echo program name prefixed message to standard error, followed by -# a configuration failure hint, and exit. -func_fatal_configuration () -{ - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." -} - - -# func_config -# Display the configuration for all the tags in this script. -func_config () -{ - re_begincf='^# ### BEGIN LIBTOOL' - re_endcf='^# ### END LIBTOOL' - - # Default configuration. - $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do - $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done - - exit $? -} - -# func_features -# Display the features supported by this script. -func_features () -{ - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - - exit $? -} - -# func_enable_tag tagname -# Verify that TAGNAME is valid, and either flag an error and exit, or -# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -# variable here. -func_enable_tag () -{ - # Global variable: - tagname="$1" - - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac - - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; - *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false - - -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - - $opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } - - - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} - - - - -## ----------- ## -## Main. ## -## ----------- ## - -# func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_lalib_p () -{ - test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - -# func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function implements the same check as func_lalib_p without -# resorting to external programs. To this end, it redirects stdin and -# closes it afterwards, without saving the original file descriptor. -# As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# Note that it is not necessary on cygwin/mingw to append a dot to -# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -# behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () -{ - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - -# func_mode_compile arg... -func_mode_compile () -{ - $opt_debug - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - pie_flag= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" - arg_mode=target - continue - ;; - - -pie | -fpie | -fPIE) - func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. - func_append base_compile " $lastarg" - continue - ;; - - *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in - arg) - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) - func_fatal_error "you must specify a target with \`-o'" - ;; - *) - # Get the name of the library object. - test -z "$libobj" && { - func_basename "$srcfile" - libobj="$func_basename_result" - } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - case $libobj in - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; - esac - - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) - func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - continue - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ - && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - - echo - $ECHO "Try \`$progname --help' for more information about other modes." -} - -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - cmd="$nonopt" - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - file="$progdir/$program" - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" - fi - exit $EXIT_SUCCESS -} - -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - no_mode=: - for arg - do - arg2= - if test -n "$dest"; then - func_append files " $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - if $install_cp; then :; else - prev=$arg - fi - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - dest=$func_stripname_result - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - func_append staticlibs " $file" - ;; - - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then - realname="$1" - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else - func_error "error: relink \`$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# a dlpreopen symbol table. -func_generate_dlsyms () -{ - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - echo >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} - - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -/* path handling portability macros */ -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; -#else -static int lt_debug = 0; -#endif - -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); -void lt_setenv (const char *name, const char *value); -char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_update_exe_path (const char *name, const char *value); -void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); -EOF - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - -static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *file, int line, const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); -} - -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - -void -lt_setenv (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); - { -#ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ - char *str = xstrdup (value); - setenv (name, str, 1); -#else - int len = strlen (name) + 1 + strlen (value) + 1; - char *str = XMALLOC (char, len); - sprintf (str, "%s=%s", name, value); - if (putenv (str) != EXIT_SUCCESS) - { - XFREE (str); - } -#endif - } -} - -char * -lt_extend_str (const char *orig_value, const char *add, int to_end) -{ - char *new_value; - if (orig_value && *orig_value) - { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); - new_value = XMALLOC (char, add_len + orig_value_len + 1); - if (to_end) - { - strcpy (new_value, orig_value); - strcpy (new_value + orig_value_len, add); - } - else - { - strcpy (new_value, add); - strcpy (new_value + add_len, orig_value); - } - } - else - { - new_value = xstrdup (add); - } - return new_value; -} - -void -lt_update_exe_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { - new_value[len-1] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -void -lt_update_lib_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - bindir= - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) func_append xrpath " $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -bindir) - prev=bindir - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; - *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - func_append deplibs " $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - func_append objs " $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else - func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append libs " $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac - func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done - deplibs="$tmp_deplibs" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - func_resolve_sysroot "$lib" - case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append newdlfiles " $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" - else - func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" - func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - name=$func_stripname_result - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - realname="$1" - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - soname="$func_basename_result" - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - func_verbose "extracting exported symbol list from \`$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; - esac;; - *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi - func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." - dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - case $host in - *-*-darwin*) - depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; - esac - ;; - *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - func_append objs "$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" - fi - fi - - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$1" - number_minor="$2" - number_revision="$3" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - func_append verstring ":${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext | *.gcno) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - func_append removelist " $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - ;; - esac - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - func_append linknames " $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in - cygwin* | mingw* | cegcc*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. - orig_export_symbols="$export_symbols" - export_symbols= - always_export_symbols=yes - fi - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do - IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - func_append tmp_deplibs " $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - func_basename "$output" - output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - last_robj= - k=1 - - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - func_append delfiles " $output" - - else - output= - fi - - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - func_warning "\`-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - - exit $exit_status - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- - # compiling, it, like the target executable, must be - # executed on the $host or under an emulation environment. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" - ;; - *) func_append oldobjs " $obj" ;; - esac - done - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" - name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; - *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" - else - odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" - - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - func_append rmfiles " $odir/$n" - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - - case "$opt_mode" in - clean) - case " $library_names " in - *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -} - -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff --git a/lib-src/libsndfile/Cfg/missing b/lib-src/libsndfile/Cfg/missing deleted file mode 100755 index db98974ff..000000000 --- a/lib-src/libsndfile/Cfg/missing +++ /dev/null @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2013-10-28.13; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard , 1996. - -# 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, 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, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/lib-src/libsndfile/ChangeLog b/lib-src/libsndfile/ChangeLog index 57b8db9ea..62576177c 100644 --- a/lib-src/libsndfile/ChangeLog +++ b/lib-src/libsndfile/ChangeLog @@ -1,3 +1,874 @@ +2013-04-05 Erik de Castro Lopo + + * Makefile.am + Make sure checkprograms are built as part of 'make test-tarball'. + Closes: https://github.com/erikd/libsndfile/issues/37 + +2013-03-29 Erik de Castro Lopo + + * tests/dft_cmp.c + Fix a buffer overflow detected using GCC 4.8's -fsantiize=address runtime + error checking functionality. This was a buffer overflow in libsndfile's + test suite, not in the actual library code. + +2013-03-09 Erik de Castro Lopo + + * M4/gcc_version.m4 + Fix to work with OpenBSD's sed. + +2013-03-07 Erik de Castro Lopo + + * src/ALAC/alac_encoder.c + Patch from Michael Pruett (author of libaudiofile) to add correct byte + swapping for the mChannelLayoutTag field. + +2013-03-02 Erik de Castro Lopo + + * doc/bugs.html + Bugs should bt reported on the github issue tracker. + +2013-02-22 Erik de Castro Lopo + + * configure.ac + Improve sanitization of FLAC_CFLAGS value. + +2013-02-21 Erik de Castro Lopo + + * src/Makefile.am + Call python interpreter instead of using '#!' in script. Thanks to Jan + Stary for reporting this. + + * doc/index.html doc/FAQ.html + Make internal links relative. Patch from Jan Stary. + +2013-02-13 Erik de Castro Lopo + + * src/test_endswap.def src/test_endswap.tpl + Add tests for psf_put_be32() and psf_put_be64(). + + * src/sfendian.h src/test_endswap.(def|tpl) + Add functions psf_get_be(16|32|64) with tests. + These are needed for platforms where un-aligned accesses cause bus faults. + + * src/ALAC/ag_enc.c src/ALAC/alac_decoder.c + Replace all un-aligned accesses with safe alternatives. + Closes: https://github.com/erikd/libsndfile/issues/19 + +2013-02-12 Erik de Castro Lopo + + * src/sfendian.h + Add big endian versions of H2BE_16 and H2BE_32. + +2013-02-11 Erik de Castro Lopo + + * src/ALAC/ + Replace Apple endswap routines with ones from libsndfile. + + * merge from libsndfile-cart repo + Add ability to set and get a cart chunk with WAV and RF64. + Orignal patch by Chris Roberts required a number of + tweaks. + +2013-02-10 Erik de Castro Lopo + + * src/common.h + Bump SF_HEADER_LEN from 8192 to 12292, the value it was in the 1.0.25 + release. + +2013-02-09 Erik de Castro Lopo + + * src/alac.c + Fix segfault when encoding 8 channel files. + Closes: https://github.com/erikd/libsndfile/issues/30 + +2013-02-07 Erik de Castro Lopo + + * src/ALAC/EndianPortable.c + Fall back to compiler's __BYTE_ORDER__ for endian-ness detection. + +2013-02-06 Erik de Castro Lopo + + * configure.ac src/common.h src/ima_adpcm.c src/ms_adpcm.c src/paf.c + Drop tests for and #ifdef hackery for C99 struct flexible array feature. + libsndfile assumes the compiler supports most of the ISO C99 standard. + + * src/alac.c + Fix valgrind invalid realloc. Reported by nu774. + Closes: https://github.com/erikd/libsndfile/issues/31 + +2013-02-05 Erik de Castro Lopo + + * src/alac.c + The 'pakt' chunk header should now be written correctly. + Closes: https://github.com/erikd/libsndfile/issues/24 + + * configure.ac Makefile.am + Use PKG_INSTALLDIR when it exists. Suggestion from Christoph Thompson. + Closes: https://github.com/erikd/libsndfile/pull/28 + +2013-02-03 Erik de Castro Lopo + + * src/common.h src/caf.c + Read the ALAC 'pakt' header and stash the values. + + * src/sfendian.h + Add functions psf_put_be64() and psf_put_be32(). + + * src/alac.c + Start work on filling on the 'pakt' chunk header. + +2013-02-02 Erik de Castro Lopo + + * doc/FAQ.html + Add missing opening

tag. + + * src/alac.c + Increase ALAC_BYTE_BUFFER_SIZE to 82000. + +2013-01-27 Erik de Castro Lopo + + * doc/FAQ.html + Improve question #8. + +2013-01-02 Erik de Castro Lopo + + * src/ogg_opus.c + Add skeleton implementation so someone else can run with it. + +2012-12-12 Erik de Castro Lopo + + * src/common.h src/dwd.c src/rx2.c src/txw.c + Fix for compiling when configured with --enable-experimental. Thanks to + Eric Wong for reporting this. + +2012-12-01 Erik de Castro Lopo + + * configure.ac programs/sndfile-play.c + OS X 10.8 uses a different audio API to previous versions. + Fix compile failure on by disabling sndfile-play on this version. + Someone needs to supply code for the new API. + +2012-11-30 Erik de Castro Lopo + + * Octave/Makefile.am Octave/octave_test.sh + Fix 'make distcheck'. + +2012-10-13 Erik de Castro Lopo + + * M4/octave.m4 + Relax constraints on Octave version. + +2012-10-11 Erik de Castro Lopo + + * tests/utils.tpl + Improve compare_*_or_die() functions. + + * src/command.c + Fix bug reported by Keiler Florian. When reading short or int data from a + file containing float data, and setting SFC_SET_SCALE_FLOAT_INT_READ to + SF_TRUE would fail 3, 5, 7 and other channels counts. Problem was that + psf_calc_signal_max() was not calculating the signal max correctly. + Calculation of the signal max was failing because it was trying to read + a sample count that was not an integer multiple of the channel count. + + * tests/channel_test.c tests/Makefile.am tests/test_wrapper.sh.in + Add test for the above. + +2012-09-25 Erik de Castro Lopo + + * src/sndfile.hh + Added a constructor to allow the use of SF_VIRTUAL_IO. Patch from + DannyDaemonic : https://github.com/erikd/libsndfile/pull/20 + +2012-08-23 Erik de Castro Lopo + + * doc/octave.html + Fix link to octave.sourceforge.net. Thanks to IOhannes m zmoelnig. + + * src/mat5.c + Allow reading of mat5 files without a specified sample rate (default to + 44.1kHz). Thanks to IOhannes m zmoelnig. + +2012-08-19 Erik de Castro Lopo + + * src/paf.c + Error out if channel count is zero. Bug report from William ELla via + launchpad: + https://bugs.launchpad.net/ubuntu/+source/libsndfile/+bug/1036831 + +2012-08-04 Erik de Castro Lopo + + * configure.ac programs/sndfile-play.c + Patch from Ricci Adams to use OSX's AudioQueues on OSX 10.7 and greater. + +2012-07-09 Erik de Castro Lopo + + * programs/common.c + Accept "ogg" as a file extention for Ogg/Vorbis files. + +2012-06-22 Erik de Castro Lopo + + * src/flac.c + Make sure any previously allocated FLAC stream encoder and stream decoder + objects are deleted before a new one is allocated. + +2012-06-20 Erik de Castro Lopo + + * tests/utils.tpl + Rename gen_lowpass_noise_float() to gen_lowpass_signal_float() and add a + sine wave component so that different FLAC compression levels can be + tested. + + * src/sndfile.h.in doc/command.html + Add SFC_SET_COMPRESSION_LEVEL and document it. + + * src/sndfile.c + Catch SFC_SET_VBR_ENCODING_QUALITY command and implement it as the inverse + of SFC_SET_COMPRESSION_LEVEL. + + * src/ogg_vorbis.c src/flac.c + Implement SFC_SET_COMPRESSION_LEVEL command. + + * tests/test_wrapper.sh.in tests/compression_size_test.c + Use the compression_size_test on FLAC as well. + +2012-06-19 Erik de Castro Lopo + + * tests/ + Rename vorbis_test.c -> compression_size_test.c so it can be extended to + test FLAC as well. + +2012-06-18 Erik de Castro Lopo + + * src/broadcast.c + Fix a bug where a file with a 'bext' chunk with a zero length coding + history field would get corrupted when the file was closed. + Reported by Paul Davis of the Ardour project. + + * src/test_broadcast_var.c + Add a test for the above. + +2012-05-19 Erik de Castro Lopo + + * src/sndfile.c + sf_format_check: For SF_FORMAT_AIFF, reject endian-ness setttings for + non-PCM formats. + +2012-04-12 Erik de Castro Lopo + + * src/aiff.c + Fix regression in handling of odd length SSND chunks. + Thanks Olivier Tristan for the example file. + + * src/aiff.c src/wav.c + Exit parser loop when marker == 0. + +2012-04-04 Erik de Castro Lopo + + * doc/FAQ.html + Fix text. Thanks to Richard Collins. + +2012-03-24 Erik de Castro Lopo + + * src/caf.c + Exit parse loop if the marker is zero. Pass jump offsets as size_t instead + of int. + +2012-03-20 Erik de Castro Lopo + + * src/alac.c + Fix segfault when decoding CAF/ALAC file with more than 4 channels. + Fixes github issue #8 reported by Charles Van Winkle. + +2012-03-20 Erik de Castro Lopo + + * src/common.h + Change 'typedef SF_CHUNK_ITERATOR { ... } SF_CHUNK_ITERATOR' into 'struct + SF_CHUNK_ITERATOR { ... }' to prevent older compilers from complaining of + re-typedef-ing of SF_CHUNK_ITERATOR. + + * configure.ac + Fix if test for empty $prefix. + +2012-03-18 Erik de Castro Lopo + + * src/*.c tests/chunk_test.c + Reworking of custom chunk handling code. + - Memory for the iterator is now attached to the SF_PRIVATE struct and + freed one sf_close(). + - Rename sf_create_chunk_iterator() -> sf_get_chunk_iterator(). + - Each SNDFILE handle never has more than one SF_CHUNK_ITERATOR handle. + + * tests/string_test.c + Fix un-initialised char buffer. + +2012-03-17 Erik de Castro Lopo + + * src/*.c tests/chunk_test.c + Add improved handling of custom chunk getting and settings. Set of patches + from IOhannes m zmoelnig submitted via github pull request #6. + + * src/alac.c + Fix calculated frame count for files with zero block length. + +2012-03-13 Erik de Castro Lopo + + * src/avr.c + Remove double assignment to psf->endian. Thanks Kao Dome. + + * src/gsm610.c + Fix clearing of buffers. Thanks Kao Dome. + + * src/paf.c + Remove duplicate code. Thanks Kao Dome. + + * src/test_strncpy_crlf.c + Fix minor error in test. Thanks Kao Dome. + + * src/common.h src/*.c + Fix a bunch of valgrind errors. + +2012-03-13 Erik de Castro Lopo + + * src/sndfile.c + Fix typo in error string 'Uknown' -> 'Unknown'. + + * tests/fix_this.c + Fix potential int overflow. + +2012-03-10 Erik de Castro Lopo + + * src/alac.c + Fix decoding of last block so that the decode length is not a multiple of + the block length. Fixes github issue #4 reported by Charles Van Winkle. + + * src/sfconfig.h src/sfendian.h + Fix for MinGW cross compiling. Use '#if (defined __*66__)' instead of + '#if __*86__' because the MinGW header use '#ifdef __x86_64__'. + +2012-03-10 Erik de Castro Lopo + + * src/ALAC/ src/alac.c + Unify the interface between libsndfile and Apple ALAC codec. Regardless of + file bit width samples are now passed between the two as int32_t that are + justified towards the most significant bit. Without this modification, 16 + conversion functions would have been needed between the libsndfile (short, + int, float, double) types and the ALAC types (16, 20, 24 and 32 bit). With + this mod, only 4 are needed. + + * tests/floating_point_test.tpl tests/write_read_test.(def|tpl) + Add tests for 20 and 24 bit ALAC/CAF files. + + * src/command.c + Add ALAC/CAF to the SFC_GET_FORMAT_* commands. Fixes github issue #5. + + * configure.ac + Only use automake AM_SLIENT_RULES where supported. Thanks Dave Yeo. + + * tests/pipe_test.tpl + Disable tests on OS/2. Thanks Dave Yeo. + +2012-03-09 Erik de Castro Lopo + + * configure.ac src/sfconfig.h src/sfendian.h + For GCC, use inline assembler for endian swapping. This should work with + older versions of GCC like the one currently used in OS/2. + +2012-03-06 Erik de Castro Lopo + + * src/alac.c + Make sure temp file gets opened in binary mode. + + * src/alac.c src/common.c src/common.h + Fix function alac_write16_d(). + + * tests/floating_point_test.tpl + Add tests for 16 bit ALAC/CAF. + + * src/alac.c src/common.c src/common.h + Add support for 32 bit ALAC/CAF files. + + * tests/floating_point_test.tpl tests/write_read_test.tpl + Add tests for 32 bit ALAC/CAF files. + +2012-03-05 Erik de Castro Lopo + + * src/ + Refactor chunk storage so it work on big as well as little endian CPUs. + + * tests/chunk_test.c + Clean up error messages. + + * src/sfendian.h src/*.c + Rename endian swapping macros and add ENDSWAP_64 and BE2H_64. + + * configure.ac + Detect presence of header file. + + * src/sfendian.h + Use intrinsics (ie for MinGW) when is not + present. + Make ENDSWAP_64() work with i686-w64-mingw32 compiler. + + * src/ALAC/EndianPortable.c + Add support for __powerpc__. + + * src/sfconfig.h + Make sure HAVE_X86INTRIN_H is either 1 or 0. + +2012-03-03 Erik de Castro Lopo + + * src/ALAC/* + Big dump of code for Apple's ALAC file format. The copyyright to this code + is owned by Apple who have released it under an Apache style license. A few + small modifications were made to allow this to be integrated into libsndfile + but unfortunately the history of those changes were lost because they were + developed in a Bzr tree and during that time libsndfile moved to Git. + + * src/alac.c src/caf.c src/common.[ch] src/Makefile.am src/sndfile.h.in + src/sndfile.c + Hook new ALAC codec in. + + * programs/sndfile-convert.c + Add support for alac codec. + + * tests/write_read_test.tpl + Expand tests to cover ALAC. + +2012-03-02 Erik de Castro Lopo + + * src/aiff.c src/wav.c + Fix a couple of regressions from version 1.0.25. + +2012-03-01 Erik de Castro Lopo + + * src/strings.c + Minor refactoring. Make sure that the memory allocation size if always > 0 + to avoid undefined behaviour. + +2012-02-29 Erik de Castro Lopo + + * src/chunk.c + Fix buffer overrun introduced in recently added chunk logging. This chunk + logging has not yet made it to a libsndfile release version. Thanks to + Olivier Tristan for providing an example file. + + * src/wav.c + Fix handling of odd sized chunks which was causing the parser to lose some + chunks. Thanks to Olivier Tristan for providing an example file. + +2012-02-26 Erik de Castro Lopo + + * tests/util.tpl + Used gnu_printf format checking with mingw-w64 compiler. + + * tests/header_test.tpl + Printf format fixes. + +2012-02-25 Erik de Castro Lopo + + * M4/extra_pkg.m4 + Update PKG_CHECK_MOD_VERSION macro to add an AC_TRY_LINK step. This fix + allows the configure process to catch attempts to link incompatible + libraries. For example, linking 32 bit version of eg libFLAC to a 64 bit + version of libsndfile will now fail. Similarly, when cross compiling + libsndfile from Linux to Windows linking the Linux versions of a library + to the Windows version of libsndfile will now also fail. + + * src/sndfile.h.in src/sndfile.c src/common.h src/create_symbols_file.py + Add API function sf_current_byterate(). + + * src/dwvw.c src/flac.c src/ogg_vorbis.c src/sds.c + Add codec specific handlers for current byterate. + + * tests/floating_point_test.tpl + Add initial test for sf_current_byterate(). + +2012-02-24 Erik de Castro Lopo + + * src/common.[ch] + Add function psf_decode_frame_count(). + + * src/dwvw.c + Fix a termnation bug that caused the decoder to go into an infinite loop. + +2012-02-24 Erik de Castro Lopo + + * src/wav.c + Fix a regression in the WAV header parser. Thanks to Olivier Tristan for + bug report and the example file. + +2012-02-21 Erik de Castro Lopo + + * src/sndfile.c + Return error when SF_BROADCAST_INFO struct has bad coding_history_size. + Thanks to Alex Weiss for the report. + +2012-02-20 Erik de Castro Lopo + + * src/au.c src/flac.c src/g72x.c src/ogg_vorbis.c src/wav_w64.c + Don't fake psf->bytewidth values. + +2012-02-19 Erik de Castro Lopo + + * tests/string_test.c + Fix valgrind warnings. + + * src/common.h src/sndfile.c src/strings.c + Make string storage dynamically allocated. + + * src/sndfile.c + Add extra validation for custom chunk handling. + +2012-02-18 Erik de Castro Lopo + + * src/wav.c + Improve handlling unknown chunk types. Thanks to Olivier Tristan for sending + example files. + + * src/utils.tpl + Add GCC specific testing for format string parameters for exit_if_true(). + + * tests/*.c tests/*.tpl + Fix all printf format warnings. + + * programs/sndfile-play.c + Remove un-needed OSX include . Thanks jamesfmilne for github + issue #3. + + * tests/chunk_test.c + Extend custom chunk test. + +2012-02-12 Erik de Castro Lopo + + * src/wav.c + Jump over some more chunk types while parsing. + +2012-02-04 Erik de Castro Lopo + + * src/common.h src/strings.c + Change way strings are stored in SF_PRIVATE in preparation for dynamically + allocating the storage. + +2012-02-02 Erik de Castro Lopo + + * src/common.h src*.c + Improve encapsulation of string data in SF_PRIVATE. + +2012-02-01 Erik de Castro Lopo + + * src/common.h src*.c + Remove the buffer union from SF_PRIVATE. Most uses of this have been + replaced with a BUF_UNION that is allocated on the stack. + +2012-01-31 Erik de Castro Lopo + + * src/common.h src*.c + Rename logbuffer field of SF_PRIVATE to parselog and reduce its size. + Put the parselog buffer and the index inside a struct within SF_PRIVATE. + +2012-01-26 Erik de Castro Lopo + + * configure.ac + Fix typo, FLAC_CLFAGS -> FLAC_CFLAGS. Thanks to Jeremy Friesner. + +2012-01-21 Erik de Castro Lopo + + * src/sndfile.c src/ogg.c + Fix misleading error message when trying to create an SF_FORMAT_OGG file + with anything other than SF_FORMAT_FILE. Thanks to Charles Van Winkle for + the bug report. Github issue #1. + +2012-01-20 Erik de Castro Lopo + + * src/sndfile.c src/wav.c + Allow files opened in RDWR mode with string data in the tailer to be + extended. Thanks to Bodo for the patch. + + * tests/string_test.c + Add tests for the above changes (patch from Bodo). + +2012-01-09 Erik de Castro Lopo + + * src/aiff.c + Refactor reading of chunk size and use of psf_store_read_chunk(). + + * src/(caf|wav).c + Correct storing of chunk offset. + +2012-01-05 Erik de Castro Lopo + + * src/aiff.c src/wav.c src/common.h + Refactor common code into src/common.h. + + * src/caf.c + Make custom chunks work for CAF files. + + * tests/chunk_test.c tests/test_wrapper.sh.in + Test CAF files with custom chunks. + + * src/sndfile.c + Prevent psf->codec_close() being called more than once. + +2012-01-04 Erik de Castro Lopo + + * programs/sndfile-cmp.c + Catch the case where the second file has more frames than the first. + +2012-01-02 Erik de Castro Lopo + + * src/create_symbols_file.py + Add sf_set_chunk/sf_get_chunk_size/sf_get_chunk_data. + +2011-12-31 Erik de Castro Lopo + + * tests/chunk_test.c tests/Makefile.am + New test for custom chunks. + + * src/aiff.c src/chunk.c src/common.h src/sndfile.c + Make custom chunks work on AIFF files. + + * src/wav.c + Make custom chunks work on WAV files (includes refactoring). + +2011-11-12 Erik de Castro Lopo + + * src/sndfile.h.in src/common.h src/sndfile.c + Start working on setting/getting chunks. + +2011-11-24 Erik de Castro Lopo + + * src/binheader_writef_check.py src/create_symbols_file.py + Make it work for Python 2 and 3. Thanks Michael. + +2011-11-19 Erik de Castro Lopo + + * libsndfile.spec.in + Change field name 'URL' to 'Url'. + + * src/sndfile.h.in + Add SF_SEEK_SET/CUR/END. + +2011-11-05 Erik de Castro Lopo + + * src/id3.c + Fix a stack overflow that can occur when parsing a file with multiple + ID3 headers which would cause libsndfile to go into an infinite recursion + until it blew the stack. Thanks to Anders Svensson for supplying an example + file. + +2011-10-30 Erik de Castro Lopo + + * src/double64.c src/float32.c src/common.h + Make (float32|double_64)_(be|le)_read() functions const correct. + +2011-10-28 Erik de Castro Lopo + + * src/sfendian.h + Minor tweaking of types. Cast to ptr to correct final type rather void*. + + * programs/sndfile-play.c tests/utils.tpl + Fix compiler warnings with latest MinGW cross compiler. + +2011-10-13 Erik de Castro Lopo + + * src/file_io.c + Use the non-deprecated resource fork name on OSX. Thanks to Olivier Tristan. + +2011-10-12 Erik de Castro Lopo + + * src/wav.c + Jump over the 'olym' chunks when parsing. + +2011-10-06 Erik de Castro Lopo + + * tests/write_read_test.tpl + Remove windows only truncate() implementation. + +2011-09-04 Erik de Castro Lopo + + * src/sd2.c src/sndfile.c + Make sure 23 bit PCM SD2 files are readable/writeable. + + * tests/write_read_test.tpl + Add tests for 32 bit PCM SD2 files. + +2011-08-23 Erik de Castro Lopo + + * configure.ac + Use AC_SYS_LARGEFILE instead of AC_SYS_EXTRA_LARGEFILE as suggested by + Jan Willies. + +2011-08-07 Erik de Castro Lopo + + * configure.ac Makefile.am + Move ACLOCAL_AMFLAGS setup to Makefile.am. + +2011-07-15 Erik de Castro Lopo + + * doc/command.html + Merge two separate blocks of SFC_SET_VBR_ENCODING_QUALITY documentation. + + * src/paf.c + Replace ppaf24->samplesperblock with a compile time constant. + +2011-07-13 Erik de Castro Lopo + + * src/ogg_vorbis.c + Fix return value of SFC_SET_VBR_ENCODING_QUALITY command. + + * doc/command.html + Document SFC_SET_VBR_ENCODING_QUALITY, SFC_GET/SET_LOOP_INFO and + SFC_GET_INSTRUMENT. + + * NEWS README configure.ac doc/*.html + Updates for 1.0.25. + +2011-07-07 Erik de Castro Lopo + + * src/sfconfig.h + Add handling for HAVE_SYS_WAIT_H. + + * Makefile.am src/Makefile.am tests/Makefile.am + Add 'checkprograms' target. + +2011-07-05 Erik de Castro Lopo + + * src/common.h src/sndfile.c + Purge SF_ASSERT macro. Use standard C assert instead. + + * src/paf.c src/common.h src/sndfile.c + Fix for Secunia Advisory SA45125, heap overflow (heap gets overwritten with + byte value of 0) due to integer overflow if PAF file handler. + + * src/ima_adpcm.c src/ms_adpcm.c src/paf.c + Use calloc instead of malloc followed by memset. + + * tests/utils.tpl + Clean up use of memset. + +2011-07-05 Erik de Castro Lopo + + * src/ogg.c + Fix log message. + + * tests/format_check_test.c + Fix compiler warnings. + +2011-07-04 Erik de Castro Lopo + + * src/sndfile.c + Fix error message for erro code SFE_ZERO_MINOR_FORMAT. + + * tests/format_check_test.c + Add a test to for SF_FINFO format field validation. + + * src/ogg.c src/ogg_vorbis.c src/ogg.h src/ogg_pcm.c src/ogg_speex.c + src/common.h src/Makefile.am + Move vorbis specific code to ogg_vorbis.c, add new files for handling PCM + and Speex codecs in an Ogg container. The later two are only enabled with + ENABLE_EXPERIMENTAL_CODE config variable. + +2011-06-28 Erik de Castro Lopo + + * src/strings.c + Clean up and refactor storage of SF_STR_SOFTWARE. + +2011-06-23 Erik de Castro Lopo + + * src/sndfile.h.in doc/api.html + Fix definition of SF_STR_LAST and update SF_STR_* related docs. Thanks to + Tim van der Molen for the patch. + +2011-06-21 Erik de Castro Lopo + + * programs/sndfile-interleave.c + Fix handling of argc. Thanks to Marius Hennecke. + + * src/wav_w64.c + Accept broken WAV files with blockalign == 0. Thanks to Olivier Tristan for + providing example files. + + * src/wav.c + Jump over 'FLLR' chunks. + +2011-06-14 Erik de Castro Lopo + + * src/sndfile.h.in + Fix -Wundef warning due to ENABLE_SNDFILE_WINDOWS_PROTOTYPES. + + * configure.ac + Add -Wundef to CFLAGS. + + * src/ogg.c + Fix -Wunder warning. + +2011-05-18 Erik de Castro Lopo + + * configure.ac + Use int64_t instead of off_t when they are the same size. + + * src/Makefile.am tests/Makefile.am + Use check_PROGRAMS instead of noinst_PROGRAMS where appropriate. + +2011-05-08 Erik de Castro Lopo + + * src/wav.c + Don't allow unknown and/or un-editable chunks to prevent the file from being + opened in SFM_RDWR mode. + +2011-04-25 Erik de Castro Lopo + + * tests/format_check_test.c + Fix segfault in test program. + +2011-04-25 Erik de Castro Lopo + + * tests/format_check_test.c + New test program to check to make sure that sf_open() and sf_check_format() + agree as to what is a valid program. + + * tests/Makefile.am tests/test_wrapper.sh.in + Hook into build and test runner. + + * src/sndfile.c + Fix some sf_format_check() problems. Thanks to Charles Van Winkle for the + notification. + +2011-04-06 Erik de Castro Lopo + + * src/caf.c + Add validation to size of 'data' chunk and fix size of written 'data' + chunk. Thanks to Michael Pruett for reporting this. + +2011-03-28 Erik de Castro Lopo + + * src/* tests/* programs/* + Fix a bunch of compiler warnings with gcc-4.6. + +2011-03-25 Erik de Castro Lopo + + * tests/util.tpl + Add NOT macro to util.h. + + * src/strings.c + Fix handling of SF_STR_SOFTWARE that resulted in a segfault due to calling + strlen() on an unterminated string. Thanks to Francois Thibaud for reporting + this problem. + + * tests/string_test.c + Add test for SF_STR_SOFTWARE segfault bug. + + * configure.ac + Sanitize FLAC_CFLAGS value supplied by pkg-config which returns a value of + '-I${includedir}/FLAC'. However FLAC also provides an include file + which clashes with the Standard C header of the same name. The + solution is strip the 'FLAC' part off the end and include all FLAC headers + as . + + * configure.ac src/Makefile.am + Use non-recursive make in src/ directory. + 2011-03-23 Erik de Castro Lopo * NEWS README docs/*.html @@ -284,7 +1155,7 @@ * src/sndfile.c Only support writing mono SVX files. Multichannel SVX files are not interleaved and there is no support infrastructure to cache and write - multiple channels to create a non-interleaved file. + multiple channels to create a non-interleaved file. * src/file_io.c Don't call close() on a file descriptor of -1. Thanks to Jeremy Friesner @@ -2771,7 +3642,7 @@ Add channel map tests. * src/common.h src/sndfile.c - Add a pointer the the SF_PRIVATE struct and make sure it gets freed in + Add a pointer to the SF_PRIVATE struct and make sure it gets freed in sf_close(). 2006-04-30 Erik de Castro Lopo @@ -5107,7 +5978,7 @@ * src/strings.c Found and fixed a bug which was causing psf_store_string() to fail on - Motorola 68k processors. Many thanks fo Joshua Haberman (Debian maintainer + Motorola 68k processors. Many thanks to Joshua Haberman (Debian maintainer of libsndfile) for compiling and running debug code to help me debug the problem. @@ -5938,7 +6809,7 @@ Document SFC_SET_RAW_START_OFFSET. * tests/raw_test.c tests/Makefile.am - Add new file for for testing SF_FORMAT_RAW specific functionality. + Add new file for testing SF_FORMAT_RAW specific functionality. * tests/dwvw_test.c Updates. @@ -8891,4 +9762,3 @@ This is the boundary between version 1 of the library above and version 0 below. * src/aiff.c: Changed reading of 'COMM' chunk to avoid reading an int which overlaps an int (4 byte) boundary. - diff --git a/lib-src/libsndfile/INSTALL b/lib-src/libsndfile/INSTALL deleted file mode 100644 index 209984075..000000000 --- a/lib-src/libsndfile/INSTALL +++ /dev/null @@ -1,370 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell command `./configure && make && make install' -should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. diff --git a/lib-src/libsndfile/M4/Makefile.am b/lib-src/libsndfile/M4/Makefile.am deleted file mode 100644 index 1ec5172e5..000000000 --- a/lib-src/libsndfile/M4/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = add_cflags.m4 clip_mode.m4 endian.m4 extra_largefile.m4 \ - flexible_array.m4 llrint.m4 lrint.m4 lrintf.m4 octave.m4 extra_pkg.m4 - diff --git a/lib-src/libsndfile/M4/Makefile.in b/lib-src/libsndfile/M4/Makefile.in deleted file mode 100644 index 098d5ef3a..000000000 --- a/lib-src/libsndfile/M4/Makefile.in +++ /dev/null @@ -1,491 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = M4 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = add_cflags.m4 clip_mode.m4 endian.m4 extra_largefile.m4 \ - flexible_array.m4 llrint.m4 lrint.m4 lrintf.m4 octave.m4 extra_pkg.m4 - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu M4/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu M4/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/M4/add_cflags.m4 b/lib-src/libsndfile/M4/add_cflags.m4 deleted file mode 100644 index 55a326c58..000000000 --- a/lib-src/libsndfile/M4/add_cflags.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl @synopsis MN_ADD_CFLAGS -dnl -dnl Add the given option to CFLAGS, if it doesn't break the compiler - -AC_DEFUN([MN_ADD_CFLAGS], -[AC_MSG_CHECKING([if $CC accepts $1]) - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="$1" - AC_TRY_LINK([ - #include - ], - [puts("Hello, World!"); return 0;], - AC_MSG_RESULT([yes]) - CFLAGS="$ac_add_cflags__old_cflags $1", - AC_MSG_RESULT([no]) - CFLAGS="$ac_add_cflags__old_cflags" - ) -])# MN_ADD_CFLAGS diff --git a/lib-src/libsndfile/M4/add_cxxflags.m4 b/lib-src/libsndfile/M4/add_cxxflags.m4 deleted file mode 100644 index 1c0a4deb9..000000000 --- a/lib-src/libsndfile/M4/add_cxxflags.m4 +++ /dev/null @@ -1,19 +0,0 @@ -dnl @synopsis MN_ADD_CXXFLAGS -dnl -dnl Add the given option to CXXFLAGS, if it doesn't break the compiler - -AC_DEFUN([MN_ADD_CXXFLAGS], -[AC_MSG_CHECKING([if $CXX accepts $1]) - AC_LANG_ASSERT([C++]) - ac_add_cxxflags__old_cxxflags="$CXXFLAGS" - CXXFLAGS="$1" - AC_TRY_LINK([ - #include - ], - [puts("Hello, World!"); return 0;], - AC_MSG_RESULT([yes]) - CXXFLAGS="$ac_add_cxxflags__old_cxxflags $1", - AC_MSG_RESULT([no]) - CXXFLAGS="$ac_add_cxxflags__old_cxxflags" - ) -])# MN_ADD_CXXFLAGS diff --git a/lib-src/libsndfile/M4/endian.m4 b/lib-src/libsndfile/M4/endian.m4 deleted file mode 100644 index 5d766ff39..000000000 --- a/lib-src/libsndfile/M4/endian.m4 +++ /dev/null @@ -1,155 +0,0 @@ -dnl @synopsis MN_C_FIND_ENDIAN -dnl -dnl Determine endian-ness of target processor. -dnl @version 1.1 Mar 03 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Majority written from scratch to replace the standard autoconf macro -dnl AC_C_BIGENDIAN. Only part remaining from the original it the invocation -dnl of the AC_TRY_RUN macro. -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. - -dnl Find endian-ness in the following way: -dnl 1) Look in . -dnl 2) If 1) fails, look in and . -dnl 3) If 1) and 2) fails and not cross compiling run a test program. -dnl 4) If 1) and 2) fails and cross compiling then guess based on target. - -AC_DEFUN([MN_C_FIND_ENDIAN], -[AC_CACHE_CHECK(processor byte ordering, - ac_cv_c_byte_order, - -# Initialize to unknown -ac_cv_c_byte_order=unknown - -if test x$ac_cv_header_endian_h = xyes ; then - - # First try which should set BYTE_ORDER. - - [AC_TRY_LINK([ - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - [AC_TRY_LINK([ - #include - #if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=big - )] - - fi - -if test $ac_cv_c_byte_order = unknown ; then - - [AC_TRY_LINK([ - #include - #include - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros - #endif - ], return 0 ;, - - [AC_TRY_LINK([ - #include - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - [AC_TRY_LINK([ - #include - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - )] - - fi - -if test $ac_cv_c_byte_order = unknown ; then - if test $cross_compiling = yes ; then - # This is the last resort. Try to guess the target processor endian-ness - # by looking at the target CPU type. - [ - case "$target_cpu" in - alpha* | i?86* | mipsel* | ia64*) - ac_cv_c_byte_order=little - ;; - - m68* | mips* | powerpc* | hppa* | sparc*) - ac_cv_c_byte_order=big - ;; - - esac - ] - else - AC_TRY_RUN( - [[ - int main (void) - { /* Are we little or big endian? From Harbison&Steele. */ - union - { long l ; - char c [sizeof (long)] ; - } u ; - u.l = 1 ; - return (u.c [sizeof (long) - 1] == 1); - } - ]], , ac_cv_c_byte_order=big, - ) - - AC_TRY_RUN( - [[int main (void) - { /* Are we little or big endian? From Harbison&Steele. */ - union - { long l ; - char c [sizeof (long)] ; - } u ; - u.l = 1 ; - return (u.c [0] == 1); - }]], , ac_cv_c_byte_order=little, - ) - fi - fi - -) - -if test $ac_cv_c_byte_order = big ; then - ac_cv_c_big_endian=1 - ac_cv_c_little_endian=0 -elif test $ac_cv_c_byte_order = little ; then - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=1 -else - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=0 - - AC_MSG_WARN([[*****************************************************************]]) - AC_MSG_WARN([[*** Not able to determine endian-ness of target processor. ]]) - AC_MSG_WARN([[*** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in ]]) - AC_MSG_WARN([[*** src/config.h may need to be hand editied. ]]) - AC_MSG_WARN([[*****************************************************************]]) - fi - -] -)# MN_C_FIND_ENDIAN - - diff --git a/lib-src/libsndfile/M4/extra_largefile.m4 b/lib-src/libsndfile/M4/extra_largefile.m4 deleted file mode 100644 index 3e614c3f7..000000000 --- a/lib-src/libsndfile/M4/extra_largefile.m4 +++ /dev/null @@ -1,114 +0,0 @@ -dnl By default, many hosts won't let programs access large files; -dnl one must use special compiler options to get large-file access to work. -dnl For more details about this brain damage please see: -dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html - -dnl Written by Paul Eggert . - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl MN_SYS_EXTRA_LARGEFILE_FLAGS(FLAGSNAME) -AC_DEFUN([MN_SYS_EXTRA_LARGEFILE_FLAGS], - [AC_CACHE_CHECK([for $1 value to request large file support], - ac_cv_sys_largefile_$1, - [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || { - ac_cv_sys_largefile_$1=no - ifelse($1, CFLAGS, - [case "$host_os" in - # IRIX 6.2 and later require cc -n32. -changequote(, )dnl - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) -changequote([, ])dnl - if test "$GCC" != yes; then - ac_cv_sys_largefile_CFLAGS=-n32 - fi - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no) - CC="$ac_save_CC" - esac]) - }])]) - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(VAR, VAL) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND], - [case $2 in - no) ;; - ?*) - case "[$]$1" in - '') $1=$2 ;; - *) $1=[$]$1' '$2 ;; - esac ;; - esac]) - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE], - [AC_CACHE_CHECK([for $1], $2, - [$2=no -changequote(, )dnl - $4 - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D$1) - $2=1 ;; - -D$1=*) - $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done -changequote([, ])dnl - ]) - if test "[$]$2" != no; then - AC_DEFINE_UNQUOTED([$1], [$]$2, [$3]) - fi]) - -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE], - [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) - if test "$enable_largefile" != no; then - AC_CHECK_TOOL(GETCONF, getconf) - MN_SYS_EXTRA_LARGEFILE_FLAGS(CFLAGS) - MN_SYS_EXTRA_LARGEFILE_FLAGS(LDFLAGS) - MN_SYS_EXTRA_LARGEFILE_FLAGS(LIBS) - - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - no) ;; - -D_FILE_OFFSET_BITS=*) ;; - -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; - -D_LARGE_FILES | -D_LARGE_FILES=*) ;; - -D?* | -I?*) - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;; - *) - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;; - esac - done - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS") - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS") - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, - ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.]) - [case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_file_offset_bits=64 ;; - esac] - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, - ac_cv_sys_largefile_source, - [Define to make fseeko etc. visible, on some hosts.], - [case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_largefile_source=1 ;; - esac]) - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_LARGE_FILES, - ac_cv_sys_large_files, - [Define for large files, on AIX-style hosts.], - [case "$host_os" in - # AIX 4.2 and later - aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) - ac_cv_sys_large_files=1 ;; - esac]) - fi - ]) - diff --git a/lib-src/libsndfile/M4/gcc_version.m4 b/lib-src/libsndfile/M4/gcc_version.m4 deleted file mode 100644 index 1ef28d931..000000000 --- a/lib-src/libsndfile/M4/gcc_version.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl @synopsis MN_GCC_VERSION -dnl -dnl Find the version of gcc. -dnl @version 1.0 Nov 05 2007 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl - -AC_DEFUN([MN_GCC_VERSION], -[ -if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then - - AC_MSG_CHECKING([for version of $CC]) - GCC_VERSION=`$CC -dumpversion` - AC_MSG_RESULT($GCC_VERSION) - - changequote(,)dnl - GCC_MINOR_VERSION=`echo $GCC_VERSION | sed "s/^[0-9]\+\.//" | sed "s/\..*//"` - GCC_MAJOR_VERSION=`echo $GCC_VERSION | sed "s/\..*//"` - changequote([,])dnl - fi - -AC_SUBST(GCC_VERSION) -AC_SUBST(GCC_MAJOR_VERSION) -AC_SUBST(GCC_MINOR_VERSION) - -])# MN_GCC_VERSION - diff --git a/lib-src/libsndfile/M4/libtool.m4 b/lib-src/libsndfile/M4/libtool.m4 deleted file mode 100644 index d7c043f4f..000000000 --- a/lib-src/libsndfile/M4/libtool.m4 +++ /dev/null @@ -1,7997 +0,0 @@ -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 57 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - -## ------------------------------------- ## -## Accumulate code for creating libtool. ## -## ------------------------------------- ## - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - -## ------------------------ ## -## FIXME: Eliminate VARNAME ## -## ------------------------ ## - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -_LT_OUTPUT_LIBTOOL_INIT -]) - -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) - -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_REPLACE_SHELLFNS - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -m4_ifndef([AC_PROG_GO], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac - -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], -[], [with_sysroot=no]) - -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac - - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) - -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - - -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; - *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; - esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF -]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) - -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl - -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac -]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/lib-src/libsndfile/M4/llrint.m4 b/lib-src/libsndfile/M4/llrint.m4 deleted file mode 100644 index 66be20618..000000000 --- a/lib-src/libsndfile/M4/llrint.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl @synopsis MN_C99_FUNC_LLRINT -dnl -dnl Check whether C99's llrint function is available. -dnl @version 1.1 Sep 30 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl -AC_DEFUN([MN_C99_FUNC_LLRINT], -[AC_CACHE_CHECK(for llrint, - ac_cv_c99_llrint, -[ -llrint_save_CFLAGS=$CFLAGS -CFLAGS="-lm" -AC_TRY_LINK([ -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include -#include -], int64_t x ; x = llrint(3.14159) ;, ac_cv_c99_llrint=yes, ac_cv_c99_llrint=no) - -CFLAGS=$llrint_save_CFLAGS - -]) - -if test "$ac_cv_c99_llrint" = yes; then - AC_DEFINE(HAVE_LLRINT, 1, - [Define if you have C99's llrint function.]) -fi -])# MN_C99_FUNC_LLRINT - diff --git a/lib-src/libsndfile/M4/lrint.m4 b/lib-src/libsndfile/M4/lrint.m4 deleted file mode 100644 index c2c21d60f..000000000 --- a/lib-src/libsndfile/M4/lrint.m4 +++ /dev/null @@ -1,37 +0,0 @@ -dnl @synopsis MN_C99_FUNC_LRINT -dnl -dnl Check whether C99's lrint function is available. -dnl @version 1.3 Feb 12 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl -AC_DEFUN([MN_C99_FUNC_LRINT], -[AC_CACHE_CHECK(for lrint, - ac_cv_c99_lrint, -[ -lrint_save_CFLAGS=$CFLAGS -CFLAGS="-lm" -AC_TRY_LINK([ -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include -], if (!lrint(3.14159)) lrint(2.7183);, ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no) - -CFLAGS=$lrint_save_CFLAGS - -]) - -if test "$ac_cv_c99_lrint" = yes; then - AC_DEFINE(HAVE_LRINT, 1, - [Define if you have C99's lrint function.]) -fi -])# MN_C99_FUNC_LRINT - diff --git a/lib-src/libsndfile/M4/lrintf.m4 b/lib-src/libsndfile/M4/lrintf.m4 deleted file mode 100644 index 04f4d6603..000000000 --- a/lib-src/libsndfile/M4/lrintf.m4 +++ /dev/null @@ -1,37 +0,0 @@ -dnl @synopsis MN_C99_FUNC_LRINTF -dnl -dnl Check whether C99's lrintf function is available. -dnl @version 1.3 Feb 12 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl -AC_DEFUN([MN_C99_FUNC_LRINTF], -[AC_CACHE_CHECK(for lrintf, - ac_cv_c99_lrintf, -[ -lrintf_save_CFLAGS=$CFLAGS -CFLAGS="-lm" -AC_TRY_LINK([ -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include -], if (!lrintf(3.14159)) lrintf(2.7183);, ac_cv_c99_lrintf=yes, ac_cv_c99_lrintf=no) - -CFLAGS=$lrintf_save_CFLAGS - -]) - -if test "$ac_cv_c99_lrintf" = yes; then - AC_DEFINE(HAVE_LRINTF, 1, - [Define if you have C99's lrintf function.]) -fi -])# MN_C99_FUNC_LRINTF - diff --git a/lib-src/libsndfile/M4/ltoptions.m4 b/lib-src/libsndfile/M4/ltoptions.m4 deleted file mode 100644 index 5d9acd8e2..000000000 --- a/lib-src/libsndfile/M4/ltoptions.m4 +++ /dev/null @@ -1,384 +0,0 @@ -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 7 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - -## --------------------------------- ## -## Macros to handle LT_INIT options. ## -## --------------------------------- ## - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - -## ----------------- ## -## LTDL_INIT Options ## -## ----------------- ## - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) diff --git a/lib-src/libsndfile/M4/ltsugar.m4 b/lib-src/libsndfile/M4/ltsugar.m4 deleted file mode 100644 index 9000a057d..000000000 --- a/lib-src/libsndfile/M4/ltsugar.m4 +++ /dev/null @@ -1,123 +0,0 @@ -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) diff --git a/lib-src/libsndfile/M4/ltversion.m4 b/lib-src/libsndfile/M4/ltversion.m4 deleted file mode 100644 index 07a8602d4..000000000 --- a/lib-src/libsndfile/M4/ltversion.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# @configure_input@ - -# serial 3337 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) diff --git a/lib-src/libsndfile/M4/lt~obsolete.m4 b/lib-src/libsndfile/M4/lt~obsolete.m4 deleted file mode 100644 index c573da90c..000000000 --- a/lib-src/libsndfile/M4/lt~obsolete.m4 +++ /dev/null @@ -1,98 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 5 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/lib-src/libsndfile/Makefile.am b/lib-src/libsndfile/Makefile.am index 2f1f58ce3..a2aff6cdc 100644 --- a/lib-src/libsndfile/Makefile.am +++ b/lib-src/libsndfile/Makefile.am @@ -1,40 +1,499 @@ ## Process this file with automake to produce Makefile.in -ACLOCAL_AMFLAGS = -I M4 +AM_CPPFLAGS = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS) -DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror +DISTCHECK_CONFIGURE_FLAGS = --enable-werror +CLEANFILES = programs/*.wav octave-workspace + +if FULL_SUITE if BUILD_OCTAVE_MOD -octave_dir = Octave +SUBDIRS = Octave +endif endif -SUBDIRS = M4 man doc Win32 src #$(octave_dir) examples regtest tests programs -DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs +EXTRA_DIST = libsndfile.spec.in sndfile.pc.in Scripts/android-configure.sh \ + Scripts/linux-to-win-cross-configure.sh \ + CMakeLists.txt $(cmake_files) Win32 -EXTRA_DIST = libsndfile.spec.in sndfile.pc.in +cmake_files = cmake/ClipMode.cmake cmake/FindFLAC.cmake \ + cmake/CMakeAutoGen.cmake cmake/CMakeAutoGenScript.cmake \ + cmake/FindOgg.cmake cmake/FindVorbis.cmake cmake/FindSndio.cmake \ + cmake/FindSpeex.cmake cmake/FindSQLite3.cmake cmake/FindVorbisEnc.cmake \ + cmake/SndFileChecks.cmake cmake/TestInline.cmake \ + cmake/TestLargeFiles.cmake cmake/TestInline.c.in \ + cmake/FindOpus.cmake cmake/SndFileConfig.cmake.in -CLEANFILES = *~ - -pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = sndfile.pc -m4datadir = $(datadir)/aclocal - #=============================================================================== -test: check-recursive +test: check -# Target to make autogenerated files. -genfiles : - (cd src ; make genfiles) - (cd tests ; make genfiles) +# Need this target to force building of test programs. +checkprograms: $(check_PROGRAMS) +######## +# src/ # +######## -testprogs : - (cd src ; make testprogs) - (cd tests ; make testprogs) +BUILT_SOURCES = src/test_endswap.c +SYMBOL_FILES = src/Symbols.gnu-binutils src/Symbols.darwin src/libsndfile-1.def src/Symbols.os2 src/Symbols.static -test-tarball : build-test-tarball.mk - make all - make -f build-test-tarball.mk +EXTRA_DIST += src/sndfile.h.in src/config.h.in src/test_endswap.tpl src/test_endswap.def \ + $(SYMBOL_FILES) src/create_symbols_file.py src/binheader_writef_check.py \ + src/GSM610/README src/GSM610/COPYRIGHT src/GSM610/ChangeLog \ + src/G72x/README src/G72x/README.original src/G72x/ChangeLog \ + src/make-static-lib-hidden-privates.sh \ + src/config.h.cmake + +if USE_WIN_VERSION_FILE +WIN_VERSION_FILE = src/version-metadata.rc +else +WIN_VERSION_FILE = +endif + +#=============================================================================== + +lib_LTLIBRARIES = src/libsndfile.la +include_HEADERS = src/sndfile.hh +nodist_include_HEADERS = src/sndfile.h +src_libsndfile_la_CFLAGS = $(EXTERNAL_XIPH_CFLAGS) +# MinGW requires -no-undefined if a DLL is to be built. +src_libsndfile_la_LDFLAGS = -no-undefined -version-info $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG) +src_libsndfile_la_SOURCES = src/sndfile.c src/aiff.c src/au.c src/avr.c src/caf.c src/dwd.c src/flac.c src/g72x.c src/htk.c src/ircam.c \ + src/macos.c src/mat4.c src/mat5.c src/nist.c src/paf.c src/pvf.c src/raw.c src/rx2.c src/sd2.c \ + src/sds.c src/svx.c src/txw.c src/voc.c src/wve.c src/w64.c src/wavlike.c src/wav.c src/xi.c src/mpc2k.c src/rf64.c \ + src/ogg_vorbis.c src/ogg_speex.c src/ogg_pcm.c src/ogg_opus.c src/ogg_vcomment.c \ + src/common.h src/sfconfig.h src/sfendian.h src/wavlike.h src/sf_unistd.h src/ogg.h src/chanmap.h src/ogg_vcomment.h +nodist_src_libsndfile_la_SOURCES = $(nodist_include_HEADERS) +src_libsndfile_la_LIBADD = src/GSM610/libgsm.la src/G72x/libg72x.la src/ALAC/libalac.la \ + src/libcommon.la $(EXTERNAL_XIPH_LIBS) -lm +EXTRA_src_libsndfile_la_DEPENDENCIES = $(SYMBOL_FILES) + +noinst_LTLIBRARIES = src/libcommon.la +src_libcommon_la_CFLAGS = $(EXTERNAL_XIPH_CFLAGS) +src_libcommon_la_SOURCES = src/common.c src/file_io.c src/command.c src/pcm.c src/ulaw.c src/alaw.c \ + src/float32.c src/double64.c src/ima_adpcm.c src/ms_adpcm.c src/gsm610.c src/dwvw.c src/vox_adpcm.c \ + src/interleave.c src/strings.c src/dither.c src/cart.c src/broadcast.c src/audio_detect.c \ + src/ima_oki_adpcm.c src/ima_oki_adpcm.h src/alac.c src/chunk.c src/ogg.c src/chanmap.c \ + src/windows.c src/id3.c src/nms_adpcm.c $(WIN_VERSION_FILE) + +check_PROGRAMS = src/test_main +src_test_main_SOURCES = src/test_main.c src/test_main.h src/test_conversions.c src/test_float.c src/test_endswap.c \ + src/test_audio_detect.c src/test_log_printf.c src/test_file_io.c src/test_ima_oki_adpcm.c \ + src/test_strncpy_crlf.c src/test_broadcast_var.c src/test_cart_var.c \ + src/test_binheader_writef.c src/test_nms_adpcm.c +src_test_main_LDADD = src/libcommon.la + +############## +# src/GSM610 # +############## + +noinst_LTLIBRARIES += src/GSM610/libgsm.la +src_GSM610_libgsm_la_SOURCES = src/GSM610/config.h src/GSM610/gsm.h src/GSM610/gsm610_priv.h \ + src/GSM610/add.c src/GSM610/code.c src/GSM610/decode.c src/GSM610/gsm_create.c \ + src/GSM610/gsm_decode.c src/GSM610/gsm_destroy.c src/GSM610/gsm_encode.c \ + src/GSM610/gsm_option.c src/GSM610/long_term.c src/GSM610/lpc.c src/GSM610/preprocess.c \ + src/GSM610/rpe.c src/GSM610/short_term.c src/GSM610/table.c + +############ +# src/G72x # +############ + +noinst_LTLIBRARIES += src/G72x/libg72x.la +src_G72x_libg72x_la_SOURCES = src/G72x/g72x.h src/G72x/g72x_priv.h \ + src/G72x/g721.c src/G72x/g723_16.c src/G72x/g723_24.c src/G72x/g723_40.c src/G72x/g72x.c + +check_PROGRAMS += src/G72x/g72x_test +src_G72x_g72x_test_SOURCES = src/G72x/g72x_test.c +src_G72x_g72x_test_LDADD = src/G72x/libg72x.la + +############ +# src/ALAC # +############ + +noinst_LTLIBRARIES += src/ALAC/libalac.la +src_ALAC_libalac_la_SOURCES = src/ALAC/ALACAudioTypes.h src/ALAC/ALACBitUtilities.h \ + src/ALAC/EndianPortable.h src/ALAC/aglib.h src/ALAC/dplib.h src/ALAC/matrixlib.h \ + src/ALAC/alac_codec.h src/ALAC/shift.h \ + src/ALAC/ALACBitUtilities.c src/ALAC/ag_dec.c \ + src/ALAC/ag_enc.c src/ALAC/dp_dec.c src/ALAC/dp_enc.c src/ALAC/matrix_dec.c \ + src/ALAC/matrix_enc.c src/ALAC/alac_decoder.c src/ALAC/alac_encoder.c + +#=============================================================================== +# Generate an OS specific Symbols files. This is done when the author +# builds the distribution tarball. There should be not need for the +# end user to create these files. + +# "$<" cannot portably be used in the recipe across Make implementations +# https://www.gnu.org/software/autoconf/manual/autoconf.html#g_t_0024_003c-in-Ordinary-Make-Rules +SYMBOL_SCRIPT = $(top_srcdir)/src/create_symbols_file.py + +src/Symbols.gnu-binutils: $(SYMBOL_SCRIPT) + $(PYTHON) $(SYMBOL_SCRIPT) linux $(VERSION) > $(top_srcdir)/$@ + +src/Symbols.darwin: $(SYMBOL_SCRIPT) + $(PYTHON) $(SYMBOL_SCRIPT) darwin $(VERSION) > $(top_srcdir)/$@ + +src/libsndfile-1.def: $(SYMBOL_SCRIPT) + $(PYTHON) $(SYMBOL_SCRIPT) win32 $(VERSION) > $(top_srcdir)/$@ + +src/Symbols.os2: $(SYMBOL_SCRIPT) + $(PYTHON) $(SYMBOL_SCRIPT) os2 $(VERSION) > $(top_srcdir)/$@ + +src/Symbols.static: $(SYMBOL_SCRIPT) + $(PYTHON) $(SYMBOL_SCRIPT) static $(VERSION) > $(top_srcdir)/$@ + +#=============================================================================== +# Building windows resource files (if needed). + +.rc.lo: + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) $< -o $@ + +#=============================================================================== +# Disable autoheader. +AUTOHEADER=echo + +######## +# doc/ # +######## + +if FULL_SUITE +dist_html_DATA = doc/index.html doc/libsndfile.jpg doc/libsndfile.css doc/print.css doc/api.html \ + doc/command.html doc/bugs.html doc/sndfile_info.html doc/new_file_type.HOWTO \ + doc/win32.html doc/FAQ.html doc/lists.html doc/embedded_files.html doc/octave.html \ + doc/tutorial.html +endif + +############# +# examples/ # +############# + +check_PROGRAMS += examples/make_sine examples/sfprocess examples/list_formats examples/generate examples/sndfilehandle \ + examples/sndfile-to-text examples/sndfile-loopify + +examples_sndfile_to_text_SOURCES = examples/sndfile-to-text.c +examples_sndfile_to_text_LDADD = src/libsndfile.la + +examples_sndfile_loopify_SOURCES = examples/sndfile-loopify.c +examples_sndfile_loopify_LDADD = src/libsndfile.la + +examples_make_sine_SOURCES = examples/make_sine.c +examples_make_sine_LDADD = src/libsndfile.la + +examples_sfprocess_SOURCES = examples/sfprocess.c +examples_sfprocess_LDADD = src/libsndfile.la + +examples_list_formats_SOURCES = examples/list_formats.c +examples_list_formats_LDADD = src/libsndfile.la + +examples_generate_SOURCES = examples/generate.c +examples_generate_LDADD = src/libsndfile.la + +examples_sndfilehandle_SOURCES = examples/sndfilehandle.cc +examples_sndfilehandle_LDADD = src/libsndfile.la + +########## +# tests/ # +########## + +TESTS_ENVIRONMENT = $(SHELL) tests/test_wrapper.sh + +if ENABLE_TEST_COVERAGE +CPP_TEST = +else +CPP_TEST = tests/cpp_test +endif + +TESTS = tests/pedantic-header-test.sh + +check_PROGRAMS += tests/sfversion tests/floating_point_test tests/write_read_test \ + tests/lossy_comp_test tests/error_test tests/ulaw_test tests/alaw_test tests/dwvw_test \ + tests/peak_chunk_test tests/command_test tests/stdio_test \ + tests/pcm_test tests/headerless_test tests/pipe_test tests/header_test tests/misc_test \ + tests/raw_test tests/string_test tests/multi_file_test tests/chunk_test \ + tests/scale_clip_test tests/win32_test tests/aiff_rw_test tests/virtual_io_test \ + tests/locale_test tests/win32_ordinal_test tests/ogg_test tests/compression_size_test \ + tests/checksum_test tests/external_libs_test tests/rdwr_test tests/format_check_test $(CPP_TEST) \ + tests/channel_test tests/long_read_write_test tests/stdin_test tests/stdout_test \ + tests/dither_test tests/fix_this tests/largefile_test tests/benchmark tests/ogg_opus_test + +BUILT_SOURCES += \ + tests/write_read_test.c \ + tests/pcm_test.c \ + tests/header_test.c \ + tests/utils.c \ + tests/scale_clip_test.c \ + tests/pipe_test.c \ + tests/rdwr_test.c \ + tests/floating_point_test.c \ + tests/benchmark.c + +EXTRA_DIST += $(BUILT_SOURCES) \ + tests/write_read_test.tpl tests/write_read_test.def \ + tests/pcm_test.tpl tests/pcm_test.def \ + tests/header_test.tpl tests/header_test.def \ + tests/utils.tpl tests/utils.def \ + tests/scale_clip_test.tpl tests/scale_clip_test.def \ + tests/pipe_test.tpl tests/pipe_test.def \ + tests/rdwr_test.tpl tests/rdwr_test.def \ + tests/floating_point_test.tpl tests/floating_point_test.def \ + tests/benchmark.tpl tests/benchmark.def + +# If we're cross compiling from Linux to Windows and running the test suite +# under Wine, we need a symbolic link to the generated libsndfile DLL. + +if LINUX_MINGW_CROSS_TEST + +$(check_PROGRAMS) : libsndfile-1.dll + +libsndfile-1.dll : + $(LN_S) src/.libs/$@ $@ + +clean-local : + -rm -f libsndfile-1.dll + +endif + +#=============================================================================== + +tests_sfversion_SOURCES = tests/sfversion.c +tests_sfversion_LDADD = src/libsndfile.la + +tests_write_read_test_SOURCES = tests/utils.c tests/generate.c tests/generate.h tests/write_read_test.c tests/utils.h +tests_write_read_test_LDADD = src/libsndfile.la + +tests_lossy_comp_test_SOURCES = tests/utils.c tests/lossy_comp_test.c tests/utils.h +tests_lossy_comp_test_LDADD = src/libsndfile.la + +tests_fix_this_SOURCES = tests/utils.c tests/fix_this.c tests/utils.h +tests_fix_this_LDADD = src/libsndfile.la + +tests_error_test_SOURCES = tests/error_test.c tests/utils.c tests/utils.h +tests_error_test_LDADD = src/libsndfile.la + +tests_ulaw_test_SOURCES = tests/utils.c tests/ulaw_test.c tests/utils.h +tests_ulaw_test_LDADD = src/libsndfile.la + +tests_alaw_test_SOURCES = tests/utils.c tests/alaw_test.c tests/utils.h +tests_alaw_test_LDADD = src/libsndfile.la + +tests_aiff_rw_test_SOURCES = tests/utils.c tests/aiff_rw_test.c tests/utils.h +tests_aiff_rw_test_LDADD = src/libsndfile.la + +tests_command_test_SOURCES = tests/command_test.c tests/utils.c tests/utils.h +tests_command_test_LDADD = src/libsndfile.la + +tests_locale_test_SOURCES = tests/locale_test.c tests/utils.c tests/utils.h +tests_locale_test_LDADD = src/libsndfile.la + +tests_largefile_test_SOURCES = tests/largefile_test.c tests/utils.c tests/utils.h +tests_largefile_test_LDADD = src/libsndfile.la + +tests_pcm_test_SOURCES = tests/pcm_test.c tests/utils.c tests/utils.h +tests_pcm_test_LDADD = src/libsndfile.la + +tests_headerless_test_SOURCES = tests/utils.c tests/headerless_test.c tests/utils.h +tests_headerless_test_LDADD = src/libsndfile.la + +tests_stdin_test_SOURCES = tests/stdin_test.c tests/utils.c tests/utils.h +tests_stdin_test_LDADD = src/libsndfile.la + +tests_stdout_test_SOURCES = tests/stdout_test.c tests/utils.h +tests_stdout_test_LDADD = src/libsndfile.la + +tests_stdio_test_SOURCES = tests/stdio_test.c tests/utils.c tests/utils.h +tests_stdio_test_LDADD = src/libsndfile.la + +tests_pipe_test_SOURCES = tests/pipe_test.c tests/utils.c tests/utils.h +tests_pipe_test_LDADD = src/libsndfile.la + +tests_benchmark_SOURCES = tests/benchmark.c tests/utils.h +tests_benchmark_LDADD = src/libsndfile.la + +tests_header_test_SOURCES = tests/header_test.c tests/utils.c tests/utils.h +tests_header_test_LDADD = src/libsndfile.la + +tests_misc_test_SOURCES = tests/misc_test.c tests/utils.c tests/utils.h +tests_misc_test_LDADD = src/libsndfile.la + +tests_raw_test_SOURCES = tests/raw_test.c tests/utils.c tests/utils.h +tests_raw_test_LDADD = src/libsndfile.la + +tests_string_test_SOURCES = tests/string_test.c tests/utils.c tests/utils.h +tests_string_test_LDADD = src/libsndfile.la + +tests_dither_test_SOURCES = tests/dither_test.c tests/utils.c tests/utils.h +tests_dither_test_LDADD = src/libsndfile.la + +tests_chunk_test_SOURCES = tests/chunk_test.c tests/utils.c tests/utils.h +tests_chunk_test_LDADD = src/libsndfile.la + +tests_multi_file_test_SOURCES = tests/multi_file_test.c tests/utils.c tests/utils.h +tests_multi_file_test_LDADD = src/libsndfile.la + +tests_virtual_io_test_SOURCES = tests/virtual_io_test.c tests/utils.c tests/utils.h +tests_virtual_io_test_LDADD = src/libsndfile.la + +tests_ogg_test_SOURCES = tests/ogg_test.c tests/utils.c tests/utils.h +tests_ogg_test_LDADD = src/libsndfile.la + +tests_ogg_opus_test_SOURCES = tests/ogg_opus_test.c tests/utils.c tests/utils.h +tests_ogg_opus_test_LDADD = src/libsndfile.la + +tests_compression_size_test_SOURCES = tests/compression_size_test.c tests/utils.c tests/utils.h tests/dft_cmp.h +tests_compression_size_test_LDADD = src/libsndfile.la + +tests_rdwr_test_SOURCES = tests/rdwr_test.c tests/utils.c tests/utils.h +tests_rdwr_test_LDADD = src/libsndfile.la + +tests_win32_test_SOURCES = tests/win32_test.c +# Link lib here so that generating the testsuite tarball works correctly. +tests_win32_test_LDADD = src/libsndfile.la + +tests_win32_ordinal_test_SOURCES = tests/win32_ordinal_test.c tests/utils.c tests/utils.h +tests_win32_ordinal_test_LDADD = src/libsndfile.la + +tests_external_libs_test_SOURCES = tests/external_libs_test.c tests/utils.c tests/utils.h +tests_external_libs_test_LDADD = src/libsndfile.la + +tests_format_check_test_SOURCES = tests/format_check_test.c tests/utils.c tests/utils.h +tests_format_check_test_LDADD = src/libsndfile.la + +tests_channel_test_SOURCES = tests/channel_test.c tests/utils.c tests/utils.h +tests_channel_test_LDADD = src/libsndfile.la + +tests_long_read_write_test_SOURCES = tests/long_read_write_test.c tests/utils.c tests/utils.h tests/dft_cmp.h +tests_long_read_write_test_LDADD = src/libsndfile.la + +tests_cpp_test_SOURCES = tests/cpp_test.cc tests/utils.c tests/utils.h +tests_cpp_test_LDADD = src/libsndfile.la + +tests_checksum_test_SOURCES = tests/checksum_test.c tests/utils.c tests/utils.h +tests_checksum_test_LDADD = src/libsndfile.la + +# Lite remove start +tests_dwvw_test_SOURCES = tests/dwvw_test.c tests/utils.c tests/utils.h +tests_dwvw_test_LDADD = src/libsndfile.la + +tests_floating_point_test_SOURCES = tests/utils.c tests/utils.h tests/dft_cmp.c tests/dft_cmp.h tests/floating_point_test.c +tests_floating_point_test_LDADD = src/libsndfile.la + +tests_peak_chunk_test_SOURCES = tests/peak_chunk_test.c tests/utils.c tests/utils.h +tests_peak_chunk_test_LDADD = src/libsndfile.la + +tests_scale_clip_test_SOURCES = tests/scale_clip_test.c tests/utils.c tests/utils.h +tests_scale_clip_test_LDADD = src/libsndfile.la +# Lite remove end + +#=============================================================================== +# Autogen generated sources. +# Coerce the multiple inputs -> multiple outputs problem +# into suffix rules by "linearising" the dependency graph. +# Yes, this sucks, but GNU make patterns aren't portable, +# see also https://github.com/erikd/libsndfile/issues/369 + +SUFFIXES = .tpl .def + +.tpl.def: + touch $@ + +# unconditionally running touch on the .def +# files is necessary to keep all timestamps +# consistent, in order to prevent stale files +# from calling autogen in tarball releases. +.def.c: + $(MAKE) $(AM_MAKEFLAGS) $< + cd $(top_srcdir)/$(@D) && autogen --writable $(&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/libsndfile.spec.in $(srcdir)/sndfile.pc.in \ - $(srcdir)/build-test-tarball.mk.in COPYING Cfg/compile \ - Cfg/config.guess Cfg/config.sub Cfg/depcomp Cfg/install-sh \ - Cfg/missing Cfg/ltmain.sh $(top_srcdir)/Cfg/compile \ - $(top_srcdir)/Cfg/config.guess $(top_srcdir)/Cfg/config.sub \ - $(top_srcdir)/Cfg/install-sh $(top_srcdir)/Cfg/ltmain.sh \ - $(top_srcdir)/Cfg/missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = libsndfile.spec sndfile.pc build-test-tarball.mk -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(pkgconfigdir)" -DATA = $(pkgconfig_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi -am__post_remove_distdir = $(am__remove_distdir) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -DIST_TARGETS = dist-gzip -distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I M4 -DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror -@BUILD_OCTAVE_MOD_TRUE@octave_dir = Octave -SUBDIRS = M4 man doc Win32 src #$(octave_dir) examples regtest tests programs -DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs -EXTRA_DIST = libsndfile.spec.in sndfile.pc.in -CLEANFILES = *~ -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = sndfile.pc -m4datadir = $(datadir)/aclocal -all: all-recursive - -.SUFFIXES: -am--refresh: Makefile - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): -libsndfile.spec: $(top_builddir)/config.status $(srcdir)/libsndfile.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -sndfile.pc: $(top_builddir)/config.status $(srcdir)/sndfile.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -build-test-tarball.mk: $(top_builddir)/config.status $(srcdir)/build-test-tarball.mk.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool config.lt -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscope: cscope.files - test ! -s cscope.files \ - || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -clean-cscope: - -rm -f cscope.files -cscope.files: clean-cscope cscopelist -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) - -dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - -dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) - -dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir) - chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__post_remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-pkgconfigDATA - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-pkgconfigDATA - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-libtool cscope cscopelist-am ctags ctags-am dist \ - dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-pkgconfigDATA - - -#=============================================================================== - -test: check-recursive - -# Target to make autogenerated files. -genfiles : - (cd src ; make genfiles) - (cd tests ; make genfiles) - -testprogs : - (cd src ; make testprogs) - (cd tests ; make testprogs) - -test-tarball : build-test-tarball.mk - make all - make -f build-test-tarball.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/NEWS b/lib-src/libsndfile/NEWS index 6d6cadd8f..d8f549f4e 100644 --- a/lib-src/libsndfile/NEWS +++ b/lib-src/libsndfile/NEWS @@ -1,3 +1,32 @@ +Version 1.0.28 (2017-04-02) + * Fix buffer overruns in FLAC and ID3 handling code. + * Move to variable length header storage. + * Fix detection of Large File Support for 32 bit systems. + * Remove large stack allocations in ALAC handling code. + * Remove all use of Variable Length Arrays. + * Minor bug fixes and improvements. + +Version 1.0.27 (2016-06-19) + * Fix an SF_INFO seekable flag regression introduced in 1.0.26. + * Fix potential infinite loops on malformed input files. + * Add string metadata read/write for CAF and RF64. + * Add handling of CUE chunks. + * Fix endian-ness issues in PAF files. + * Minor bug fixes and improvements. + +Version 1.0.26 (2015-11-22) + * Fix for CVE-2014-9496, SD2 buffer read overflow. + * Fix for CVE-2014-9756, file_io.c divide by zero. + * Fix for CVE-2015-7805, AIFF heap write overflow. + * Add support for ALAC encoder in a CAF container. + * Add support for Cart chunks in WAV files. + * Minor bug fixes and improvements. + +Version 1.0.25 (2011-07-13) + * Fix for Secunia Advisory SA45125, heap overflow in PAF file handler. + * Accept broken WAV files with blockalign == 0. + * Minor bug fixes and improvements. + Version 1.0.24 (2011-03-23) * WAV files now have an 18 byte u-law and A-law fmt chunk. * Document virtual I/O functionality. diff --git a/lib-src/libsndfile/Octave/Makefile.am b/lib-src/libsndfile/Octave/Makefile.am index a6c5f5854..3f0078e18 100644 --- a/lib-src/libsndfile/Octave/Makefile.am +++ b/lib-src/libsndfile/Octave/Makefile.am @@ -39,10 +39,10 @@ QUIET_GEN = $(Q:@=@echo ' GEN '$@;) # Use Octave's mkoctfile to do all the heavy lifting. Unfortunately, its # a little dumb so we need to guide it carefully. sndfile.oct : sndfile.o - $(QUIET_GEN) $(MKOCTFILE) -v $(AM_CPPFLAGS) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null + $(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null sndfile.o : sndfile.cc - $(QUIET_GEN) $(MKOCTFILE) -v $(AM_CPPFLAGS) -c $+ -o $(top_builddir)/Octave/$@ > /dev/null + $(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) -c $+ -o $(top_builddir)/Octave/$@ > /dev/null # Allow for the test being run in the build dir, but the test script # being located in the source dir. @@ -76,3 +76,4 @@ uninstall-local : clean-local : rm -f sndfile.o sndfile.oct + @if test $(abs_builddir) != $(abs_srcdir) ; then rm -f PKG_ADD ; fi diff --git a/lib-src/libsndfile/Octave/Makefile.in b/lib-src/libsndfile/Octave/Makefile.in deleted file mode 100644 index be962bf5c..000000000 --- a/lib-src/libsndfile/Octave/Makefile.in +++ /dev/null @@ -1,609 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = Octave -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(octconfigdir)" -DATA = $(noinst_DATA) $(octconfig_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ - -# Prevent any extension. -EXEEXT = -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@/sndfile -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - -EXTRA_DIST = sndfile_load.m sndfile_save.m sndfile_play.m \ - octave_test.m octave_test.sh $(oct_module_srcs) PKG_ADD - -octconfigdir = $(exec_prefix)/share/octave/site/m -octconfig_DATA = sndfile_load.m sndfile_save.m sndfile_play.m -OCT_CXXFLAGS = @OCT_CXXFLAGS@ -OCT_LIB_DIR = @OCT_LIB_DIR@ -OCT_LIBS = @OCT_LIBS@ -SNDFILEDIR = $(top_builddir)/src -AM_CPPFLAGS = -I$(SNDFILEDIR) -oct_module_srcs = sndfile.cc -oct_module_files = sndfile.oct PKG_ADD - -# Make these noinst so they can be installed manually. -noinst_DATA = $(oct_module_files) - -# Used by shave which cleans up automake generated Makefile output. -V = @ -Q = $(V:1=) -QUIET_GEN = $(Q:@=@echo ' GEN '$@;) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Octave/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Octave/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-octconfigDATA: $(octconfig_DATA) - @$(NORMAL_INSTALL) - @list='$(octconfig_DATA)'; test -n "$(octconfigdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(octconfigdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(octconfigdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(octconfigdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(octconfigdir)" || exit $$?; \ - done - -uninstall-octconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(octconfig_DATA)'; test -n "$(octconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(octconfigdir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(octconfigdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-local mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-octconfigDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-exec-local - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-local uninstall-octconfigDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-local \ - install-html install-html-am install-info install-info-am \ - install-man install-octconfigDATA install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-local uninstall-octconfigDATA - - -# Use Octave's mkoctfile to do all the heavy lifting. Unfortunately, its -# a little dumb so we need to guide it carefully. -sndfile.oct : sndfile.o - $(QUIET_GEN) $(MKOCTFILE) -v $(AM_CPPFLAGS) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null - -sndfile.o : sndfile.cc - $(QUIET_GEN) $(MKOCTFILE) -v $(AM_CPPFLAGS) -c $+ -o $(top_builddir)/Octave/$@ > /dev/null - -# Allow for the test being run in the build dir, but the test script -# being located in the source dir. -check : - octave_src_dir=$(srcdir) $(srcdir)/octave_test.sh - -# Since the octave modules are installed in a special location, a custom install -# and uninstall routine must be specified. -install-exec-local : $(oct_module_files) - @$(NORMAL_INSTALL) - test -z "$(OCTAVE_DEST_ODIR)" || $(mkdir_p) "$(DESTDIR)$(OCTAVE_DEST_ODIR)" - @list='$(oct_module_files)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) '$$p' '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) "$$p" "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-local : - @$(NORMAL_UNINSTALL) - @list='$(oct_module_files)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \ - rm -f "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f"; \ - done - -clean-local : - rm -f sndfile.o sndfile.oct - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/Octave/Readme.txt b/lib-src/libsndfile/Octave/Readme.txt new file mode 100644 index 000000000..c38605bff --- /dev/null +++ b/lib-src/libsndfile/Octave/Readme.txt @@ -0,0 +1,23 @@ +The libsndfile Modules for GNU Octave +===================================== + +These modules are currently known to work with version 3.0 of GNU Octave on +Linux. They have not been tested elsewhere. + + +Build Requirements +------------------ + +In order to build these libsndfile related modules for GNU Octave on a Debian +GNU/Linux (or Debian derived) system, you will need (on top of what is normally +required to build libsndfile) the package: + + octaveX.Y-headers + +where X.Y matches the version number of your installation of GNU Octave. + +The configure script in the top level libsndfile directory will detect the +presence and correct versions of the Octave build tools. The building of these +modules will only go ahead if everything is correct. + + diff --git a/lib-src/libsndfile/Octave/format.h b/lib-src/libsndfile/Octave/format.h new file mode 100644 index 000000000..ce769b2c6 --- /dev/null +++ b/lib-src/libsndfile/Octave/format.h @@ -0,0 +1,21 @@ +/* +** Copyright (C) 2007-2011 Erik de Castro Lopo +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +int format_of_str (const std::string & fmt) ; + +void string_of_format (std::string & fmt, int format) ; diff --git a/lib-src/libsndfile/Octave/octave_test.sh b/lib-src/libsndfile/Octave/octave_test.sh index 319d86b81..3c6f36e23 100755 --- a/lib-src/libsndfile/Octave/octave_test.sh +++ b/lib-src/libsndfile/Octave/octave_test.sh @@ -2,20 +2,28 @@ # Check where we're being run from. -if [ -d Octave ]; then +if test -d Octave ; then cd Octave + octave_src_dir=$(pwd) +elif test -z "$octave_src_dir" ; then + echo + echo "Error : \$octave_src_dir is undefined." + echo + exit 1 +else + octave_src_dir=$(cd $octave_src_dir && pwd) fi # Find libsndfile shared object. libsndfile_lib_location="" -if [ -f "../src/.libs/libsndfile.so" ]; then +if test -f "../src/.libs/libsndfile.so" ; then libsndfile_lib_location="../src/.libs/" -elif [ -f "../src/libsndfile.so" ]; then +elif test -f "../src/libsndfile.so" ; then libsndfile_lib_location="../src/" -elif [ -f "../src/.libs/libsndfile.dylib" ]; then +elif test -f "../src/.libs/libsndfile.dylib" ; then libsndfile_lib_location="../src/.libs/" -elif [ -f "../src/libsndfile.dylib" ]; then +elif test -f "../src/libsndfile.dylib" ; then libsndfile_lib_location="../src/" else echo @@ -30,9 +38,9 @@ libsndfile_lib_location=`(cd $libsndfile_lib_location && pwd)` # Find sndfile.oct sndfile_oct_location="" -if [ -f .libs/sndfile.oct ]; then +if test -f .libs/sndfile.oct ; then sndfile_oct_location=".libs" -elif [ -f sndfile.oct ]; then +elif test -f sndfile.oct ; then sndfile_oct_location="." else echo "Not able to find the sndfile.oct binaries we've just built." @@ -47,7 +55,7 @@ case `file -b $sndfile_oct_location/sndfile.oct` in exit 0 ;; *) - echo "Not able to find the sndfile.oct binaries we've just built." + echo "Not able to find the sndfile.oct binary we just built." exit 1 ;; esac @@ -55,16 +63,19 @@ case `file -b $sndfile_oct_location/sndfile.oct` in # Make sure the TERM environment variable doesn't contain anything wrong. unset TERM - +# echo "octave_src_dir : $octave_src_dir" # echo "libsndfile_lib_location : $libsndfile_lib_location" # echo "sndfile_oct_location : $sndfile_oct_location" -export LD_LIBRARY_PATH="$libsndfile_lib_location:$LD_LIBRARY_PATH" +if test ! -f PKG_ADD ; then + cp $octave_src_dir/PKG_ADD . + fi -octave_src_dir=`(cd $octave_src_dir && pwd)` +export LD_LIBRARY_PATH="$libsndfile_lib_location:$LD_LIBRARY_PATH" octave_script="$octave_src_dir/octave_test.m" (cd $sndfile_oct_location && octave -qH $octave_script) - - +res=$? +echo +exit $res diff --git a/lib-src/libsndfile/README b/lib-src/libsndfile/README index e9a6165c8..c218d5666 100644 --- a/lib-src/libsndfile/README +++ b/lib-src/libsndfile/README @@ -1,4 +1,4 @@ -This is libsndfile, 1.0.24 +This is libsndfile, 1.0.28 libsndfile is a library of C routines for reading and writing files containing sampled audio data. @@ -20,6 +20,9 @@ Bormann. Their original code can be found at : The src/G72x directory contains code written and released by Sun Microsystems under a suitably free license. +The src/ALAC directory contains code written and released by Apple Inc and +released under the Apache license. + LINUX ----- @@ -32,9 +35,12 @@ If you really do need to compile from source it should be as easy as: make make install -Since libsndfile optionally links against libFLAC, libogg and libvorbis, you -will need to install appropriate versions of these libraries before running -configure as above. +Since libsndfile optionally links against libFLAC, libogg, libvorbis and +libopus, you will need to install appropriate versions of these libraries +before running configure as above. + +You can use CMake now to build under Linux, also under Windows and MacOS, see +README.md for details. CMake toolchain is usable, but still exterimental. UNIX @@ -44,11 +50,13 @@ Compile as for Linux. Win32/Win64 ----------- -The default Windows compilers are nowhere near compliant with the 1999 ISO -C Standard and hence not able to compile libsndfile. -Please use the libsndfile binaries available on the libsndfile web site. +Official Windows binaries are compiled with Autotools and MinGW, but you can use +CMake to generate solution for Visual Studio. Details are described in +README.md. +It is still recommended to use the libsndfile binaries available on the +libsndfile web site. MacOSX ------ @@ -63,3 +71,6 @@ The libsndfile home page is at : http://www.mega-nerd.com/libsndfile/ +Bugs and support questions can be raised at : + + https://github.com/erikd/libsndfile/ diff --git a/lib-src/libsndfile/README.md b/lib-src/libsndfile/README.md new file mode 100644 index 000000000..c75225611 --- /dev/null +++ b/lib-src/libsndfile/README.md @@ -0,0 +1,228 @@ +# libsndfile + +[![Build Status](https://secure.travis-ci.org/erikd/libsndfile.svg?branch=master)](http://travis-ci.org/erikd/libsndfile) +[![Build status](https://ci.appveyor.com/api/projects/status/github/erikd/libsndfile?branch=master?svg=true)](https://ci.appveyor.com/project/Erik13183/libsndfile) + +libsndfile is a C library for reading and writing files containing sampled audio +data. + +## Hacking + +The canonical source code repository for libsndfile is at +[https://github.com/erikd/libsndfile/][github]. + +You can grab the source code using: + + git clone git://github.com/erikd/libsndfile.git + +For building for Android see [BuildingForAndroid][BuildingForAndroid]. + +There are currently two build systems; the official GNU autotool based one and +a more limited and experimental CMake based build system. Use of the CMake build +system is documented below. + +Setting up a build environment for libsndfile on Debian or Ubuntu is as simple as: + + sudo apt install autoconf autogen automake build-essential libasound2-dev \ + libflac-dev libogg-dev libtool libvorbis-dev libopus-dev pkg-config python + +For other Linux distributions or any of the *BSDs, the setup should be similar +although the package install tools and package names may be slightly different. + +Similarly on Mac OS X, assuming [brew] is already installed: + + brew install autoconf autogen automake flac libogg libtool libvorbis libopus pkg-config + +Once the build environment has been set up, building and testing libsndfile is +as simple as: + + ./autogen.sh + ./configure --enable-werror + make + make check + +## The CMake build system + +Although Autotools is the primary and recommended build toolchain, experimental +CMake meta build generator is also available. The build process with CMake takes +place in two stages. First, standard build files are created from configuration +scripts. Then the platform's native build tools are used for the actual +building. CMake can produce Microsoft Visual Studio project and solution files, +Unix Makefiles, Xcode projects and [many more](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html). + +Some IDE support CMake natively or with plugins, check you IDE documentation + for details. + +### Requirements + +1. C99-compliant compiler toolchain (tested with GCC, Clang and Visual + Studio 2015) +2. CMake 3.1.3 or newer + +There are some recommended packages to enable all features of libsndfile: + +1. Ogg, Vorbis and FLAC libraries and headers to enable these formats support +2. ALSA development package under Linux to build sndfile-play utility +3. Sndio development package under BSD to build sndfile-play utility + +### Building from command line + +CMake can handle out-of-place builds, enabling several builds from +the same source tree, and cross-compilation. The ability to build a directory +tree outside the source tree is a key feature, ensuring that if a build +directory is removed, the source files remain unaffected. + + mkdir CMakeBuild + cd CMakeBuild + +Then run `cmake` command with directory where CMakeLists.txt script is located +as argument (relative paths are supported): + + cmake .. + +This command will configure and write build script or solution to CMakeBuild +directory. CMake is smart enough to create Unix makefiles under Linux or Visual +Studio solution if you have Visual Studio installed, but you can configure +[generator](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html) +with `-G` command line parameter: + + cmake .. -G"Unix Makefiles" + +The build procedure depends on the selected generator. With "Unix Makefiles" you +can type: + + make & make install + +With "Visual Studio" and some other generators you can open solution or project +from `CMakeBuild` directory and build using IDE. + +Finally, you can use unified command: + + cmake --build . + +CMake also provides Qt-based cross platform GUI, cmake-gui. Using it is trivial +and does not require detailed explanations. + +### Configuring CMake + +You can pass additional options with `/D=` when you run +`cmake` command. Some useful system options: + +* `CMAKE_C_FLAGS` - additional C compiler flags +* `CMAKE_BUILD_TYPE` - configuration type, `DEBUG`, `RELEASE`, `RELWITHDEBINFO` + or `MINSIZEREL`. `DEBUG` is default +* `CMAKE_INSTALL_PREFIX` - build install location, the same as `--prefix` option + of `configure` script + + Useful libsndfile options: + +* `BUILD_SHARED_LIBS` - build shared library (DLL under Windows) when `ON`, + build static library othervise. This option is `OFF` by default. +* `BUILD_PROGRAMS` - build libsndfile's utilities from `programs/` directory, + `ON` by default. +* `BUILD_EXAMPLES` - build examples, `ON` by default. +* `BUILD_TESTING` - build tests. Then you can run tests with `ctest` command, + `ON` by default. Setting `BUILD_SHARED_LIBS` to `ON` disables this option. +* `ENABLE_EXTERNAL_LIBS` - enable Ogg, Vorbis, FLAC and Opus support. This + option is available and set to `ON` if all dependency libraries were found. +* `ENABLE_CPU_CLIP` - enable tricky cpu specific clipper. Enabled and set to + `ON` when CPU clips negative\positive. Don't touch it if you are not sure +* `ENABLE_BOW_DOCS` - enable black-on-white documentation theme, `OFF` by + default. +* `ENABLE_EXPERIMENTAL` - enable experimental code. Don't use it if you are + not sure. This option is `OFF` by default. +* `ENABLE_CPACK` - enable [CPack](https://cmake.org/cmake/help/latest/module/CPack.html) support. + This option is `ON` by default. +* `ENABLE_PACKAGE_CONFIG` - generate and install [package config file](https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#config-file-packages). + This option is `ON` by default. +* `ENABLE_STATIC_RUNTIME` - enable static runtime on Windows platform, `OFF` by + default. + + **Note**: For MSVC compiler this option is depecated. Use `CMAKE_MSVC_RUNTIME_LIBRARY` + option instead (CMake >= 3.15). +* `ENABLE_COMPATIBLE_LIBSNDFILE_NAME` - set DLL name to `libsndfile-1.dll` + (canonical name) on Windows platform, `sndfile.dll` otherwise, `OFF` by + default. Library name can be different depending on platform. The well known + DLL name on Windows platform is `libsndfile-1.dll`, because the only way to + build Windows library before was MinGW toolchain with Autotools. This name + is native for MinGW ecosystem, Autotools constructs it using MinGW platform + rules from `sndfile` target. But when you build with CMake using native + Windows compiler, the name is `sndfile.dll`. This is name for native Windows + platform, because Windows has no library naming rules. It is preffered + because you can search library using package manager or CMake's + `find_library` command on any platform using the same `sndfile` name. + +Deprecated options: + +* `DISABLE_EXTERNAL_LIBS` - disable Ogg, Vorbis and FLAC support. Replaced by + `ENABLE_EXTERNAL_LIBS` +* `DISABLE_CPU_CLIP` - disable tricky cpu specific clipper. Replaced by + `ENABLE_CPU_CLIP` +* `BUILD_STATIC_LIBS` - build static library. Use `BUILD_SHARED_LIBS` instead + +### Linking from CMake projects + +First you need to add `FindOgg.cmake`, `FindVorbis.cmake`, `FindVorbisEnc.cmake`, + `FindFLAC.cmake` and `FindOpus.cmake` files to some directory inside your CMake + project (usually `cmake`) and add it to `CMAKE_MODULE_PATH`: + + project(SomeApplication) + + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +Now you can search `libsndfile` library from your `CMakeLists.txt` + with this command: + + find_package(SndFile) + +`SndFile_FOUND` is set to `ON` when library is found. + +If `libsndfile` dependency is critical, you can add `REQUIRED` to + `find_package`: + + find_package(SndFile REQUIRED) + +With with option `find_package` will terminate configuration process + if `libsndfile` is not found. + +You can also add version check: + + find_package(SndFile 1.0.29) + +`find_package` will report error, if `libsndfile` version is < 1.0.29. + +You can combine `REQUIRED` and version if you need. + +To link `libsndfile` library use: + + target_link_libraries(my_application PRIVATE SndFile::sndfile) + +### Notes for Windows users + +First advice - set `ENABLE_STATIC_RUNTIME` to ON. This will remove dependencies +on runtime DLLs. + +Second advice is about Ogg, Vorbis FLAC and Opus support. Searching external +libraries under Windows is a little bit tricky. The best way is to use +[Vcpkg](https://github.com/Microsoft/vcpkg). You need to install static libogg, +libvorbis, libflac and libopus libraries: + + vcpkg install libogg:x64-windows-static libvorbis:x64-windows-static + libflac:x64-windows-static opus:x64-windows-static libogg:x86-windows-static + libvorbis:x86-windows-static libflac:x86-windows-static opus:x86-windows-static + +Then and add this parameter to cmake command line: + + -DCMAKE_TOOLCHAIN_FILE=/scripts/buildsystems/vcpkg.cmake + +You also need to set `VCPKG_TARGET_TRIPLET` because you use static libraries: + + -DVCPKG_TARGET_TRIPLET=x64-windows-static + +## Submitting Patches + +See [CONTRIBUTING.md](CONTRIBUTING.md) for details. + +[brew]: http://brew.sh/ +[github]: https://github.com/erikd/libsndfile/ +[BuildingForAndroid]: https://github.com/erikd/libsndfile/blob/master/Building-for-Android.md diff --git a/lib-src/libsndfile/Scripts/android-configure.sh b/lib-src/libsndfile/Scripts/android-configure.sh new file mode 100755 index 000000000..accb386ca --- /dev/null +++ b/lib-src/libsndfile/Scripts/android-configure.sh @@ -0,0 +1,96 @@ +#!/bin/bash -e + +# Copyright (C) 2013-2016 Erik de Castro Lopo +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Neither the author nor the names of any contributors may be used +# to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Android NDK version number; eg r10, r10b etc +ANDROID_NDK_VER=${ANDROID_NDK_VER:-r10} + +# Android NDK gcc version; eg 4.8, 4.9 etc. +ANDROID_GCC_VER=${ANDROID_GCC_VER:-4.9} + +# Android API version; eg 14 (Android 4.0), 21 (Android 5.0) etc. +ANDROID_API_VER=${ANDROID_API_VER:-14} + +ANDROID_TARGET=${ANDROID_TARGET:-arm-linux-androideabi} + +if test -z ${ANDROID_TOOLCHAIN_HOME} ; then + echo "Environment variable ANDROID_TOOLCHAIN_HOME not defined." + echo "This should point to the directory containing the Android NDK." + exit 1 + fi + +#------------------------------------------------------------------------------- +# No more user config beyond here. + +BUILD_MACHINE=$(uname -s | tr 'A-Z' 'a-z')-$(uname -m) + +function die_with { + echo $1 + exit 1 +} + +export CROSS_COMPILE=${ANDROID_TARGET} + +# Don't forget to adjust this to your NDK path +export ANDROID_NDK=${ANDROID_TOOLCHAIN_HOME}/android-ndk-${ANDROID_NDK_VER} +test -d ${ANDROID_NDK} || die_with "Error : ANDROID_NDK '$ANDROID_NDK' does not exist." + +export ANDROID_PREFIX=${ANDROID_NDK}/toolchains/arm-linux-androideabi-${ANDROID_GCC_VER}/prebuilt/${BUILD_MACHINE} +test -d ${ANDROID_PREFIX} || die_with "Error : ANDROID_PREFIX '$ANDROID_PREFIX' does not exist." + +export SYSROOT=${ANDROID_NDK}/platforms/android-${ANDROID_API_VER}/arch-arm +test -d ${SYSROOT} || die_with "Error : SYSROOT '$SYSROOT' does not exist." + +export CROSS_PREFIX=${ANDROID_PREFIX}/bin/${CROSS_COMPILE} +test -f ${CROSS_PREFIX}-gcc || die_with "Error : CROSS_PREFIX compiler '${CROSS_PREFIX}-gcc' does not exist." + + +# Non-exhaustive lists of compiler + binutils +# Depending on what you compile, you might need more binutils than that +export CPP=${CROSS_PREFIX}-cpp +export AR=${CROSS_PREFIX}-ar +export AS=${CROSS_PREFIX}-as +export NM=${CROSS_PREFIX}-nm +export CC=${CROSS_PREFIX}-gcc +export CXX=${CROSS_PREFIX}-g++ +export LD=${CROSS_PREFIX}-ld +export RANLIB=${CROSS_PREFIX}-ranlib + +# Don't mix up .pc files from your host and build target +export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig + +# Set up the needed FLAGS. +export CFLAGS="${CFLAGS} -gstabs --sysroot=${SYSROOT} -I${SYSROOT}/usr/include -I${ANDROID_PREFIX}/include" +export CXXFLAGS="${CXXFLAGS} -gstabs -fno-exceptions --sysroot=${SYSROOT} -I${SYSROOT}/usr/include -I${ANDROID_PREFIX}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_GCC_VER}/include/ -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_GCC_VER}/libs/armeabi/include" + +export CPPFLAGS="${CFLAGS}" +export LDFLAGS="${LDFLAGS} -L${SYSROOT}/usr/lib -L${ANDROID_PREFIX}/lib" + +# Create a symlink to the gdbclient. +test -h gdbclient || ln -s ${ANDROID_PREFIX}/bin/arm-linux-androideabi-gdb gdbclient + +./configure --host=${CROSS_COMPILE} --with-sysroot=${SYSROOT} "$@" diff --git a/lib-src/libsndfile/Scripts/asan-configure.sh b/lib-src/libsndfile/Scripts/asan-configure.sh new file mode 100755 index 000000000..0ac43b946 --- /dev/null +++ b/lib-src/libsndfile/Scripts/asan-configure.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eu + +CFLAGS="-fsanitize=address -g" CXXFLAGS=${CFLAGS} ./configure + diff --git a/lib-src/libsndfile/build-test-tarball.mk.in b/lib-src/libsndfile/Scripts/build-test-tarball.mk.in similarity index 65% rename from lib-src/libsndfile/build-test-tarball.mk.in rename to lib-src/libsndfile/Scripts/build-test-tarball.mk.in index b6f2f23df..5dac9d94b 100644 --- a/lib-src/libsndfile/build-test-tarball.mk.in +++ b/lib-src/libsndfile/Scripts/build-test-tarball.mk.in @@ -10,6 +10,11 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ HOST_TRIPLET = @HOST_TRIPLET@ +SRC_BINDIR = @SRC_BINDIR@ +TEST_BINDIR = @TEST_BINDIR@ + +LIBRARY := $(SRC_BINDIR)libsndfile.so.$(LIB_VERSION) + LIB_VERSION := $(shell echo $(PACKAGE_VERSION) | sed -e 's/[a-z].*//') TESTNAME = libsndfile-testsuite-$(HOST_TRIPLET)-$(PACKAGE_VERSION) @@ -19,15 +24,12 @@ TARBALL = $(TESTNAME).tar.gz # Find the test programs by grepping the script for the programs it executes. testprogs := $(shell grep '^\./' tests/test_wrapper.sh | sed -e "s|./||" -e "s/ .*//" | sort | uniq) # Also add the programs not found by the above. -testprogs += sfversion@EXEEXT@ stdin_test@EXEEXT@ stdout_test@EXEEXT@ cpp_test@EXEEXT@ win32_test@EXEEXT@ +testprogs += tests/sfversion$(EXEEXT) tests/stdin_test$(EXEEXT) tests/stdout_test$(EXEEXT) \ + tests/cpp_test$(EXEEXT) tests/win32_test$(EXEEXT) -# Find the single test program in src/ . -srcprogs := $(shell if test -x src/.libs/test_main$(EXEEXT) ; then echo "src/.libs/test_main$(EXEEXT)" ; else echo "src/test_main$(EXEEXT)" ; fi) - -libfiles := $(shell if test ! -z $(EXEEXT) ; then echo "src/libsndfile-1.def src/.libs/libsndfile-1.dll" ; else echo "src/.libs/libsndfile.so.$(LIB_VERSION)" ; fi) - -files := $(addprefix tests/.libs/,$(subst @EXEEXT@,$(EXEEXT),$(testprogs))) $(libfiles) $(srcprogs) +libfiles := $(shell if test ! -z $(EXEEXT) ; then echo "src/libsndfile-1.def src/.libs/libsndfile-1.dll" ; elif test -f $(LIBRARY) ; then echo $(LIBRARY) ; fi ; fi) +testbins := $(testprogs) $(libfiles) all : $(TARBALL) @@ -44,13 +46,16 @@ $(TARBALL) : $(TESTNAME)/test_wrapper.sh @echo "Created : $(TARBALL)" @echo -$(TESTNAME)/test_wrapper.sh : $(files) tests/test_wrapper.sh tests/pedantic-header-test.sh +$(TESTNAME)/test_wrapper.sh : tests/test_wrapper.sh tests/pedantic-header-test.sh rm -rf $(TESTNAME) mkdir -p $(TESTNAME)/tests/ - cp $(files) $(TESTNAME)/tests/ + echo + echo $(testbins) + echo + cp $(testbins) $(TESTNAME)/tests/ cp tests/test_wrapper.sh $(TESTNAME)/ cp tests/pedantic-header-test.sh $(TESTNAME)/tests/ chmod u+x $@ tests/test_wrapper.sh : tests/test_wrapper.sh.in - (cd tests/ ; make $@) + make $@ diff --git a/lib-src/libsndfile/Scripts/clang-sanitize.sh b/lib-src/libsndfile/Scripts/clang-sanitize.sh new file mode 100755 index 000000000..2898883c2 --- /dev/null +++ b/lib-src/libsndfile/Scripts/clang-sanitize.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# This is known to work with clang-3.4 from Debian testing/unstable. +# 2013/07/14 + +export CC=clang +export CXX=clang++ +export CFLAGS="-O3 -fsanitize=address,integer,undefined" +export CXXFLAGS="-O3 -fsanitize=address,integer,undefined" + +./configure --enable-gcc-werror + +make clean all check diff --git a/lib-src/libsndfile/Scripts/cmake-build.sh b/lib-src/libsndfile/Scripts/cmake-build.sh new file mode 100755 index 000000000..10260f3f0 --- /dev/null +++ b/lib-src/libsndfile/Scripts/cmake-build.sh @@ -0,0 +1,9 @@ +#!/bin/bash -eu + +rm -rf CMakeCache.txt CMakeFiles/ _Build + +mkdir _Build +cd _Build +cmake .. +cmake --build . +ctest -V diff --git a/lib-src/libsndfile/Scripts/cstyle.py b/lib-src/libsndfile/Scripts/cstyle.py new file mode 100755 index 000000000..8e1df27e3 --- /dev/null +++ b/lib-src/libsndfile/Scripts/cstyle.py @@ -0,0 +1,256 @@ +#!/usr/bin/python -tt +# +# Copyright (C) 2005-2017 Erik de Castro Lopo +# +# Released under the 2 clause BSD license. + +""" +This program checks C code for compliance to coding standards used in +libsndfile and other projects I run. +""" + +import re +import sys + + +class Preprocessor: + """ + Preprocess lines of C code to make it easier for the CStyleChecker class to + test for correctness. Preprocessing works on a single line at a time but + maintains state between consecutive lines so it can preprocessess multi-line + comments. + Preprocessing involves: + - Strip C++ style comments from a line. + - Strip C comments from a series of lines. When a C comment starts and + ends on the same line it will be replaced with 'comment'. + - Replace arbitrary C strings with the zero length string. + - Replace '#define f(x)' with '#define f (c)' (The C #define requires that + there be no space between defined macro name and the open paren of the + argument list). + Used by the CStyleChecker class. + """ + def __init__ (self): + self.comment_nest = 0 + self.leading_space_re = re.compile ('^(\t+| )') + self.trailing_space_re = re.compile ('(\t+| )$') + self.define_hack_re = re.compile ("(#\s*define\s+[a-zA-Z0-9_]+)\(") + + def comment_nesting (self): + """ + Return the currect comment nesting. At the start and end of the file, + this value should be zero. Inside C comments it should be 1 or + (possibly) more. + """ + return self.comment_nest + + def __call__ (self, line): + """ + Strip the provided line of C and C++ comments. Stripping of multi-line + C comments works as expected. + """ + + line = self.define_hack_re.sub (r'\1 (', line) + + line = self.process_strings (line) + + # Strip C++ style comments. + if self.comment_nest == 0: + line = re.sub ("( |\t*)//.*", '', line) + + # Strip C style comments. + open_comment = line.find ('/*') + close_comment = line.find ('*/') + + if self.comment_nest > 0 and close_comment < 0: + # Inside a comment block that does not close on this line. + return "" + + if open_comment >= 0 and close_comment < 0: + # A comment begins on this line but doesn't close on this line. + self.comment_nest += 1 + return self.trailing_space_re.sub ('', line [:open_comment]) + + if open_comment < 0 and close_comment >= 0: + # Currently open comment ends on this line. + self.comment_nest -= 1 + return self.trailing_space_re.sub ('', line [close_comment + 2:]) + + if open_comment >= 0 and close_comment > 0 and self.comment_nest == 0: + # Comment begins and ends on this line. Replace it with 'comment' + # so we don't need to check whitespace before and after the comment + # we're removing. + newline = line [:open_comment] + "comment" + line [close_comment + 2:] + return self.__call__ (newline) + + return line + + def process_strings (self, line): + """ + Given a line of C code, return a string where all literal C strings have + been replaced with the empty string literal "". + """ + for k in range (0, len (line)): + if line [k] == '"': + start = k + for k in range (start + 1, len (line)): + if line [k] == '"' and line [k - 1] != '\\': + return line [:start + 1] + '"' + self.process_strings (line [k + 1:]) + return line + + +class CStyleChecker: + """ + A class for checking the whitespace and layout of a C code. + """ + def __init__ (self, debug): + self.debug = debug + self.filename = None + self.error_count = 0 + self.line_num = 1 + self.orig_line = '' + self.trailing_newline_re = re.compile ('[\r\n]+$') + self.indent_re = re.compile ("^\s*") + self.last_line_indent = "" + self.last_line_indent_curly = False + self.re_checks = \ + [ ( re.compile (" "), "multiple space instead of tab" ) + , ( re.compile ("\t "), "space after tab" ) + , ( re.compile ("[^ ];"), "missing space before semi-colon" ) + , ( re.compile ("{[^\s}]"), "missing space after open brace" ) + , ( re.compile ("[^{\s]}"), "missing space before close brace" ) + , ( re.compile ("[ \t]+$"), "contains trailing whitespace" ) + + , ( re.compile (",[^\s\n]"), "missing space after comma" ) + , ( re.compile (";[^\s]"), "missing space after semi-colon" ) + , ( re.compile ("=[^\s\"'=]"), "missing space after assignment" ) + + # Open and close parenthesis. + , ( re.compile ("[^\s\(\[\*&']\("), "missing space before open parenthesis" ) + , ( re.compile ("\)(-[^>]|[^,'\s\n\)\]-])"), "missing space after close parenthesis" ) + , ( re.compile ("\s(do|for|if|when)\s.*{$"), "trailing open parenthesis at end of line" ) + , ( re.compile ("\( [^;]"), "space after open parenthesis" ) + , ( re.compile ("[^;] \)"), "space before close parenthesis" ) + + # Open and close square brace. + , ( re.compile ("[^\s\(\]]\["), "missing space before open square brace" ) + , ( re.compile ("\][^,\)\]\[\s\.-]"), "missing space after close square brace" ) + , ( re.compile ("\[ "), "space after open square brace" ) + , ( re.compile (" \]"), "space before close square brace" ) + + # Space around operators. + , ( re.compile ("[^\s][\*/%+-][=][^\s]"), "missing space around opassign" ) + , ( re.compile ("[^\s][<>!=^/][=]{1,2}[^\s]"), "missing space around comparison" ) + + # Parens around single argument to return. + , ( re.compile ("\s+return\s+\([a-zA-Z0-9_]+\)\s+;"), "parens around return value" ) + + # Parens around single case argument. + , ( re.compile ("\s+case\s+\([a-zA-Z0-9_]+\)\s+:"), "parens around single case argument" ) + + # Open curly at end of line. + , ( re.compile ("\)\s*{\s*$"), "open curly brace at end of line" ) + + # Pre and post increment/decrment. + , ( re.compile ("[^\(\[][+-]{2}[a-zA-Z0-9_]"), "space after pre increment/decrement" ) + , ( re.compile ("[a-zA-Z0-9_][+-]{2}[^\)\,]]"), "space before post increment/decrement" ) + ] + + def get_error_count (self): + """ + Return the current error count for this CStyleChecker object. + """ + return self.error_count + + def check_files (self, files): + """ + Run the style checker on all the specified files. + """ + for filename in files: + self.check_file (filename) + + def check_file (self, filename): + """ + Run the style checker on the specified file. + """ + self.filename = filename + cfile = open (filename, "r") + + self.line_num = 1 + + preprocess = Preprocessor () + while 1: + line = cfile.readline () + if not line: + break + + line = self.trailing_newline_re.sub ('', line) + self.orig_line = line + + self.line_checks (preprocess (line)) + + self.line_num += 1 + + cfile.close () + self.filename = None + + # Check for errors finding comments. + if preprocess.comment_nesting () != 0: + print ("Weird, comments nested incorrectly.") + sys.exit (1) + + return + + def line_checks (self, line): + """ + Run the style checker on provided line of text, but within the context + of how the line fits within the file. + """ + + indent = len (self.indent_re.search (line).group ()) + if re.search ("^\s+}", line): + if not self.last_line_indent_curly and indent != self.last_line_indent: + None # self.error ("bad indent on close curly brace") + self.last_line_indent_curly = True + else: + self.last_line_indent_curly = False + + # Now all the regex checks. + for (check_re, msg) in self.re_checks: + if check_re.search (line): + self.error (msg) + + if re.search ("[a-zA-Z0-9][<>!=^/&\|]{1,2}[a-zA-Z0-9]", line): + if not re.search (".*#include.*[a-zA-Z0-9]/[a-zA-Z]", line): + self.error ("missing space around operator") + + self.last_line_indent = indent + return + + def error (self, msg): + """ + Print an error message and increment the error count. + """ + print ("%s (%d) : %s" % (self.filename, self.line_num, msg)) + if self.debug: + print ("'" + self.orig_line + "'") + self.error_count += 1 + +#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +if len (sys.argv) < 1: + print ("Usage : yada yada") + sys.exit (1) + +# Create a new CStyleChecker object +if sys.argv [1] == '-d' or sys.argv [1] == '--debug': + cstyle = CStyleChecker (True) + cstyle.check_files (sys.argv [2:]) +else: + cstyle = CStyleChecker (False) + cstyle.check_files (sys.argv [1:]) + + +if cstyle.get_error_count (): + sys.exit (1) + +sys.exit (0) diff --git a/lib-src/libsndfile/Scripts/git-pre-commit-hook b/lib-src/libsndfile/Scripts/git-pre-commit-hook new file mode 100755 index 000000000..dc70e735f --- /dev/null +++ b/lib-src/libsndfile/Scripts/git-pre-commit-hook @@ -0,0 +1,84 @@ +#!/bin/sh + +if git rev-parse --verify HEAD >/dev/null 2>&1 ; then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 + fi + +# Redirect output to stderr. +exec 1>&2 + +#------------------------------------------------------------------------------- +# Prevent files with non-ascii filenames from being committed. + +if test $(git diff --cached --name-only --diff-filter=A -z $against | LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 ; then + echo "Error: Attempt to add a non-ascii file name." + echo + echo "This can cause problems if you want to work" + echo "with people on other platforms." + echo + echo "To be portable it is advisable to rename the file ..." + echo + echo "Commit aborted." + exit 1 + fi + +#------------------------------------------------------------------------------- +# Check the formatting of all C files. + +# http://man.openbsd.org/sed#r +# http://man.openbsd.org/sed#E +# http://netbsd.gw.com/cgi-bin/man-cgi?sed++NetBSD-current +# https://github.com/freebsd/freebsd/blob/master/usr.bin/sed/main.c +# http://git.savannah.gnu.org/gitweb/?p=sed.git;a=blob;f=sed/sed.c +# GNU has -r and -E (undocumented); MacOS has -E but not -r; Sunos has neither. +files=$(git diff-index --name-status --cached HEAD | grep -v ^D | sed -E "s/^[A-Z]+[A-Z0-9]*[ \t]+/ /") + +cfiles="" +for f in $files ; do + if test `dirname $f` = "src/ALAC" ; then + echo "Skipping cstyle checking on $f" + elif test `echo $f | grep -c "\.[ch]$"` -gt 0 ; then + cfiles="$cfiles $f" + fi + done + +if test -n "$cfiles" ; then + Scripts/cstyle.py $cfiles + if test $? -ne 0 ; then + echo + echo "Commit aborted. Fix the above error before trying again." + exit 1 + fi + fi + +#------------------------------------------------------------------------------- +# Check the copyright notice of all files to be commited. + +user=`git config --global user.email` +year=`date +"%Y"` + +missing_copyright_year="" +if test $user = "erikd@mega-nerd.com" ; then + for f in $files ; do + if test `head -5 $f | grep -i copyright | grep -c -i $user` -gt 0 ; then + user_copyright=`grep -i copyright $f | grep $user | grep -c $year` + if test $user_copyright -lt 1 ; then + missing_copyright_year="$missing_copyright_year $f" + fi + fi + done + fi + +if test -n "$missing_copyright_year" ; then + echo "Missing current year in the copyright notice of the following files:" + for f in $missing_copyright_year ; do + echo " $f" + done + echo "Commit aborted." + exit 1 + fi + +exit 0 diff --git a/lib-src/libsndfile/Scripts/linux-to-win-cross-configure.sh b/lib-src/libsndfile/Scripts/linux-to-win-cross-configure.sh new file mode 100755 index 000000000..c1fdc072b --- /dev/null +++ b/lib-src/libsndfile/Scripts/linux-to-win-cross-configure.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +case "$1" in + w32) + compiler_name=i686-w64-mingw32 + ;; + w64) + compiler_name=x86_64-w64-mingw32 + ;; + *) + echo "$0 (w32|w64) " + exit 0 + ;; + esac + +shift + +build_cpu=$(dpkg-architecture -qDEB_BUILD_GNU_CPU) +build_host=$build_cpu-linux + +./configure --host=$compiler_name --target=$compiler_name --build=$build_host \ + --program-prefix='' --disable-sqlite --disable-static $@ diff --git a/lib-src/libsndfile/Scripts/static-deps-build.mk b/lib-src/libsndfile/Scripts/static-deps-build.mk new file mode 100755 index 000000000..d1107dcbe --- /dev/null +++ b/lib-src/libsndfile/Scripts/static-deps-build.mk @@ -0,0 +1,125 @@ +#!/usr/bin/make -f + +# If this is set to true (via the environment) then CRC checking will be +# disabled in libogg giving fuzzers a better chance at finding something. +disable_ogg_crc ?= false + +# Build libsndfile as a dynamic/shared library, but statically link to +# libFLAC, libogg, libopus and libvorbis + +ogg_version = libogg-1.3.3 +ogg_sha256sum = 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 + +vorbis_version = libvorbis-1.3.6 +vorbis_sha256sum = af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415 + +flac_version = flac-1.3.2 +flac_sha256sum = 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f + +opus_version = opus-1.3 +opus_sha256sum = 4f3d69aefdf2dbaf9825408e452a8a414ffc60494c70633560700398820dc550 + +#------------------------------------------------------------------------------- +# Code follows. + +ogg_tarball = $(ogg_version).tar.xz +vorbis_tarball = $(vorbis_version).tar.xz +flac_tarball = $(flac_version).tar.xz +opus_tarball = $(opus_version).tar.gz + +download_url = http://downloads.xiph.org/releases/ +tarball_dir = Build/Tarballs +stamp_dir = Build/Stamp + +build_dir = $(shell pwd)/Build +config_options = --prefix=$(build_dir) --disable-shared --enable-option-checking + +pwd = $(shell pwd) + +help : + @echo + @echo "This script will build libsndfile as a dynamic/shared library but statically linked" + @echo "to libFLAC, libogg and libvorbis. It should work on Linux and Mac OS X. It might" + @echo "work on Windows with a correctly set up MinGW." + @echo + @echo "It requires all the normal build tools require to build libsndfile plus wget." + @echo + +config : Build/Stamp/configure + +build : Build/Stamp/build + +clean : + rm -rf Build/flac-* Build/libogg-* Build/libvorbis-* Build/opus-* + rm -rf Build/bin Build/include Build/lib Build/share + rm -f Build/Stamp/install Build/Stamp/extract Build/Stamp/sha256sum Build/Stamp/build-ogg + +Build/Stamp/init : + mkdir -p $(stamp_dir) $(tarball_dir) + touch $@ + +Build/Tarballs/$(flac_tarball) : Build/Stamp/init + (cd $(tarball_dir) && wget $(download_url)flac/$(flac_tarball) -O $(flac_tarball)) + touch $@ + +Build/Tarballs/$(ogg_tarball) : Build/Stamp/init + (cd $(tarball_dir) && wget $(download_url)ogg/$(ogg_tarball) -O $(ogg_tarball)) + touch $@ + +Build/Tarballs/$(vorbis_tarball) : Build/Stamp/init + (cd $(tarball_dir) && wget $(download_url)vorbis/$(vorbis_tarball) -O $(vorbis_tarball)) + touch $@ + +Build/Tarballs/$(opus_tarball) : Build/Stamp/init + (cd $(tarball_dir) && wget https://archive.mozilla.org/pub/opus/$(opus_tarball) -O $(opus_tarball)) + touch $@ + +Build/Stamp/tarballs : Build/Tarballs/$(flac_tarball) Build/Tarballs/$(ogg_tarball) Build/Tarballs/$(vorbis_tarball) Build/Tarballs/$(opus_tarball) + touch $@ + +Build/Stamp/sha256sum : Build/Stamp/tarballs + test `sha256sum $(tarball_dir)/$(ogg_tarball) | sed "s/ .*//"` = $(ogg_sha256sum) + test `sha256sum $(tarball_dir)/$(vorbis_tarball) | sed "s/ .*//"` = $(vorbis_sha256sum) + test `sha256sum $(tarball_dir)/$(flac_tarball) | sed "s/ .*//"` = $(flac_sha256sum) + test `sha256sum $(tarball_dir)/$(opus_tarball) | sed "s/ .*//"` = $(opus_sha256sum) + touch $@ + +Build/Stamp/extract : Build/Stamp/sha256sum + # (cd Build && tar xf Tarballs/$(ogg_tarball)) + (cd Build && tar xf Tarballs/$(flac_tarball)) + (cd Build && tar xf Tarballs/$(vorbis_tarball)) + (cd Build && tar xf Tarballs/$(opus_tarball)) + touch $@ + +Build/Stamp/build-ogg : Build/Stamp/sha256sum +ifeq ($(disable_ogg_crc), true) + echo "Ogg/CRC enabled" + (cd Build && git clone https://github.com/xiph/ogg $(ogg_version)) + (cd Build/$(ogg_version) && ./autogen.sh && CFLAGS=-fPIC ./configure $(config_options) --disable-crc && make all install) +else + echo "Ogg/CRC disabled" + (cd Build && tar xf Tarballs/$(ogg_tarball)) + (cd Build/$(ogg_version) && CFLAGS=-fPIC ./configure $(config_options) && make all install) +endif + touch $@ + +Build/Stamp/install-libs : Build/Stamp/extract Build/Stamp/build-ogg + (cd Build/$(vorbis_version) && CFLAGS=-fPIC ./configure $(config_options) && make all install) + (cd Build/$(flac_version) && CFLAGS=-fPIC ./configure $(config_options) && make all install) + (cd Build/$(opus_version) && CFLAGS=-fPIC ./configure $(config_options) && make all install) + touch $@ + +configure : configure.ac + ./autogen.sh + +Build/Stamp/configure : Build/Stamp/install-libs configure + PKG_CONFIG_LIBDIR=Build/lib/pkgconfig ./configure + sed -i 's#^EXTERNAL_XIPH_CFLAGS.*#EXTERNAL_XIPH_CFLAGS = -I$(pwd)/Build/include#' Makefile + sed -i 's#^EXTERNAL_XIPH_LIBS.*#EXTERNAL_XIPH_LIBS = -static $(pwd)/Build/lib/libFLAC.la $(pwd)/Build/lib/libvorbis.la $(pwd)/Build/lib/libvorbisenc.la $(pwd)/Build/lib/libopus.la $(pwd)/Build/lib/libogg.la -dynamic #' Makefile + make clean + touch $@ + +Build/Stamp/build : Build/Stamp/configure + make all check + touch $@ + diff --git a/lib-src/libsndfile/Win32/Makefile.am b/lib-src/libsndfile/Win32/Makefile.am deleted file mode 100644 index 4fe8efa7b..000000000 --- a/lib-src/libsndfile/Win32/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = README-precompiled-dll.txt testprog.c - diff --git a/lib-src/libsndfile/Win32/Makefile.in b/lib-src/libsndfile/Win32/Makefile.in deleted file mode 100644 index 78a822528..000000000 --- a/lib-src/libsndfile/Win32/Makefile.in +++ /dev/null @@ -1,489 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = Win32 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = README-precompiled-dll.txt testprog.c -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Win32/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Win32/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/appveyor.yml b/lib-src/libsndfile/appveyor.yml new file mode 100644 index 000000000..8784fc00d --- /dev/null +++ b/lib-src/libsndfile/appveyor.yml @@ -0,0 +1,23 @@ +version: 1.0.29pre1-{build} +image: Visual Studio 2017 +configuration: Debug +platform: + - Win32 + - x64 +install: + - if %platform%==Win32 set VCPKG_TRIPLET=x86-windows + - if %platform%==x64 set VCPKG_TRIPLET=x64-windows + - vcpkg install libogg:%VCPKG_TRIPLET% libvorbis:%VCPKG_TRIPLET% libflac:%VCPKG_TRIPLET% sqlite3:%VCPKG_TRIPLET% opus:%VCPKG_TRIPLET% +before_build: + - mkdir CMakeBuild + - cd CMakeBuild + - if %platform%==Win32 set CMAKE_GENERATOR=Visual Studio 15 2017 + - if %platform%==x64 set CMAKE_GENERATOR=Visual Studio 15 2017 Win64 + - cmake .. -G"%CMAKE_GENERATOR%" -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake +build: + project: c:\projects\libsndfile\CMakeBuild\sndfile.sln + verbosity: minimal +test_script: + - ctest -V +cache: + C:\Tools\vcpkg\Installed -> appveyor.yml diff --git a/lib-src/libsndfile/autogen.sh b/lib-src/libsndfile/autogen.sh new file mode 100755 index 000000000..dbdb5ded0 --- /dev/null +++ b/lib-src/libsndfile/autogen.sh @@ -0,0 +1,176 @@ +#!/bin/sh +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) + +package="libsndfile" + +olddir=`pwd` +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +cd "$srcdir" +DIE=0 + +printf "checking for autogen ... " +result="yes" +(autogen --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have GNU autogen installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + result="no" + DIE=1 +} +echo $result + +printf "checking for autoconf ... " +result="yes" +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + result="no" + DIE=1 +} +echo $result + +VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/" +VERSIONMKMAJ="sed -e s/\([0-9][0-9]*\)[^0-9].*/\\1/" +VERSIONMKMIN="sed -e s/.*[0-9][0-9]*\.//" + +# do we need automake? +if test -r Makefile.am; then + AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am` + AM_NEEDED=`echo $AM_OPTIONS | $VERSIONGREP` + if test x"$AM_NEEDED" = "x$AM_OPTIONS"; then + AM_NEEDED="" + fi + if test -z $AM_NEEDED; then + printf "checking for automake ... " + AUTOMAKE=automake + ACLOCAL=aclocal + if ($AUTOMAKE --version < /dev/null > /dev/null 2>&1); then + echo "yes" + else + echo "no" + AUTOMAKE= + fi + else + printf "checking for automake $AM_NEEDED or later ... " + majneeded=`echo $AM_NEEDED | $VERSIONMKMAJ` + minneeded=`echo $AM_NEEDED | $VERSIONMKMIN` + for am in automake-$AM_NEEDED automake$AM_NEEDED \ + automake automake-1.7 automake-1.8 automake-1.9 automake-1.10; do + ($am --version < /dev/null > /dev/null 2>&1) || continue + ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP` + maj=`echo $ver | $VERSIONMKMAJ` + min=`echo $ver | $VERSIONMKMIN` + if test $maj -eq $majneeded -a $min -ge $minneeded; then + AUTOMAKE=$am + echo $AUTOMAKE + break + fi + done + test -z $AUTOMAKE && echo "no" + printf "checking for aclocal $AM_NEEDED or later ... " + for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \ + aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9 aclocal-1.10; do + ($ac --version < /dev/null > /dev/null 2>&1) || continue + ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP` + maj=`echo $ver | $VERSIONMKMAJ` + min=`echo $ver | $VERSIONMKMIN` + if test $maj -eq $majneeded -a $min -ge $minneeded; then + ACLOCAL=$ac + echo $ACLOCAL + break + fi + done + test -z $ACLOCAL && echo "no" + fi + test -z $AUTOMAKE || test -z $ACLOCAL && { + echo + echo "You must have automake installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + exit 1 + } +fi + +printf "checking for libtool ... " +for LIBTOOLIZE in libtoolize glibtoolize nope; do + ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break +done +if test x$LIBTOOLIZE = xnope; then + echo "nope." + LIBTOOLIZE=libtoolize +else + echo $LIBTOOLIZE +fi +($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have libtool installed to compile $package." + echo "Download the appropriate package for your system," + echo "or get the source from one of the GNU ftp sites" + echo "listed in http://www.gnu.org/order/ftp.html" + DIE=1 +} + +printf "checking for pkg-config ... " +result="yes" +(pkg-config --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have pkg-config installed to compile $package." + echo "Download the appropriate package for your distribution." + result="no" + DIE=1 +} +echo $result + + +printf "checking for python ... " +result="yes" +(python --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have Python installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at http://python.org/" + result="no" + DIE=1 +} +echo $result + +if test "$DIE" -eq 1; then + exit 1 +fi + +echo "Generating configuration files for $package, please wait ... " + +echo " $ACLOCAL $ACLOCAL_FLAGS" +$ACLOCAL $ACLOCAL_FLAGS || exit 1 +echo " $LIBTOOLIZE --automake --force" +$LIBTOOLIZE --automake --force || exit 1 +echo " autoheader" +autoheader || exit 1 +echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS" +$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1 +echo " autoconf" +autoconf || exit 1 + +# Generate the src/cmake-config.h.in from src/config.h.in. +# CMake process src/cmake-config.h to create src/config.h. +rm -f src/config.h src/cmake-config.h + +cd $olddir + +if test -d .git/ ; then + fprecommit=.git/hooks/pre-commit + if test ! -f $fprecommit ; then + echo + echo "Installing git pre-commit hook for this project." + printf "#/bin/sh\nexec Scripts/git-pre-commit-hook\n" > $fprecommit + chmod u+x $fprecommit + echo + fi + fi + diff --git a/lib-src/libsndfile/autotools.patch b/lib-src/libsndfile/autotools.patch deleted file mode 100644 index 6103288bd..000000000 --- a/lib-src/libsndfile/autotools.patch +++ /dev/null @@ -1,125 +0,0 @@ -Index: Makefile.am -=================================================================== ---- Makefile.am (revision 12938) -+++ Makefile.am (working copy) -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+ACLOCAL_AMFLAGS = -I M4 -+ - DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror - - if BUILD_OCTAVE_MOD -Index: configure.ac -=================================================================== ---- configure.ac (revision 12938) -+++ configure.ac (working copy) -@@ -15,16 +15,13 @@ - AC_CONFIG_MACRO_DIR([M4]) - AC_CONFIG_HEADERS([src/config.h]) - --AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) -+AM_INIT_AUTOMAKE - AM_SILENT_RULES([yes]) - - dnl Audacity policy: don't enable automatic rebuild of configure et al if - dnl sources change - AM_MAINTAINER_MODE([disable]) - --dnl Add parameters for aclocal --AC_SUBST(ACLOCAL_AMFLAGS, "-I M4") -- - AC_LANG([C]) - - AC_PROG_CC -Index: examples/Makefile.am -=================================================================== ---- examples/Makefile.am (revision 12938) -+++ examples/Makefile.am (working copy) -@@ -2,7 +2,7 @@ - - noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle sndfile-to-text - --INCLUDES = -I$(top_srcdir)/src -+AM_CPPFLAGS = -I$(top_srcdir)/src - - sndfile_to_text_SOURCES = sndfile-to-text.c - sndfile_to_text_LDADD = $(top_builddir)/src/libsndfile.la -Index: Octave/Makefile.am -=================================================================== ---- Octave/Makefile.am (revision 12938) -+++ Octave/Makefile.am (working copy) -@@ -21,7 +21,7 @@ - OCT_LIBS = @OCT_LIBS@ - - SNDFILEDIR = $(top_builddir)/src --INCLUDES = -I$(SNDFILEDIR) -+AM_CPPFLAGS = -I$(SNDFILEDIR) - - oct_module_srcs = sndfile.cc - oct_module_files = sndfile.oct PKG_ADD -@@ -39,10 +39,10 @@ - # Use Octave's mkoctfile to do all the heavy lifting. Unfortunately, its - # a little dumb so we need to guide it carefully. - sndfile.oct : sndfile.o -- $(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null -+ $(QUIET_GEN) $(MKOCTFILE) -v $(AM_CPPFLAGS) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null - - sndfile.o : sndfile.cc -- $(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) -c $+ -o $(top_builddir)/Octave/$@ > /dev/null -+ $(QUIET_GEN) $(MKOCTFILE) -v $(AM_CPPFLAGS) -c $+ -o $(top_builddir)/Octave/$@ > /dev/null - - # Allow for the test being run in the build dir, but the test script - # being located in the source dir. -Index: programs/Makefile.am -=================================================================== ---- programs/Makefile.am (revision 12938) -+++ programs/Makefile.am (working copy) -@@ -7,7 +7,7 @@ - OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ - OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ - --INCLUDES = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS) -+AM_CPPFLAGS = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS) - - CLEANFILES = *~ - -Index: regtest/Makefile.am -=================================================================== ---- regtest/Makefile.am (revision 12938) -+++ regtest/Makefile.am (working copy) -@@ -4,7 +4,7 @@ - - noinst_HEADERS = regtest.h - --INCLUDES = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS) -+AM_CPPFLAGS = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS) - - sndfile_regtest_SOURCES = sndfile-regtest.c database.c checksum.c - sndfile_regtest_LDADD = $(top_builddir)/src/libsndfile.la $(SQLITE3_LIBS) -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am (revision 12938) -+++ src/Makefile.am (working copy) -@@ -2,7 +2,7 @@ - - SUBDIRS = GSM610 G72x - --INCLUDES = @EXTERNAL_CFLAGS@ -+AM_CPPFLAGS = @EXTERNAL_CFLAGS@ - - lib_LTLIBRARIES = libsndfile.la - include_HEADERS = sndfile.hh -Index: tests/Makefile.am -=================================================================== ---- tests/Makefile.am (revision 12938) -+++ tests/Makefile.am (working copy) -@@ -6,7 +6,7 @@ - CPP_TEST = cpp_test - endif - --INCLUDES = -I$(top_srcdir)/src -+AM_CPPFLAGS = -I$(top_srcdir)/src - - noinst_PROGRAMS = sfversion floating_point_test write_read_test \ - lossy_comp_test error_test ulaw_test alaw_test dwvw_test \ diff --git a/lib-src/libsndfile/azure-pipelines.yml b/lib-src/libsndfile/azure-pipelines.yml new file mode 100644 index 000000000..607e2d5c2 --- /dev/null +++ b/lib-src/libsndfile/azure-pipelines.yml @@ -0,0 +1,168 @@ +jobs: + - job: Ubuntu_CMake + pool: + vmImage: 'Ubuntu-16.04' + steps: + - script: | + sudo apt-get install -y autogen libogg-dev libvorbis-dev libflac-dev libopus-dev libasound2-dev libsqlite3-dev libspeex-dev + displayName: Installing dependencies + - script: | + mkdir build + displayName: Creating build directory + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: ' ..' + - script: | + cd build + cmake --build . + displayName: Building + - script: | + cd build + ctest + displayName: Testing + + - job: Ubuntu_AutoTools + pool: + vmImage: 'Ubuntu-16.04' + steps: + - script: sudo apt-get install -y autogen libogg-dev libvorbis-dev libflac-dev libopus-dev libasound2-dev libsqlite3-dev libspeex-dev + displayName: Installing dependencies + - script: ./autogen.sh + displayName: Bootstrapping + - script: ./configure --enable-werror + displayName: Configuring + - script: make all + displayName: Building + - script: make check + displayName: Testing + - script: make distcheck + displayName: Testing distribution + + - job: Windows_CMake_VS2015_Win32 + pool: + vmImage: 'vs2015-win2012r2' + steps: + - script: git clone https://github.com/microsoft/vcpkg + displayName: Bootstraping Vcpkg + - script: .\vcpkg\bootstrap-vcpkg.bat + displayName: Bootstraping Vcpkg + - script: .\vcpkg\vcpkg.exe install libogg libvorbis libflac opus sqlite3 speex + displayName: Installing dependencies + - script: | + mkdir build + displayName: Creating build directory + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: ' -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + - script: | + cd build + cmake --build . + displayName: Building + - script: | + cd build + ctest + displayName: Testing + + - job: Windows_CMake_VS2015_Win64 + pool: + vmImage: 'vs2015-win2012r2' + steps: + - script: git clone https://github.com/microsoft/vcpkg + displayName: Bootstraping Vcpkg + - script: .\vcpkg\bootstrap-vcpkg.bat + displayName: Bootstraping Vcpkg + - script: .\vcpkg\vcpkg.exe install libogg:x64-windows libvorbis:x64-windows libflac:x64-windows opus:x64-windows sqlite3:x64-windows speex:x64-windows + displayName: Installing dependencies + - script: | + mkdir build + displayName: Creating build directory + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: ' -G "Visual Studio 14 2015" -A x64 -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + - script: | + cd build + cmake --build . + displayName: Building + - script: | + cd build + ctest + displayName: Testing + + - job: Windows_CMake_VS2017_Win32 + pool: + vmImage: 'vs2017-win2016' + steps: + - script: git clone https://github.com/microsoft/vcpkg + displayName: Bootstraping Vcpkg + - script: .\vcpkg\bootstrap-vcpkg.bat + displayName: Bootstraping Vcpkg + - script: .\vcpkg\vcpkg.exe install libogg libvorbis libflac opus sqlite3 speex + displayName: Installing dependencies + - script: | + mkdir build + displayName: Creating build directory + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: ' -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + - script: | + cd build + cmake --build . + displayName: Building + - script: | + cd build + ctest + displayName: Testing + + - job: Windows_CMake_VS2017_Win64 + pool: + vmImage: 'vs2017-win2016' + steps: + - script: git clone https://github.com/microsoft/vcpkg + displayName: Bootstraping Vcpkg + - script: .\vcpkg\bootstrap-vcpkg.bat + displayName: Bootstraping Vcpkg + - script: .\vcpkg\vcpkg.exe install libogg:x64-windows libvorbis:x64-windows libflac:x64-windows opus:x64-windows sqlite3:x64-windows speex:x64-windows + displayName: Installing dependencies + - script: | + mkdir build + displayName: Creating build directory + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: ' -G "Visual Studio 15 2017" -A x64 -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..' + - script: | + cd build + cmake --build . + displayName: Building + - script: | + cd build + ctest + displayName: Testing + + - job: MacOS + pool: + vmImage: 'macOS-10.13' + steps: + - script: | + brew update + brew install autogen libogg libvorbis flac opus sqlite3 speex + displayName: Installing dependencies + - script: | + mkdir build + displayName: Creating build directory + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: ' ..' + - script: | + cd build + cmake --build . + displayName: Building + - script: | + cd build + ctest + displayName: Testing diff --git a/lib-src/libsndfile/cmake/CMakeAutoGen.cmake b/lib-src/libsndfile/cmake/CMakeAutoGen.cmake new file mode 100644 index 000000000..f82dc137c --- /dev/null +++ b/lib-src/libsndfile/cmake/CMakeAutoGen.cmake @@ -0,0 +1,46 @@ +# CMake implementation of AutoGen +# Copyright (C) 2017 Anonymous Maarten + +set(AUTOGEN_SCRIPT "${CMAKE_MODULE_PATH}/CMakeAutoGenScript.cmake") + +function(lsf_autogen DIR_REL NAME_WE) + set(EXTS ${ARGN}) + set(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_REL}/${NAME_WE}.def") + set(OUTPUTS) + foreach(EXT ${EXTS}) + list(APPEND OUTPUTS "${NAME_WE}.${EXT}") + endforeach() + add_autogen_target("${INPUT}" "${CMAKE_CURRENT_BINARY_DIR}/${DIR_REL}" ${OUTPUTS}) +endfunction() + +function(add_autogen_target INPUT OUTPUTDIR) + set(OUTPUTFILES "${ARGN}") + + if (OUTPUTDIR) + set(PREFIX "${OUTPUTDIR}/") + else() + set(PREFIX "") + endif() + + set(ARTIFACTS) + foreach(OUTPUTFILE ${OUTPUTFILES}) + list(APPEND ARTIFACTS "${PREFIX}${OUTPUTFILE}") + endforeach() + + set(EXTRA_ARGS) + if (AUTOGEN_DEBUG) + list(APPEND EXTRA_ARGS "-DDEBUG=1") + endif() + if (OUTPUTDIR) + list(APPEND EXTRA_ARGS "-DOUTPUTDIR=${OUTPUTDIR}") + endif() + + add_custom_command( + OUTPUT ${ARTIFACTS} + COMMAND ${CMAKE_COMMAND} "-DDEFINITION=${INPUT}" ${EXTRA_ARGS} -P "${AUTOGEN_SCRIPT}" + MAIN_DEPENDENCY "${INPUT}" + DEPENDS "${AUTOGEN_SCRIPT}" + COMMENT "CMakeAutoGen: generating ${OUTPUTFILES}" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + ) +endfunction() diff --git a/lib-src/libsndfile/cmake/CMakeAutoGenScript.cmake b/lib-src/libsndfile/cmake/CMakeAutoGenScript.cmake new file mode 100644 index 000000000..ade53e198 --- /dev/null +++ b/lib-src/libsndfile/cmake/CMakeAutoGenScript.cmake @@ -0,0 +1,442 @@ +# CMake implementation of AutoGen +# Copyright (C) 2017 Anonymous Maarten + +set(WS " \t\r\n") + +function(cutoff_first_occurrence TEXT OCCURRENCE RESULT) + string(FIND "${TEXT}" "${OCCURRENCE}" OCCURRENCE_INDEX) + if (OCCURRENCE_INDEX EQUAL -1) + set(${TEXT} "" PARENT_SCOPE) + return() + endif() + + string(LENGTH "${OCCURRENCE}" OCCURRENCE_LENGTH) + math(EXPR CUTOFF_INDEX "${OCCURRENCE_INDEX}+${OCCURRENCE_LENGTH}") + string(SUBSTRING "${TEXT}" ${CUTOFF_INDEX} -1 TEXT_REMAINDER) + set(${RESULT} "${TEXT_REMAINDER}" PARENT_SCOPE) + + endfunction() + +function(read_definition DEFINITION_FILENAME TEMPLATE_FILENAME DATA) + file(READ "${DEFINITION_FILENAME}" DEFINITION_CONTENTS) + + string(REGEX MATCH "autogen definitions ([a-zA-Z\\._-]+);[${WS}]*" TEMPLATE_MATCH "${DEFINITION_CONTENTS}") + if (NOT TEMPLATE_MATCH) + message(FATAL_ERROR "${DEFINITION_FILENAME} doest not contain an AutoGen definition.") + endif() + + get_filename_component(DEFINITION_DIR "${DEFINITION_FILENAME}" PATH) + set(${TEMPLATE_FILENAME} "${DEFINITION_DIR}/${CMAKE_MATCH_1}" PARENT_SCOPE) + if (DEBUG) + message("found: TEMPLATE_FILENAME=${CMAKE_MATCH_1}") + endif() + + cutoff_first_occurrence("${DEFINITION_CONTENTS}" "${TEMPLATE_MATCH}" DEFINITION_CONTENTS) + + set(DEFINITION "") + + while (1) + string(REGEX MATCH "([a-zA-Z_][a-zA-Z0-9_]*)[${WS}]*=[${WS}]*{[${WS}]*" GROUPSTART_MATCH "${DEFINITION_CONTENTS}") + if (NOT GROUPSTART_MATCH) + break() + endif() + set(GROUPNAME "${CMAKE_MATCH_1}") + cutoff_first_occurrence("${DEFINITION_CONTENTS}" "${GROUPSTART_MATCH}" DEFINITION_CONTENTS) + if (DEBUG) + message("found: GROUPNAME=${GROUPNAME}") + endif() + set(NBKEYS 0) + set(GROUP_KEY_VALUES "") + while (1) + string(REGEX MATCH "^([a-zA-Z_][a-zA-Z0-9_]*)[${WS}]*=[${WS}]*(([\"']([${WS}a-zA-Z0-9_%\\\"<>\(\)\\.*+/?:,\\-]+)[\"'])|([a-zA-Z0-9_%\\]+))[${WS}]*;[${WS}]*" KEY_VALUE_MATCH "${DEFINITION_CONTENTS}") + if (NOT KEY_VALUE_MATCH) + break() + endif() + set(KEY "${CMAKE_MATCH_1}") + if ("${CMAKE_MATCH_4}" STREQUAL "") + set(VALUE "${CMAKE_MATCH_5}") + else() + string(REPLACE "\\\"" "\"" VALUE "${CMAKE_MATCH_4}") + #set(VALUE "${CMAKE_MATCH_4}") + endif() + + if (DEBUG) + message("found: KEY=${KEY}, VALUE=${VALUE}") + endif() + math(EXPR NBKEYS "${NBKEYS}+1") + list(APPEND GROUP_KEY_VALUES "${KEY}" "${VALUE}") + cutoff_first_occurrence("${DEFINITION_CONTENTS}" "${KEY_VALUE_MATCH}" DEFINITION_CONTENTS) + endwhile() + string(REGEX MATCH "^[${WS}]*}[${WS}]*;[${WS}]*" GROUPEND_MATCH "${DEFINITION_CONTENTS}") + if (NOT GROUPEND_MATCH) + message(FATAL_ERROR "Group ${GROUPNAME} did not finish.") + endif() + cutoff_first_occurrence("${DEFINITION_CONTENTS}" "${GROUPEND_MATCH}" DEFINITION_CONTENTS) + list(APPEND DEFINITION "${GROUPNAME}" ${NBKEYS} ${GROUP_KEY_VALUES}) + endwhile() + set(${DATA} "${DEFINITION}" PARENT_SCOPE) +endfunction() + +function(match_autogen_group TEXT START POS0 POS1 MATCH FOUND) + string(SUBSTRING "${TEXT}" "${START}" -1 TEXT) + string(REGEX MATCH "\\[\\+[${WS}]*([ a-zA-Z0-9=_$%\\(\\)\"\\+\\-]+)[${WS}]*\\+\\]" MATCH_GROUP "${TEXT}") + if ("${MATCH_GROUP}" STREQUAL "") + set(${FOUND} 0 PARENT_SCOPE) + return() + endif() + string(FIND "${TEXT}" "${MATCH_GROUP}" START_TEXT) + math(EXPR POS0_var "${START}+${START_TEXT}") + string(LENGTH "${MATCH_GROUP}" MATCH_LENGTH) + math(EXPR POS1_var "${POS0_var}+${MATCH_LENGTH}") + set(${POS0} "${POS0_var}" PARENT_SCOPE) + set(${POS1} "${POS1_var}" PARENT_SCOPE) + set(${FOUND} 1 PARENT_SCOPE) + string(STRIP "${CMAKE_MATCH_1}" CONTENT) + set("${MATCH}" "${CONTENT}" PARENT_SCOPE) +endfunction() + +function(append_output SUFFICES_FILENAMES TEXT POS0 POS1 FILTER) + math(EXPR POS_LENGTH "${POS1}-${POS0}") + string(LENGTH "${TEXT}" TEXT_LENGTH) + string(SUBSTRING "${TEXT}" "${POS0}" "${POS_LENGTH}" TEXT_APPEND) + if (DEBUG) + message("appending ${POS0}:${POS1}, length=${POS_LENGTH}") + endif() + append_output_text("${SUFFICES_FILENAMES}" "${TEXT_APPEND}" "${FILTER}") +endfunction() + +function(append_output_text SUFFICES_FILENAMES TEXT_APPEND FILTER) + string(LENGTH "${TEXT_APPEND}" TEXT_LENGTH) + list(LENGTH SUFFICES_FILENAMES NB) + math(EXPR NB_END "${NB}-1") + foreach(INDEX RANGE 0 ${NB_END} 3) + math(EXPR INDEX_1 "${INDEX}+1") + math(EXPR INDEX_2 "${INDEX}+2") + list(GET SUFFICES_FILENAMES ${INDEX} SUFFIX) + list(GET SUFFICES_FILENAMES ${INDEX_1} FILENAME) + list(GET SUFFICES_FILENAMES ${INDEX_2} TEMPFILENAME) + set(WRITE_OK 1) + if (FILTER) + if (NOT "${SUFFIX}" STREQUAL "${FILTER}") + set(WRITE_OK 0) + endif() + endif() + if (WRITE_OK) + if (DEBUG) + message("Write: ${TEXT_LENGTH} characters to ${FILENAME}") + endif() + file(APPEND "${TEMPFILENAME}" "${TEXT_APPEND}") + endif() + endforeach() +endfunction() + +function(output_finish SUFFICES_FILENAMES) + list(LENGTH SUFFICES_FILENAMES NB) + math(EXPR NB_END "${NB}-1") + foreach(INDEX RANGE 0 ${NB_END} 3) + math(EXPR INDEX_1 "${INDEX}+1") + math(EXPR INDEX_2 "${INDEX}+2") + list(GET SUFFICES_FILENAMES ${INDEX_1} FILENAME) + list(GET SUFFICES_FILENAMES ${INDEX_2} TEMPFILENAME) + file(RENAME "${TEMPFILENAME}" "${FILENAME}") + endforeach() +endfunction() + +function(stack_push STACK_ARG) + set(STACK_LIST "${${STACK_ARG}}") + string(REPLACE ";" " " NEWITEM "${ARGN}") + if (DEBUG) + list(LENGTH STACK_LIST STACK_LENGTH) + message("Pushing \"${NEWITEM}\" onto stack (length=${STACK_LENGTH})") + endif() + list(APPEND STACK_LIST "${NEWITEM}") + set(${STACK_ARG} "${STACK_LIST}" PARENT_SCOPE) +endfunction() + +function(stack_pop STACK_ARG ITEM) + set(STACK_LIST "${${STACK_ARG}}") + list(LENGTH STACK_LIST STACK_LENGTH) + if (STACK_LENGTH EQUAL 0) + message(FATAL_ERROR "ENDFOR: stack is empty") + endif() + math(EXPR LAST_ITEM_INDEX "${STACK_LENGTH}-1") + list(GET STACK_LIST "${LAST_ITEM_INDEX}" LAST_ITEM) + list(REMOVE_AT STACK_LIST "${LAST_ITEM_INDEX}") + string(REPLACE " " ";" LAST_ITEM_LIST "${LAST_ITEM}") + if (DEBUG) + message("Popping \"${LAST_ITEM}\" from stack (length=${STACK_LENGTH})") + endif() + set(${ITEM} "${LAST_ITEM_LIST}" PARENT_SCOPE) + set(${STACK_ARG} "${STACK_LIST}" PARENT_SCOPE) +endfunction() + +function(stack_top STACK_ARG ITEM) + set(STACK_LIST "${${STACK_ARG}}") + list(LENGTH STACK_LIST STACK_LENGTH) + if (STACK_LENGTH EQUAL 0) + message(FATAL_ERROR "ENDFOR: stack is empty") + endif() + math(EXPR LAST_ITEM_INDEX "${STACK_LENGTH}-1") + list(GET STACK_LIST "${LAST_ITEM_INDEX}" LAST_ITEM) + string(REPLACE " " ";" LAST_ITEM_LIST "${LAST_ITEM}") + if (DEBUG) + message("Top of stack: \"${LAST_ITEM}\" from stack (length=${STACK_LENGTH})") + endif() + set(${ITEM} "${LAST_ITEM_LIST}" PARENT_SCOPE) +endfunction() + +function(stack_find_key STACK_LIST TEMPLATE_PARAMETERS KEY VALUE) + list(REVERSE STACK_LIST) + foreach(STACK_ITEM ${STACK_LIST}) + string(REPLACE " " ";" STACK_ITEM_LIST "${STACK_ITEM}") + list(GET STACK_ITEM_LIST 3 TP_INDEX) + math(EXPR TP_SIZE_INDEX "${TP_INDEX}+1") + list(GET TEMPLATE_PARAMETERS ${TP_SIZE_INDEX} TP_SIZE) + math(EXPR TP_KV_INDEX_START "${TP_INDEX}+2") + math(EXPR TP_KV_INDEX_END "${TP_KV_INDEX_START}+2*${TP_SIZE}-1") + foreach(TP_KV_INDEX RANGE ${TP_KV_INDEX_START} ${TP_KV_INDEX_END} 2) + list(GET TEMPLATE_PARAMETERS ${TP_KV_INDEX} TP_KEY) + if("${TP_KEY}" STREQUAL "${KEY}") + math(EXPR TP_VALUE_INDEX "${TP_KV_INDEX}+1") + list(GET TEMPLATE_PARAMETERS ${TP_VALUE_INDEX} TP_VALUE) + set(${VALUE} "${TP_VALUE}" PARENT_SCOPE) + return() + endif() + endforeach() + endforeach() + message(FATAL_ERROR "Unknown KEY=${KEY}") +endfunction() + +function(template_parameters_find_next_groupname_index TEMPLATE_PARAMETERS GROUPNAME INDEX_LAST INDEX_NEXT) + if (${INDEX_LAST} LESS 0) + set(INDEX 0) + else () + math(EXPR INDEX_1 "1+(${INDEX_LAST})") + list(GET TEMPLATE_PARAMETERS ${INDEX_1} GROUPNAME_INDEX_SIZE) + math(EXPR INDEX "${INDEX_LAST}+1+2*${GROUPNAME_INDEX_SIZE}+1") + endif() + list(LENGTH TEMPLATE_PARAMETERS PARAMETERS_LENGTH) + while (${INDEX} LESS ${PARAMETERS_LENGTH}) + list(GET TEMPLATE_PARAMETERS ${INDEX} GROUPNAME_AT_INDEX) + if ("${GROUPNAME}" STREQUAL "${GROUPNAME_AT_INDEX}") + set("${INDEX_NEXT}" ${INDEX} PARENT_SCOPE) + return() + endif() + math(EXPR INDEX_1 "${INDEX}+1") + list(GET TEMPLATE_PARAMETERS ${INDEX_1} GROUPNAME_INDEX_SIZE) + math(EXPR INDEX "${INDEX}+1+2*${GROUPNAME_INDEX_SIZE}+1") + endwhile() + set("${INDEX_NEXT}" -1 PARENT_SCOPE) +endfunction() + +function(calculate_line_number TEXT POSITION LINENUMBER_ARG) + #math(EXPR INDEX_MAX "${POSITION}-1") + string(SUBSTRING "${TEXT}" 0 ${POSITION} SUBTEXT) + string(REGEX MATCHALL "\n" MATCH_NEWLINES "${SUBTEXT}") + list(LENGTH MATCH_NEWLINES NBLINES) + math(EXPR NBLINES "${NBLINES}+1") + set(${LINENUMBER_ARG} ${NBLINES} PARENT_SCOPE) +endfunction() + +function(parse_template TEMPLATE_FILENAME OUTPUT_DIR TEMPLATE_PARAMETERS) + file(READ ${TEMPLATE_FILENAME} TEMPLATE_CONTENTS) + set(POSITION 0) + match_autogen_group("${TEMPLATE_CONTENTS}" "${POSITION}" POS0 POS1 AUTOGEN FOUND) + if (NOT FOUND) + message(FATAL_ERROR "Header of template not found") + endif() + string(REGEX MATCH "AutoGen5 template ([ a-zA-Z0-9]*)" SUFFICES_MATCH "${AUTOGEN}") + if (NOT SUFFICES_MATCH) + message(FATAL_ERROR "No output suffices found") + endif() + string(STRIP "${CMAKE_MATCH_1}" SUFFICES) + string(REPLACE " " ";" SUFFICES "${SUFFICES}") + set(SUFFICES_FILENAMES "") + get_filename_component(TEMPLATE_NAME_WE "${TEMPLATE_FILENAME}" NAME_WE) + foreach(SUFFIX ${SUFFICES}) + if ("${OUTPUT_DIR}" STREQUAL "") + set(DIR_PREFIX "") + else() + set(DIR_PREFIX "${OUTPUT_DIR}/") + endif() + string(RANDOM LENGTH 64 RANDOMSTRING) + set(FILENAME "${DIR_PREFIX}${TEMPLATE_NAME_WE}.${SUFFIX}") + set(TEMPFILENAME "${DIR_PREFIX}${TEMPLATE_NAME_WE}${RANDOMSTRING}.${SUFFIX}") + list(APPEND SUFFICES_FILENAMES "${SUFFIX}" "${FILENAME}" "${TEMPFILENAME}") + file(WRITE "${FILENAME}" "") + endforeach() + if (DEBUG) + message("Output files: ${SUFFICES_FILENAMES}") + endif() + set(WRITE_FILTER "") + append_output("${SUFFICES_FILENAMES}" "${TEMPLATE_CONTENTS}" 0 "${POS0}" "${WRITE_FILTER}") + math(EXPR POS1 "${POS1}+1") + set(POSITION "${POS1}") + if (DEBUG) + message("Output: ${SUFFICES_FILENAMES}") + endif() + + set(STACK "") + while (1) + match_autogen_group("${TEMPLATE_CONTENTS}" "${POSITION}" POS0 POS1 GROUP_MATCH FOUND) + if (NOT FOUND) + if (DEBUG) + message("No group found. Dumping rest of file.") + endif() + if (NOT "${STACK}" STREQUAL "") + message(FATAL_ERROR "Stack not empty at end of file") + endif() + string(LENGTH "${TEMPLATE_CONTENTS}" TEXT_LENGTH) + append_output("${SUFFICES_FILENAMES}" "${TEMPLATE_CONTENTS}" ${POSITION} ${TEXT_LENGTH} "${WRITE_FILTER}") + break() + endif() + append_output("${SUFFICES_FILENAMES}" "${TEMPLATE_CONTENTS}" ${POSITION} ${POS0} "${WRITE_FILTER}") + set(POSITION "${POS1}") + + if (GROUP_MATCH MATCHES "^FOR") + string(REPLACE " " ";" GROUP_MATCH_LIST "${GROUP_MATCH}") + list(GET GROUP_MATCH_LIST 1 FOR_KEY) + template_parameters_find_next_groupname_index("${TEMPLATE_PARAMETERS}" "${FOR_KEY}" -1 FOR_INDEX) + if (DEBUG) + message("FOR_KEY: ${FOR_KEY}") + message("FOR_INDEX: ${FOR_INDEX}") + endif() + if (${FOR_KEY} LESS 0) + message(FATAL_ERROR "FOR has key with empty list. Not implemented yet..") + endif() + stack_push(STACK FOR ${POSITION} ${FOR_KEY} ${FOR_INDEX}) + elseif (GROUP_MATCH MATCHES "^ENDFOR") + string(REPLACE " " ";" GROUP_MATCH_LIST "${GROUP_MATCH}") + list(GET GROUP_MATCH_LIST 1 ENDFOR_KEY) + stack_pop(STACK FOR_ITEM) + list(GET FOR_ITEM 0 FOR_FOR) + if (NOT "${FOR_FOR}" STREQUAL "FOR") + message(FATAL_ERROR "ENDFOR does not match last item: ${FOR_FOR}") + endif() + list(GET FOR_ITEM 1 FOR_POSITION) + list(GET FOR_ITEM 2 FOR_KEY) + if (NOT "${FOR_KEY}" STREQUAL "${ENDFOR_KEY}") + calculate_line_number("${TEMPLATE_CONTENTS}" "${POSITION}" LINENUMBER) + message("FOR and ENDFOR do not match. (line number ${LINENUMBER}) (FOR:${FOR_KEY}, ENDFOR:${ENDFOR_KEY})") + endif() + list(GET FOR_ITEM 3 FOR_INDEX_PREV) + template_parameters_find_next_groupname_index("${TEMPLATE_PARAMETERS}" "${FOR_KEY}" ${FOR_INDEX_PREV} FOR_INDEX) + if (DEBUG) + message("FOR_INDEX was ${FOR_INDEX_PREV}, is now ${FOR_INDEX}") + endif() + if (${FOR_INDEX} LESS 0) + if (DEBUG) + message("ENDFOR: FOR_INDEX < 0 (no more key) ==> Continue") + endif() + else() + set(POSITION ${FOR_POSITION}) + stack_push(STACK FOR ${FOR_POSITION} ${FOR_KEY} ${FOR_INDEX}) + if (DEBUG) + message("ENDFOR: FOR_INDEX >= 0 (more keys available) ==> Back to position=${FOR_POSITION}") + endif() + endif() + elseif (GROUP_MATCH MATCHES "^CASE") + string(REGEX MATCH "^CASE[${WS}]+\\(([a-zA-Z]+)\\)" CASE_MATCH "${GROUP_MATCH}") + if ("${CASE_MATCH}" STREQUAL "") + message(FATAL_ERROR "Wrong CASE syntax") + endif() + set(CASE_KEY "${CMAKE_MATCH_1}") + if (DEBUG) + message("CASE: KEY=${CASE_KEY}") + endif() + stack_push(STACK CASE "${CASE_KEY}" ${POSITION}) + elseif (GROUP_MATCH MATCHES "^==") + math(EXPR POSITION "${POSITION}+1") + string(REGEX MATCH "^==[${WS}]+([a-zA-Z_][a-zA-Z0-9_]*)" CASE_MATCH "${GROUP_MATCH}") + if ("${CASE_MATCH}" STREQUAL "") + message(FATAL_ERROR "Wrong == syntax") + endif() + stack_top(STACK CASE_ITEM) + list(GET CASE_ITEM 0 CASE_CASE) + if(NOT "${CASE_CASE}" STREQUAL "CASE") + message(FATAL_ERROR "== block must be in CASE. Top of stack=${CASE_CASE}") + endif() + set(CASE_VALUE "${CMAKE_MATCH_1}") + if (DEBUG) + message("case: == VALUE=${CASE_VALUE}") + endif() + list(GET CASE_ITEM 1 CASE_KEY) + if ("${CASE_KEY}" STREQUAL "suffix") + if (DEBUG) + message("Setting write filter to ${CASE_VALUE}") + endif() + set(WRITE_FILTER "${CASE_VALUE}") + else() + message(FATAL_ERROR "CASE: unsupported argument ${CASE_KEY}") + endif() + elseif (GROUP_MATCH MATCHES "^ESAC") + stack_pop(STACK CASE_ITEM) + if (DEBUG) + message("ESAC") + endif() + list(GET CASE_ITEM 0 CASE_CASE) + if (NOT "${CASE_CASE}" STREQUAL "CASE") + message(FATAL_ERROR "ESAC does not match last item: ${CASE_CASE}") + endif() + if ("${CASE_KEY}" STREQUAL "suffix") + if (DEBUG) + message("Removing write filter") + endif() + set(WRITE_FILTER "") + else() + message(FATAL_ERROR "CASE: unsupported argument ${CASE_KEY}") + endif() + else() + string(REGEX MATCH "\\(([a-zA-Z0-9_$%\"${WS}\\+\\-]+)\\)" PARENTHESE_MATCH "${GROUP_MATCH}") + if (NOT "${PARENTHESE_MATCH}" STREQUAL "") + set(PARENTHESE_CONTENT "${CMAKE_MATCH_1}") + string(REPLACE " " ";" PARENTHESE_LIST "${PARENTHESE_CONTENT}") + list(GET PARENTHESE_LIST 0 PARENTHESE_COMMAND) + if ("${PARENTHESE_COMMAND}" STREQUAL "get") + list(GET PARENTHESE_LIST 1 KEY_QUOTED) + string(REGEX MATCH "\\\"([a-zA-Z_${WS}]+)\\\"" KEY_MATCH "${KEY_QUOTED}") + if ("${KEY_MATCH}" STREQUAL "") + message(FATAL_ERROR "get: empty key") + endif() + set(KEY "${CMAKE_MATCH_1}") + if (DEBUG) + message("Get: key=${KEY}") + endif() + stack_find_key("${STACK}" "${TEMPLATE_PARAMETERS}" "${KEY}" VALUE) + if (DEBUG) + message("Get key=${KEY} ==> value=${VALUE}") + endif() + append_output_text("${SUFFICES_FILENAMES}" "${VALUE}" "${WRITE_FILTER}") + elseif("${PARENTHESE_COMMAND}" STREQUAL "tpl-file-line") + list(GET PARENTHESE_LIST 1 FORMAT_LINE) + calculate_line_number("${TEMPLATE_CONTENTS}" "${POSITION}" LINENUMBER) + append_output_text("${SUFFICES_FILENAMES}" "${LINENUMBER}" "${WRITE_FILTER}") + else() + message(FATAL_ERROR "Unknown parenthese command: ${PARENTHESE_COMMAND}") + endif() + else() + message(FATAL_ERROR "Unknown command: ${GROUP_MATCH}") + endif() + endif() + + endwhile() + if (NOT "${STACK}" STREQUAL "") + message(FATAL_ERROR "STACK was not empty at EOF") + endif() + output_finish("${SUFFICES_FILENAMES}") +endfunction() + +if ("${DEFINITION}" STREQUAL "") + message(FATAL_ERROR "Need definition file") +endif() +if (NOT EXISTS "${DEFINITION}") + message(FATAL_ERROR "Definition file does not exist (${DEFINITION})") +endif() + +read_definition("${DEFINITION}" TEMPLATE_FILENAME DATA) +if (DEBUG) + message("${TEMPLATE_FILENAME}") + message("${DATA}") +endif() + +parse_template("${TEMPLATE_FILENAME}" "${OUTPUTDIR}" "${DATA}") diff --git a/lib-src/libsndfile/cmake/ClipMode.cmake b/lib-src/libsndfile/cmake/ClipMode.cmake new file mode 100644 index 000000000..e47497dc0 --- /dev/null +++ b/lib-src/libsndfile/cmake/ClipMode.cmake @@ -0,0 +1,92 @@ +include (CheckCSourceRuns) +include (CMakePushCheckState) + +macro (CLIP_MODE) + + set (CLIP_MODE_POSITIVE_MESSAGE "Target processor clips on positive float to int conversion") + set (CLIP_MODE_NEGATIVE_MESSAGE "Target processor clips on negative float to int conversion") + + message (STATUS "Checking processor clipping capabilities...") + + if (CMAKE_CROSSCOMPILING) + + set (CLIP_MSG "disabled") + set (CPU_CLIPS_POSITIVE FALSE CACHE BOOL ${CLIP_MODE_POSITIVE_MESSAGE}) + set (CPU_CLIPS_NEGATIVE FALSE CACHE BOOL ${CLIP_MODE_NEGATIVE_MESSAGE}) + + else (NOT CMAKE_CROSSCOMPILING) + + cmake_push_check_state () + + set (CMAKE_REQUIRED_QUIET TRUE) + if (LIBM_REQUIRED) + set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${M_LIBRARY}) + endif () + + check_c_source_runs ( + " + #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 + #define __USE_ISOC99 1 + #define __USE_ISOC9X 1 + #include + int main (void) + { double fval ; + int k, ival ; + + fval = 1.0 * 0x7FFFFFFF ; + for (k = 0 ; k < 100 ; k++) + { ival = (lrint (fval)) >> 24 ; + if (ival != 127) + return 1 ; + + fval *= 1.2499999 ; + } ; + + return 0 ; + } + " + CPU_CLIPS_POSITIVE) + + check_c_source_runs ( + " + #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 + #define __USE_ISOC99 1 + #define __USE_ISOC9X 1 + #include + int main (void) + { double fval ; + int k, ival ; + + fval = -8.0 * 0x10000000 ; + for (k = 0 ; k < 100 ; k++) + { ival = (lrint (fval)) >> 24 ; + if (ival != -128) + return 1 ; + + fval *= 1.2499999 ; + } ; + + return 0 ; + } + " + CPU_CLIPS_NEGATIVE) + + cmake_pop_check_state () + + if (CPU_CLIPS_POSITIVE AND (NOT CPU_CLIPS_NEGATIVE)) + set (CLIP_MSG "positive") + elseif (CPU_CLIPS_NEGATIVE AND (NOT CPU_CLIPS_POSITIVE)) + set (CLIP_MSG "negative") + elseif (CPU_CLIPS_POSITIVE AND CPU_CLIPS_NEGATIVE) + set (CLIP_MSG "both") + else () + set (CLIP_MSG "none") + endif () + + endif (CMAKE_CROSSCOMPILING) + + message (STATUS "Checking processor clipping capabilities... ${CLIP_MSG}") + +endmacro (CLIP_MODE) diff --git a/lib-src/libsndfile/cmake/FindFLAC.cmake b/lib-src/libsndfile/cmake/FindFLAC.cmake new file mode 100644 index 000000000..7396481db --- /dev/null +++ b/lib-src/libsndfile/cmake/FindFLAC.cmake @@ -0,0 +1,67 @@ +# - Find FLAC +# Find the native FLAC includes and libraries +# +# FLAC_INCLUDE_DIRS - where to find FLAC headers. +# FLAC_LIBRARIES - List of libraries when using libFLAC. +# FLAC_FOUND - True if libFLAC found. +# FLAC_DEFINITIONS - FLAC compile definitons + +if (FLAC_INCLUDE_DIR) + # Already in cache, be silent + set (FLAC_FIND_QUIETLY TRUE) +endif () + +find_package (Ogg QUIET) + +find_package (PkgConfig QUIET) +pkg_check_modules(PC_FLAC QUIET flac) + +set(FLAC_VERSION ${PC_FLAC_VERSION}) + +find_path (FLAC_INCLUDE_DIR FLAC/stream_decoder.h + HINTS + ${PC_FLAC_INCLUDEDIR} + ${PC_FLAC_INCLUDE_DIRS} + ${FLAC_ROOT} + ) + +# MSVC built libraries can name them *_static, which is good as it +# distinguishes import libraries from static libraries with the same extension. +find_library (FLAC_LIBRARY + NAMES + FLAC + libFLAC + libFLAC_dynamic + libFLAC_static + HINTS + ${PC_FLAC_LIBDIR} + ${PC_FLAC_LIBRARY_DIRS} + ${FLAC_ROOT} + ) + +# Handle the QUIETLY and REQUIRED arguments and set FLAC_FOUND to TRUE if +# all listed variables are TRUE. +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (FLAC + REQUIRED_VARS + FLAC_LIBRARY + FLAC_INCLUDE_DIR + OGG_FOUND + VERSION_VAR + FLAC_VERSION + ) + +if (FLAC_FOUND) + set (FLAC_INCLUDE_DIRS ${FLAC_INCLUDE_DIR}) + set (FLAC_LIBRARIES ${FLAC_LIBRARY} ${OGG_LIBRARIES}) + if (NOT TARGET FLAC::FLAC) + add_library(FLAC::FLAC UNKNOWN IMPORTED) + set_target_properties(FLAC::FLAC PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE_DIR}" + IMPORTED_LOCATION "${FLAC_LIBRARY}" + INTERFACE_LINK_LIBRARIES Ogg::ogg + ) + endif () +endif () + +mark_as_advanced(FLAC_INCLUDE_DIR FLAC_LIBRARY) diff --git a/lib-src/libsndfile/cmake/FindOgg.cmake b/lib-src/libsndfile/cmake/FindOgg.cmake new file mode 100644 index 000000000..9cf5ce430 --- /dev/null +++ b/lib-src/libsndfile/cmake/FindOgg.cmake @@ -0,0 +1,61 @@ +# - Find ogg +# Find the native ogg includes and libraries +# +# OGG_INCLUDE_DIRS - where to find ogg.h, etc. +# OGG_LIBRARIES - List of libraries when using ogg. +# OGG_FOUND - True if ogg found. + +if (OGG_INCLUDE_DIR) + # Already in cache, be silent + set(OGG_FIND_QUIETLY TRUE) +endif () + +find_package (PkgConfig QUIET) +pkg_check_modules (PC_OGG QUIET ogg>=1.3.0) + +set (OGG_VERSION ${PC_OGG_VERSION}) + +find_path (OGG_INCLUDE_DIR ogg/ogg.h + HINTS + ${PC_OGG_INCLUDEDIR} + ${PC_OGG_INCLUDE_DIRS} + ${OGG_ROOT} + ) +# MSVC built ogg may be named ogg_static. +# The provided project files name the library with the lib prefix. +find_library (OGG_LIBRARY + NAMES + ogg + ogg_static + libogg + libogg_static + HINTS + ${PC_OGG_LIBDIR} + ${PC_OGG_LIBRARY_DIRS} + ${OGG_ROOT} + ) +# Handle the QUIETLY and REQUIRED arguments and set OGG_FOUND +# to TRUE if all listed variables are TRUE. +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (Ogg + REQUIRED_VARS + OGG_LIBRARY + OGG_INCLUDE_DIR + VERSION_VAR + OGG_VERSION + ) + +if (OGG_FOUND) + set (OGG_LIBRARIES ${OGG_LIBRARY}) + set (OGG_INCLUDE_DIRS ${OGG_INCLUDE_DIR}) + + if(NOT TARGET Ogg::ogg) + add_library(Ogg::ogg UNKNOWN IMPORTED) + set_target_properties(Ogg::ogg PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIRS}" + IMPORTED_LOCATION "${OGG_LIBRARIES}" + ) + endif () +endif () + +mark_as_advanced (OGG_INCLUDE_DIR OGG_LIBRARY) diff --git a/lib-src/libsndfile/cmake/FindOpus.cmake b/lib-src/libsndfile/cmake/FindOpus.cmake new file mode 100644 index 000000000..a83686bdd --- /dev/null +++ b/lib-src/libsndfile/cmake/FindOpus.cmake @@ -0,0 +1,67 @@ +# - Find opus +# Find the native opus includes and libraries +# +# OPUS_INCLUDE_DIRS - where to find opus.h, etc. +# OPUS_LIBRARIES - List of libraries when using opus. +# OPUS_FOUND - True if Opus found. + +if (OPUS_INCLUDE_DIR) + # Already in cache, be silent + set(OPUS_FIND_QUIETLY TRUE) +endif () + +find_package (Ogg QUIET) + +find_package (PkgConfig QUIET) +pkg_check_modules(PC_OPUS QUIET opus>=1.1) + +set (OPUS_VERSION ${PC_OPUS_VERSION}) + +find_path (OPUS_INCLUDE_DIR opus/opus.h + HINTS + ${PC_OPUS_INCLUDEDIR} + ${PC_OPUS_INCLUDE_DIRS} + ${OPUS_ROOT} + ) + +# MSVC built opus may be named opus_static. +# The provided project files name the library with the lib prefix. + +find_library (OPUS_LIBRARY + NAMES + opus + opus_static + libopus + libopus_static + HINTS + ${PC_OPUS_LIBDIR} + ${PC_OPUS_LIBRARY_DIRS} + ${OPUS_ROOT} + ) + +# Handle the QUIETLY and REQUIRED arguments and set OPUS_FOUND +# to TRUE if all listed variables are TRUE. +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args (Opus + REQUIRED_VARS + OPUS_LIBRARY + OPUS_INCLUDE_DIR + OGG_FOUND + VERSION_VAR + OPUS_VERSION + ) + +if (OPUS_FOUND) + set (OPUS_LIBRARIES ${OPUS_LIBRARY}) + set (OPUS_INCLUDE_DIRS ${OPUS_INCLUDE_DIR}) + + if (NOT TARGET Opus::opus) + add_library (Opus::opus UNKNOWN IMPORTED) + set_target_properties (Opus::opus PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${OPUS_INCLUDE_DIRS}" + IMPORTED_LOCATION "${OPUS_LIBRARIES}" + ) + endif () +endif () + +mark_as_advanced(OPUS_INCLUDE_DIR OPUS_LIBRARY) diff --git a/lib-src/libsndfile/cmake/FindSQLite3.cmake b/lib-src/libsndfile/cmake/FindSQLite3.cmake new file mode 100644 index 000000000..b5c0b571d --- /dev/null +++ b/lib-src/libsndfile/cmake/FindSQLite3.cmake @@ -0,0 +1,56 @@ +# - Find SQLITE3 +# Find the native SQLITE3 includes and libraries +# +# SQLITE3_INCLUDE_DIRS - where to find sqlite.h, etc. +# SQLITE3_LIBRARIES - List of libraries when using SQLITE3. +# SQLITE3_FOUND - True if SQLITE3 found. + +if (SQLITE3_INCLUDE_DIR) + # Already in cache, be silent + set (SQLITE3_FIND_QUIETLY TRUE) +endif () + +find_package (PkgConfig QUIET) +pkg_check_modules (PC_SQLITE3 QUIET sqlite3) + +set (SQLITE3_VERSION ${PC_SQLITE3_VERSION}) + +find_path (SQLITE3_INCLUDE_DIR sqlite3.h + HINTS + ${PC_SQLITE3_INCLUDEDIR} + ${PC_SQLITE3_INCLUDE_DIRS} + ${SQLITE3_ROOT} + ) + +find_library (SQLITE3_LIBRARY + NAMES + sqlite3 + HINTS + ${PC_SQLITE3_LIBDIR} + ${PC_SQLITE3_LIBRARY_DIRS} + ${SQLITE3_ROOT} + ) + +include (FindPackageHandleStandardArgs) + +find_package_handle_standard_args (SQLITE3 + REQUIRED_VARS + SQLITE3_LIBRARY + SQLITE3_INCLUDE_DIR + VERSION_VAR + SQLITE3_VERSION + ) + +if (SQLITE3_FOUND) + set (SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR}) + set (SQLITE3_LIBRARIES ${SQLITE3_LIBRARY}) + if (NOT TARGET SQLite3::SQLite3) + add_library (SQLite3::SQLite3 UNKNOWN IMPORTED) + set_target_properties (SQLite3::SQLite3 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SQLITE3_INCLUDE_DIRS}" + IMPORTED_LOCATION "${SQLITE3_LIBRARIES}" + ) + endif () +endif () + +mark_as_advanced (SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY) diff --git a/lib-src/libsndfile/cmake/FindSndio.cmake b/lib-src/libsndfile/cmake/FindSndio.cmake new file mode 100644 index 000000000..6b9b40986 --- /dev/null +++ b/lib-src/libsndfile/cmake/FindSndio.cmake @@ -0,0 +1,61 @@ +# - Find SoundIO (sndio) includes and libraries +# +# SNDIO_FOUND - True if SNDIO_INCLUDE_DIR & SNDIO_LIBRARY are +# found +# SNDIO_LIBRARIES - Set when SNDIO_LIBRARY is found +# SNDIO_INCLUDE_DIRS - Set when SNDIO_INCLUDE_DIR is found +# +# SNDIO_INCLUDE_DIR - where to find sndio.h, etc. +# SNDIO_LIBRARY - the sndio library +# + +if (SNDIO_INCLUDE_DIR) + # Already in cache, be silent + set (SNDIO_FIND_QUIETLY TRUE) +endif () + +find_package (PkgConfig QUIET) +pkg_check_modules (PC_SNDIO QUIET sndio) + +set (SNDIO_VERSION ${PC_SNDIO_VERSION}) + +find_path (SNDIO_INCLUDE_DIR + NAMES + sndio.h + HINTS + ${PC_SNDIO_INCLUDEDIR} + ${PC_SNDIO_INCLUDE_DIRS} + ${SNDIO_ROOT} + ) + +find_library (SNDIO_LIBRARY + NAMES + sndio + HINTS + ${PC_SNDIO_LIBDIR} + ${PC_SNDIO_LIBRARY_DIRS} + ${SNDIO_ROOT} + ) + +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (Sndio + REQUIRED_VARS + SNDIO_LIBRARY + SNDIO_INCLUDE_DIR + VERSION_VAR + SNDIO_VERSION + ) + +if (SNDIO_FOUND) + set (SNDIO_LIBRARIES ${SNDIO_LIBRARY}) + set (SNDIO_INCLUDE_DIRS ${SNDIO_INCLUDE_DIR}) + if (NOT TARGET Sndio::Sndio) + add_library (Sndio::Sndio UNKNOWN IMPORTED) + set_target_properties (Sndio::Sndio PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SNDIO_INCLUDE_DIRS}" + IMPORTED_LOCATION "${SNDIO_LIBRARIES}" + ) + endif() +endif() + +mark_as_advanced (SNDIO_INCLUDE_DIR SNDIO_LIBRARY) diff --git a/lib-src/libsndfile/cmake/FindSpeex.cmake b/lib-src/libsndfile/cmake/FindSpeex.cmake new file mode 100644 index 000000000..c28fe60cb --- /dev/null +++ b/lib-src/libsndfile/cmake/FindSpeex.cmake @@ -0,0 +1,55 @@ +# - Find Speex +# Find the native Speex includes and libraries +# +# SPEEX_INCLUDE_DIRS - where to find speex.h, etc. +# SPEEX_LIBRARIES - List of libraries when using Speex. +# SPEEX_FOUND - True if Speex found. + +if (SPEEX_INCLUDE_DIR) + set (SPEEX_FIND_QUIETLY TRUE) +endif () + +find_package (PkgConfig QUIET) +pkg_check_modules (PC_SPEEX QUIET speex) + +set (SPEEX_VERSION ${PC_SPEEX_VERSION}) + +find_path (SPEEX_INCLUDE_DIR speex/speex.h + HINTS + ${PC_SPEEX_INCLUDEDIR} + ${PC_SPEEX_INCLUDE_DIRS} + ${SPEEX_ROOT} + ) +find_library (SPEEX_LIBRARY + NAMES + speex + libspeex + HINTS + ${PC_SPEEX_LIBDIR} + ${PC_SPEEX_LIBRARY_DIRS} + ${SPEEX_ROOT} + ) + +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (Speex + REQUIRED_VARS + SPEEX_LIBRARY + SPEEX_INCLUDE_DIR + VERSION_VAR + SPEEX_VERSION + ) + +if (SPEEX_FOUND) + set (SPEEX_LIBRARIES ${SPEEX_LIBRARY}) + set (SPEEX_INCLUDE_DIRS ${SPEEX_INCLUDE_DIR}) + + if (NOT TARGET Speex::Speex) + add_library (Speex::Speex UNKNOWN IMPORTED) + set_target_properties (Speex::Speex PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${SPEEX_INCLUDE_DIRS}" + IMPORTED_LOCATION "${SPEEX_LIBRARIES}" + ) + endif () +endif () + +mark_as_advanced (SPEEX_INCLUDE_DIR SPEEX_LIBRARY) diff --git a/lib-src/libsndfile/cmake/FindVorbis.cmake b/lib-src/libsndfile/cmake/FindVorbis.cmake new file mode 100644 index 000000000..55bd862aa --- /dev/null +++ b/lib-src/libsndfile/cmake/FindVorbis.cmake @@ -0,0 +1,64 @@ +# - Find vorbisenc +# Find the native vorbisenc includes and libraries +# +# VORBIS_INCLUDE_DIRS - where to find vorbis.h, etc. +# VORBIS_LIBRARIES - List of libraries when using vorbis. +# VORBIS_FOUND - True if vorbis found. + +if (VORBIS_INCLUDE_DIR) + # Already in cache, be silent + set (VORBIS_FIND_QUIETLY TRUE) +endif () + +find_package (Ogg QUIET) + +find_package (PkgConfig QUIET) +pkg_check_modules (PC_VORBIS QUIET vorbis) + +set (VORBIS_VERSION ${PC_VORBIS_VERSION}) + +find_path (VORBIS_INCLUDE_DIR vorbis/codec.h + HINTS + ${PC_VORBIS_INCLUDEDIR} + ${PC_VORBIS_INCLUDE_DIRS} + ${VORBIS_ROOT} + ) + +find_library (VORBIS_LIBRARY + NAMES + vorbis + vorbis_static + libvorbis + libvorbis_static + HINTS + ${PC_VORBIS_LIBDIR} + ${PC_VORBIS_LIBRARY_DIRS} + ${VORBIS_ROOT} + ) + +# Handle the QUIETLY and REQUIRED arguments and set VORBIS_FOUND +# to TRUE if all listed variables are TRUE. +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (Vorbis + REQUIRED_VARS + VORBIS_LIBRARY + VORBIS_INCLUDE_DIR + OGG_FOUND + VERSION_VAR + VORBIS_VERSION + ) + +if (VORBIS_FOUND) + set (VORBIS_INCLUDE_DIRS ${VORBIS_INCLUDE_DIR}) + set (VORBIS_LIBRARIES ${VORBIS_LIBRARY} ${OGG_LIBRARIES}) + if (NOT TARGET Vorbis::Vorbis) + add_library (Vorbis::Vorbis UNKNOWN IMPORTED) + set_target_properties (Vorbis::Vorbis PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${VORBIS_INCLUDE_DIR}" + IMPORTED_LOCATION "${VORBIS_LIBRARY}" + INTERFACE_LINK_LIBRARIES Ogg::ogg + ) + endif () +endif () + +mark_as_advanced (VORBIS_INCLUDE_DIR VORBIS_LIBRARY) diff --git a/lib-src/libsndfile/cmake/FindVorbisEnc.cmake b/lib-src/libsndfile/cmake/FindVorbisEnc.cmake new file mode 100644 index 000000000..87240d121 --- /dev/null +++ b/lib-src/libsndfile/cmake/FindVorbisEnc.cmake @@ -0,0 +1,64 @@ +# - Find vorbisenc +# Find the native vorbisenc includes and libraries +# +# VORBISENC_INCLUDE_DIRS - where to find vorbisenc.h, etc. +# VORBISENC_LIBRARIES - List of libraries when using vorbisenc. +# VORBISENC_FOUND - True if vorbisenc found. + +if (VORBISENC_INCLUDE_DIR) + # Already in cache, be silent + set (VORBISENC_FIND_QUIETLY TRUE) +endif () + +find_package (Vorbis QUIET) + +find_package (PkgConfig QUIET) +pkg_check_modules (PC_VORBISENC QUIET vorbisenc) + +set (VORBISENC_VERSION ${PC_VORBISENC_VERSION}) + +find_path (VORBISENC_INCLUDE_DIR vorbis/vorbisenc.h + HINTS + ${PC_VORBISENC_INCLUDEDIR} + ${PC_VORBISENC_INCLUDE_DIRS} + ${VORBISENC_ROOT} + ) + +find_library (VORBISENC_LIBRARY + NAMES + vorbisenc + vorbisenc_static + libvorbisenc + libvorbisenc_static + HINTS + ${PC_VORBISENC_LIBDIR} + ${PC_VORBISENC_LIBRARY_DIRS} + ${VORBISENC_ROOT} + ) + +# Handle the QUIETLY and REQUIRED arguments and set VORBISENC_FOUND +# to TRUE if all listed variables are TRUE. +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (VorbisEnc + REQUIRED_VARS + VORBISENC_LIBRARY + VORBISENC_INCLUDE_DIR + VORBIS_FOUND + VERSION_VAR + VORBISENC_VERSION + ) + +if (VORBISENC_FOUND) + set (VORBISENC_INCLUDE_DIRS ${VORBISENC_INCLUDE_DIR}) + set (VORBISENC_LIBRARIES ${VORBISENC_LIBRARY} ${VORBIS_LIBRARIES}) + if (NOT TARGET Vorbis::VorbisEnc) + add_library (Vorbis::VorbisEnc UNKNOWN IMPORTED) + set_target_properties (Vorbis::VorbisEnc PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${VORBISENC_INCLUDE_DIR}" + IMPORTED_LOCATION "${VORBISENC_LIBRARY}" + INTERFACE_LINK_LIBRARIES Vorbis::Vorbis + ) + endif () +endif () + +mark_as_advanced (VORBISENC_INCLUDE_DIR VORBISENC_LIBRARY) diff --git a/lib-src/libsndfile/cmake/SndFileChecks.cmake b/lib-src/libsndfile/cmake/SndFileChecks.cmake new file mode 100644 index 000000000..37234b80d --- /dev/null +++ b/lib-src/libsndfile/cmake/SndFileChecks.cmake @@ -0,0 +1,241 @@ +include (CheckFunctionExists) +include (CheckIncludeFile) +include (CheckLibraryExists) +include (CheckSymbolExists) +include (CheckTypeSize) +include (TestBigEndian) + +include (TestInline) +include (ClipMode) +include(TestLargeFiles) + +test_large_files (_LARGEFILES) + +if (LARGE_FILES_DEFINITIONS) + add_definitions(${LARGE_FILES_DEFINITIONS}) +endif () + +if (WIN32) + set(TYPEOF_SF_COUNT_T __int64) +else () + set(TYPEOF_SF_COUNT_T int64_t) +endif () +set (SF_COUNT_MAX 0x7fffffffffffffffll) + +if (NOT WIN32) + find_package (ALSA) + find_package (Sndio) +endif () + +find_package(Ogg 1.3) +find_package (VorbisEnc) +find_package (FLAC) +find_package (Opus) +if (VORBIS_FOUND AND FLAC_FOUND AND OPUS_FOUND) + set (HAVE_EXTERNAL_XIPH_LIBS 1) +else () + set (HAVE_EXTERNAL_XIPH_LIBS 0) +endif () + +find_package (Speex) +find_package (SQLite3) + +check_include_file (byteswap.h HAVE_BYTESWAP_H) +check_include_file (dlfcn.h HAVE_DLFCN_H) +check_include_file (direct.h HAVE_DIRECT_H) +check_include_file (endian.h HAVE_ENDIAN_H) +check_include_file (inttypes.h HAVE_INTTYPES_H) +check_include_file (io.h HAVE_IO_H) +check_include_file (stdint.h HAVE_STDINT_H) +check_include_file (sys/time.h HAVE_SYS_TIME_H) +check_include_file (sys/types.h HAVE_SYS_TYPES_H) +check_include_file (unistd.h HAVE_UNISTD_H) + +# Never checked +# check_include_file (stdlib.h HAVE_STDLIB_H) +# check_include_file (string.h HAVE_STRING_H) +# check_include_file (strings.h HAVE_STRINGS_H) +# check_include_file (sys/stat.h HAVE_SYS_STAT_H) +# check_include_file (memory.h HAVE_MEMORY_H) + +if (BUILD_TESTING) + check_include_file (locale.h HAVE_LOCALE_H) + check_include_file (sys/wait.h HAVE_SYS_WAIT_H) +endif () + +check_type_size (int64_t SIZEOF_INT64_T) +check_type_size (long SIZEOF_LONG) +check_type_size (long\ long SIZEOF_LONG_LONG) +check_type_size (ssize_t SIZEOF_SSIZE_T) +check_type_size (wchar_t SIZEOF_WCHAR_T) + +# Never used +# check_type_size (loff_t SIZEOF_LOFF_T) +# check_type_size (offt64_t SIZEOF_OFF64_T) + +# Never checked +# check_type_size (size_t SIZEOF_SIZE_T) + +# Used in configre.ac +# check_type_size (double SIZEOF_DOUBLE) +# check_type_size (float SIZEOF_FLOAT) +# check_type_size (int SIZEOF_INT) +# check_type_size (short SIZEOF_SHORT) + +if (ENABLE_TESTING) + check_type_size (void* SIZEOF_VOIDP) +endif() + +if ((SIZEOF_OFF_T EQUAL 8) OR (SIZEOF_LOFF_T EQUAL 8) OR (SIZEOF_OFF64_T EQUAL 8)) + set (TYPEOF_SF_COUNT_T "int64_t") + set (SF_COUNT_MAX "0x7FFFFFFFFFFFFFFFLL") + set (SIZEOF_SF_COUNT_T 8) +else () + if (WIN32) + set (TYPEOF_SF_COUNT_T "__int64") + set (SF_COUNT_MAX "0x7FFFFFFFFFFFFFFFLL") + set (SIZEOF_SF_COUNT_T 8) + else () + message ("") + message ("*** The configure process has determined that this system is capable") + message ("*** of Large File Support but has not been able to find a type which") + message ("*** is an unambiguous 64 bit file offset.") + message ("*** Please contact the author to help resolve this problem.") + message ("") + message (FATAL_ERROR "Bad file offset type.") + endif () +endif () + +check_type_size (${TYPEOF_SF_COUNT_T} SIZEOF_SF_COUNT_T) + +if (NOT WIN32) + check_library_exists (m floor "" LIBM_REQUIRED) + if (LIBM_REQUIRED) + list (APPEND CMAKE_REQUIRED_LIBRARIES m) + endif () +endif () + +check_library_exists (sqlite3 sqlite3_close "" HAVE_SQLITE3) + +check_function_exists (fstat HAVE_FSTAT) +check_function_exists (fstat64 HAVE_FSTAT64) +check_function_exists (gettimeofday HAVE_GETTIMEOFDAY) +check_function_exists (gmtime HAVE_GMTIME) +check_function_exists (gmtime_r HAVE_GMTIME_R) +check_function_exists (localtime HAVE_LOCALTIME) +check_function_exists (localtime_r HAVE_LOCALTIME_R) +check_function_exists (lseek HAVE_LSEEK) +check_function_exists (open HAVE_OPEN) +check_function_exists (read HAVE_READ) +check_function_exists (write HAVE_WRITE) +check_function_exists (lrint HAVE_LRINT) +check_function_exists (lrintf HAVE_LRINTF) + +if (NOT WIN32) + check_function_exists (ftruncate HAVE_FTRUNCATE) + check_function_exists (fsync HAVE_FSYNC) +endif () + +if (BUILD_TESTING) + check_function_exists (pipe HAVE_PIPE) + check_function_exists (setlocale HAVE_SETLOCALE) + check_function_exists (waitpid HAVE_WAITPID) +endif () + +# Never checked +# check_function_exists (calloc HAVE_CALLOC) +# check_function_exists (free HAVE_FREE) +# check_function_exists (getpagesize HAVE_GETPAGESIZE) +# check_function_exists (malloc HAVE_MALLOC) +# check_function_exists (realloc HAVE_REALLOC) +# check_function_exists (snprintf HAVE_SNPRINTF) +# check_function_exists (vsnprintf HAVE_VSNPRINTF) +# check_function_exists (floor HAVE_FLOOR) +# check_function_exists (fmod HAVE_FMOD) + +# Never used +# check_function_exists (mmap HAVE_MMAP) +# check_function_exists (ceil HAVE_CEIL) +# check_function_exists (lround HAVE_LROUND) +# check_function_exists (lseek64 HAVE_LSEEK64) + + +check_symbol_exists (S_IRGRP sys/stat.h HAVE_DECL_S_IRGRP) + +test_big_endian (WORDS_BIGENDIAN) +if (WORDS_BIGENDIAN) + set (CPU_IS_BIG_ENDIAN 1) +else () + set (CPU_IS_LITTLE_ENDIAN 1) +endif () + +if (WIN32) + set (OS_IS_WIN32 1) + set (USE_WINDOWS_API 1) + if (BUILD_SHARED_LIBS) + set (WIN32_TARGET_DLL 1) + endif () + if (MINGW) + add_definitions (-D__USE_MINGW_ANSI_STDIO=1) + endif () +endif () + +if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set (OS_IS_OPENBSD 1) +endif () + + +if (CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang")) + set (COMPILER_IS_GCC 1) +endif () + +test_inline () +clip_mode () + +if (MSVC) + add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) +endif (MSVC) + +if (ENABLE_STATIC_RUNTIME) + if (MSVC) + foreach (flag_var + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO + ) + if (${flag_var} MATCHES "/MD") + string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif () + endforeach (flag_var) + endif (MSVC) + if (MINGW) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") + set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static-libgcc -s") + set (CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} -static-libgcc -static-libstdc++ -s") + endif (MINGW) +elseif (NOT ENABLE_STATIC_RUNTIME) + if (MSVC) + foreach (flag_var + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO + ) + if (${flag_var} MATCHES "/MT") + string (REGEX REPLACE "/MT" "/MD" ${flag_var} "${${flag_var}}") + endif (${flag_var} MATCHES "/MT") + endforeach (flag_var) + endif () + if (MINGW) + set (CMAKE_C_FLAGS "") + set (CMAKE_CXX_FLAGS "") + set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") + set (CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") + endif () +endif ( ) + +if (BUILD_SHARED_LIBS) + find_package (PythonInterp REQUIRED) +endif() diff --git a/lib-src/libsndfile/cmake/SndFileConfig.cmake.in b/lib-src/libsndfile/cmake/SndFileConfig.cmake.in new file mode 100644 index 000000000..976428807 --- /dev/null +++ b/lib-src/libsndfile/cmake/SndFileConfig.cmake.in @@ -0,0 +1,30 @@ +set(SndFile_VERSION @PROJECT_VERSION@) +set(SndFile_VERSION_MAJOR @PROJECT_VERSION_MAJOR@) +set(SndFile_VERSION_MINOR @PROJECT_VERSION_MINOR@) +set(SndFile_VERSION_PATCH @PROJECT_VERSION_PATCH@) + +set (SndFile_WITH_EXTERNAL_LIBS @SndFile_WITH_EXTERNAL_LIBS@) + +@PACKAGE_INIT@ + +include (CMakeFindDependencyMacro) + +find_dependency (Ogg 1.3) +find_dependency (VorbisEnc) +find_dependency (FLAC) +find_dependency (Opus) + +include (${CMAKE_CURRENT_LIST_DIR}/SndFileTargets.cmake) + +set_and_check (SndFile_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +set (SNDFILE_INCLUDE_DIR ${SndFile_INCLUDE_DIR}) + +set (SndFile_LIBRARY SndFile::sndfile) +set (SNDFILE_LIBRARY SndFile::sndfile) +set (SndFile_LIBRARIES SndFile::sndfile) +set (SNDFILE_LIBRARIES SndFile::sndfile) + + +check_required_components(SndFile) + +set (SNDFILE_FOUND 1) diff --git a/lib-src/libsndfile/cmake/TestInline.c.in b/lib-src/libsndfile/cmake/TestInline.c.in new file mode 100644 index 000000000..2aed64334 --- /dev/null +++ b/lib-src/libsndfile/cmake/TestInline.c.in @@ -0,0 +1,10 @@ +static @INLINE_KEYWORD@ void test_inline(void) +{ + return; +} + +int main (void) +{ + test_inline (); + return 0; +} diff --git a/lib-src/libsndfile/cmake/TestInline.cmake b/lib-src/libsndfile/cmake/TestInline.cmake new file mode 100644 index 000000000..ef15c0785 --- /dev/null +++ b/lib-src/libsndfile/cmake/TestInline.cmake @@ -0,0 +1,54 @@ +macro (TEST_INLINE) + if (NOT DEFINED INLINE_CODE) + message (STATUS "Checking for inline...") + set (INLINE_KEYWORD "inline") + configure_file (cmake/TestInline.c.in ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/TestInline.c) + try_compile (HAVE_INLINE "${CMAKE_CURRENT_BINARY_DIR}" + "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/TestInline.c") + if (HAVE_INLINE) + message (STATUS "Checking for inline... supported") + else () + message (STATUS "Checking for inline... not supported") + + message (STATUS "Checking for __inline...") + set (INLINE_KEYWORD "__inline") + configure_file (cmake/TestInline.c.in ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/TestInline.c) + try_compile (HAVE___INLINE "${CMAKE_CURRENT_BINARY_DIR}" + "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/TestInline.c") + if (HAVE___INLINE) + message (STATUS "Checking for __inline... supported") + else () + message (STATUS "Checking for __inline... not supported") + + message (STATUS "Checking for __inline__...") + set (INLINE_KEYWORD "__inline__") + configure_file (cmake/TestInline.c.in ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/TestInline.c) + try_compile (HAVE___INLINE "${CMAKE_CURRENT_BINARY_DIR}" + "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/TestInline.c") + if (HAVE___INLINE) + message (STATUS "Checking for __inline__... supported") + + message (STATUS "Checking for __inline__...") + set (INLINE_KEYWORD "__inline__") + configure_file (cmake/TestInline.c.in ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/cmake/TestInline.c) + try_compile (HAVE___INLINE__ "${CMAKE_CURRENT_BINARY_DIR}" + "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/TestInline.c") + else () + message (STATUS "Checking for __inline__... not supported") + set (INLINE_KEYWORD "") + endif () + + endif () + endif () + + if (HAVE_INLINE) + set (INLINE_CODE "/* #undef inline */" CACHE INTERNAL "") + elseif (HAVE___INLINE) + set (INLINE_CODE "#define inline __inline" CACHE INTERNAL "") + elseif (HAVE___INLINE__) + set (INLINE_CODE "#define inline __inline__" CACHE INTERNAL "") + else () + set (INLINE_CODE "#define inline " CACHE INTERNAL "") + endif () + endif () +endmacro (TEST_INLINE) diff --git a/lib-src/libsndfile/cmake/TestLargeFiles.cmake b/lib-src/libsndfile/cmake/TestLargeFiles.cmake new file mode 100644 index 000000000..075407b4a --- /dev/null +++ b/lib-src/libsndfile/cmake/TestLargeFiles.cmake @@ -0,0 +1,121 @@ +include (CheckIncludeFile) +include (CheckTypeSize) +include (CMakePushCheckState) + +macro (TEST_LARGE_FILES VARIABLE) + +if (NOT DEFINED ${VARIABLE}) + + cmake_push_check_state() + + message (STATUS "") + message (STATUS "") + message (STATUS "Checking large files support...") + + if (WIN32) + set (${VARIABLE} 1 CACHE INTERNAL "Result of tests for large file support" FORCE) + message (STATUS "") + message (STATUS "Result of checking large files support: supported with WinAPI") + else () + + message (STATUS "") + check_include_file(sys/types.h HAVE_SYS_TYPES_H) + check_include_file(stdint.h HAVE_STDINT_H) + check_include_file(stddef.h HAVE_STDDEF_H) + message (STATUS "") + + message (STATUS "Checking size of off_t without any definitions:") + check_type_size (off_t SIZEOF_OFF_T) + message (STATUS "Checking of off_t without any definitions: ${SIZEOF_OFF_T}") + if (SIZEOF_OFF_T EQUAL 8) + set (LARGE_FILES_DEFINITIONS "" CACHE INTERNAL "64-bit off_t required definitions") + set (FILE64 TRUE) + else () + unset (HAVE_SIZEOF_OFF_T CACHE) + unset (SIZEOF_OFF_T CACHE) + unset (SIZEOF_OFF_T_CODE CACHE) + cmake_pop_check_state() + set (FILE64 FALSE) + endif () + + if (NOT FILE64) + set (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} /D_FILE_OFFSET_BITS=64) + message (STATUS "") + message (STATUS "Checking size of off_t with _FILE_OFFSET_BITS=64:") + check_type_size (off_t SIZEOF_OFF_T) + message (STATUS "Checking size of off_t with _FILE_OFFSET_BITS=64: ${SIZEOF_OFF_T}") + if (SIZEOF_OFF_T EQUAL 8) + set (_FILE_OFFSET_BITS 64 CACHE INTERNAL "") + set (_FILE_OFFSET_BITS_CODE "#define _FILE_OFFSET_BITS 64" CACHE INTERNAL "") + set (LARGE_FILES_DEFINITIONS ${LARGE_FILES_DEFINITIONS} "/D_FILE_OFFSET_BITS=64" CACHE INTERNAL "64-bit off_t required definitions") + set (FILE64 TRUE) + else () + set (_FILE_OFFSET_BITS_CODE "" CACHE INTERNAL "") + unset (HAVE_SIZEOF_OFF_T CACHE) + unset (SIZEOF_OFF_T CACHE) + unset (SIZEOF_OFF_T_CODE CACHE) + cmake_pop_check_state() + set (FILE64 FALSE) + endif () + endif () + + if (NOT FILE64) + set (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} /D_LARGE_FILES) + message (STATUS "") + message (STATUS "Checking size of off_t with _LARGE_FILES:") + check_type_size (off_t SIZEOF_OFF_T) + message (STATUS "Checking size of off_t with _LARGE_FILES: ${SIZEOF_OFF_T}") + if (SIZEOF_OFF_T EQUAL 8) + set (_LARGE_FILES 1 CACHE INTERNAL "") + set (LARGE_FILES_DEFINITIONS ${LARGE_FILES_DEFINITIONS} "/D_LARGE_FILES" CACHE INTERNAL "64-bit off_t required definitions") + set (FILE64 TRUE) + else () + unset (HAVE_SIZEOF_OFF_T CACHE) + unset (SIZEOF_OFF_T CACHE) + unset (SIZEOF_OFF_T_CODE CACHE) + cmake_pop_check_state() + set (FILE64 FALSE) + endif () + endif () + + if (NOT FILE64) + set (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} /D_LARGEFILE_SOURCE) + unset (HAVE_SIZEOF_OFF_T CACHE) + unset (SIZEOF_OFF_T CACHE) + unset (SIZEOF_OFF_T_CODE CACHE) + message (STATUS "") + message (STATUS "Checking size of off_t with _LARGEFILE_SOURCE:") + check_type_size (off_t SIZEOF_OFF_T) + message (STATUS "Checking size of off_t with _LARGEFILE_SOURCE: ${SIZEOF_OFF_T}") + if (SIZEOF_OFF_T EQUAL 8) + set (_LARGEFILE_SOURCE 1 CACHE INTERNAL "") + set (LARGE_FILES_DEFINITIONS ${LARGE_FILES_DEFINITIONS} "/D_LARGEFILE_SOURCE" CACHE INTERNAL "64-bit off_t required definitions") + set (FILE64 TRUE) + else () + cmake_pop_check_state() + set (FILE64 FALSE) + endif () + endif () + + message (STATUS "") + if (FILE64) + set (${VARIABLE} 1 CACHE INTERNAL "Result of tests for large file support" FORCE) + if (NOT SIZEOF_OFF_T_REQURED_DEFINITIONS) + message (STATUS "Result of checking large files support: supported") + else () + message (STATUS "Result of checking large files support: supported with ${LARGE_FILES_DEFINITIONS}") + message (STATUS "Add LARGE_FILES_DEFINITIONS to your compiler definitions or configure with _FILE_OFFSET_BITS,") + message (STATUS "_FILE_OFFSET_BITS_CODE, _LARGE_FILES and _LARGEFILE_SOURCE variables.") + endif () + else () + message ("Result of checking large files support: not supported") + set (${VARIABLE} 0 CACHE INTERNAL "Result of test for large file support" FORCE) + endif () + message ("") + message ("") + + endif () + +endif (NOT DEFINED ${VARIABLE}) + +endmacro (TEST_LARGE_FILES VARIABLE) diff --git a/lib-src/libsndfile/configure b/lib-src/libsndfile/configure deleted file mode 100755 index eded70673..000000000 --- a/lib-src/libsndfile/configure +++ /dev/null @@ -1,22411 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libsndfile 1.0.24. -# -# Report bugs to . -# -# -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -# -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1 - - test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes -else - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi - done;; - esac - as_found=false -done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } -IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 -fi - - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: sndfile@mega-nerd.com about your system, including any -$0: error possibly output before this message. Then install -$0: a modern shell, or manually run the script under such a -$0: shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -SHELL=${CONFIG_SHELL-/bin/sh} - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME='libsndfile' -PACKAGE_TARNAME='libsndfile' -PACKAGE_VERSION='1.0.24' -PACKAGE_STRING='libsndfile 1.0.24' -PACKAGE_BUGREPORT='sndfile@mega-nerd.com' -PACKAGE_URL='http://www.mega-nerd.com/libsndfile/' - -ac_unique_file="src/sndfile.c" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='am__EXEEXT_FALSE -am__EXEEXT_TRUE -LTLIBOBJS -LIBOBJS -LIBTOOL_DEPS -EXTERNAL_LIBS -EXTERNAL_CFLAGS -SNDIO_LIBS -ALSA_LIBS -OS_SPECIFIC_LINKS -OS_SPECIFIC_CFLAGS -WIN_RC_VERSION -CLEAN_VERSION -SHARED_VERSION_INFO -SHLIB_VERSION_ARG -HTML_FGCOLOUR -HTML_BGCOLOUR -htmldocdir -HOST_TRIPLET -GCC_MINOR_VERSION -GCC_MAJOR_VERSION -GCC_VERSION -USE_WIN_VERSION_FILE_FALSE -USE_WIN_VERSION_FILE_TRUE -SQLITE3_LIBS -SQLITE3_CFLAGS -VORBISENC_LIBS -VORBISENC_CFLAGS -VORBIS_LIBS -VORBIS_CFLAGS -OGG_LIBS -OGG_CFLAGS -FLAC_LIBS -FLAC_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG -OCTAVE_DEST_MDIR -OCTAVE_DEST_ODIR -OCTAVE_CONFIG_VERSION -OCTAVE_CONFIG -HAVE_OCTAVE_CONFIG -MKOCTFILE_VERSION -MKOCTFILE -HAVE_MKOCTFILE -OCTAVE -OCTAVE_VERSION -HAVE_OCTAVE -BUILD_OCTAVE_MOD_FALSE -BUILD_OCTAVE_MOD_TRUE -SF_COUNT_MAX -SIZEOF_SF_COUNT_T -TYPEOF_SF_COUNT_T -GETCONF -ENABLE_TEST_COVERAGE_FALSE -ENABLE_TEST_COVERAGE_TRUE -LINUX_MINGW_CROSS_TEST_FALSE -LINUX_MINGW_CROSS_TEST_TRUE -HAVE_WINE -HAVE_AUTOGEN -RC -CXXCPP -CPP -OTOOL64 -OTOOL -LIPO -NMEDIT -DSYMUTIL -MANIFEST_TOOL -RANLIB -ac_ct_AR -AR -DLLTOOL -OBJDUMP -LN_S -NM -ac_ct_DUMPBIN -DUMPBIN -LD -FGREP -EGREP -GREP -LIBTOOL -SED -am__fastdepCXX_FALSE -am__fastdepCXX_TRUE -CXXDEPMODE -ac_ct_CXX -CXXFLAGS -CXX -am__fastdepCC_FALSE -am__fastdepCC_TRUE -CCDEPMODE -am__nodep -AMDEPBACKSLASH -AMDEP_FALSE -AMDEP_TRUE -am__quote -am__include -DEPDIR -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE -AM_BACKSLASH -AM_DEFAULT_VERBOSITY -AM_DEFAULT_V -AM_V -am__untar -am__tar -AMTAR -am__leading_dot -SET_MAKE -AWK -mkdir_p -MKDIR_P -INSTALL_STRIP_PROGRAM -STRIP -install_sh -MAKEINFO -AUTOHEADER -AUTOMAKE -AUTOCONF -ACLOCAL -VERSION -PACKAGE -CYGPATH_W -am__isrc -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -target_os -target_vendor -target_cpu -target -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_silent_rules -enable_maintainer_mode -enable_dependency_tracking -enable_shared -enable_static -with_pic -enable_fast_install -with_gnu_ld -with_sysroot -enable_libtool_lock -enable_experimental -enable_gcc_werror -enable_gcc_pipe -enable_gcc_opt -enable_cpu_clip -enable_bow_docs -enable_sqlite -enable_alsa -enable_external_libs -enable_octave -enable_test_coverage -enable_largefile -with_octave -with_mkoctfile -with_octave_config -' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CXX -CXXFLAGS -CCC -CPP -CXXCPP -PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR -FLAC_CFLAGS -FLAC_LIBS -OGG_CFLAGS -OGG_LIBS -VORBIS_CFLAGS -VORBIS_LIBS -VORBISENC_CFLAGS -VORBISENC_LIBS -SQLITE3_CFLAGS -SQLITE3_LIBS' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures libsndfile 1.0.24 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/libsndfile] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of libsndfile 1.0.24:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: "make V=1") - --disable-silent-rules verbose build output (undo: "make V=0") - --enable-maintainer-mode - enable make rules and dependencies not useful (and - sometimes confusing) to the casual installer - --enable-dependency-tracking - do not reject slow dependency extractors - --disable-dependency-tracking - speeds up one-time build - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-experimental enable experimental code - --enable-gcc-werror enable -Werror in all Makefiles - --disable-gcc-pipe disable gcc -pipe option - --disable-gcc-opt disable gcc optimisations - --disable-cpu-clip disable tricky cpu specific clipper - --enable-bow-docs enable black-on-white html docs - --disable-sqlite disable use of sqlite - --disable-alsa disable use of ALSA - --disable-external-libs disable use of FLAC, Ogg and Vorbis [[default=no]] - --enable-octave disable building of GNU Octave module - --enable-test-coverage enable test coverage - --disable-largefile omit support for large files - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). - --with-octave choose the octave version - --with-mkoctfile choose the mkoctfile version - --with-octave-config choose the octave-config version - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CPP C preprocessor - CXXCPP C++ preprocessor - PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path - FLAC_CFLAGS C compiler flags for FLAC, overriding pkg-config - FLAC_LIBS linker flags for FLAC, overriding pkg-config - OGG_CFLAGS C compiler flags for OGG, overriding pkg-config - OGG_LIBS linker flags for OGG, overriding pkg-config - VORBIS_CFLAGS - C compiler flags for VORBIS, overriding pkg-config - VORBIS_LIBS linker flags for VORBIS, overriding pkg-config - VORBISENC_CFLAGS - C compiler flags for VORBISENC, overriding pkg-config - VORBISENC_LIBS - linker flags for VORBISENC, overriding pkg-config - SQLITE3_CFLAGS - C compiler flags for SQLITE3, overriding pkg-config - SQLITE3_LIBS - linker flags for SQLITE3, overriding pkg-config - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -libsndfile home page: . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -libsndfile configure 1.0.24 -generated by GNU Autoconf 2.69 - -Copyright (C) 2012 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_compile - -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - -# ac_fn_cxx_try_cpp LINENO -# ------------------------ -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_cpp - -# ac_fn_cxx_try_link LINENO -# ------------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_link - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------ ## -## Report this to sndfile@mega-nerd.com ## -## ------------------------------------ ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_decl - -# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES -# -------------------------------------------- -# Tries to find the compile-time value of EXPR in a program that includes -# INCLUDES, setting VAR accordingly. Returns whether the value could be -# computed -ac_fn_c_compute_int () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_lo=0 ac_mid=0 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=$ac_mid; break -else - as_fn_arith $ac_mid + 1 && ac_lo=$as_val - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=-1 ac_mid=-1 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_lo=$ac_mid; break -else - as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - ac_lo= ac_hi= -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0; -return test_array [0]; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=$ac_mid -else - as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in #(( -?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -'') ac_retval=1 ;; -esac - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -static long int longval () { return $2; } -static unsigned long int ulongval () { return $2; } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (($2) < 0) - { - long int i = longval (); - if (i != ($2)) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ($2)) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - echo >>conftest.val; read $3 &5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_type -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by libsndfile $as_me 1.0.24, which was -generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - $as_echo "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - $as_echo "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - $as_echo "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -# Put config stuff in Cfg. -ac_aux_dir= -for ac_dir in Cfg "$srcdir"/Cfg; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in Cfg \"$srcdir\"/Cfg" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if ${ac_cv_target+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - - -ac_config_headers="$ac_config_headers src/config.h" - - -am__api_version='1.14' - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; -esac - -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken - alias in your environment" "$LINENO" 5 - fi - if test "$2" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$2" = conftest.file - ) -then - # Ok. - : -else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi - -rm -f conftest.file - -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} -fi - -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi - -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS - -fi - - test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=1;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='libsndfile' - VERSION='1.0.24' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -mkdir_p='$(MKDIR_P)' - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AMTAR='$${TAR-tar}' - - -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar pax cpio none' - -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - - - - - - -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 - fi -fi -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=0;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - - -# Do not check for F77. - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.4.2' -macro_revision='1.3337' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_FGREP" || continue -# Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_FGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_FGREP=$FGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - - -test -z "$GREP" && GREP=grep - - - - - - - - - - - - - - - - - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$DUMPBIN" && break - done -fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DUMPBIN=$ac_ct_DUMPBIN - fi -fi - - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - -# find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } -fi -max_cmd_len=$lt_cv_sys_max_cmd_len - - - - - - -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi - - - - - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac - -fi - -to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - #assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac - -fi - -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - - - - - - - - -if test -n "$ac_tool_prefix"; then - for ac_prog in ar - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AR" && break - done -fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -fi - -: ${AR=ar} -: ${AR_FLAGS=cru} - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ar_at_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -test -z "$STRIP" && STRIP=: - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -test -z "$RANLIB" && RANLIB=: - - - - - - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } - -# Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : - withval=$with_sysroot; -else - with_sysroot=no -fi - - -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } - - - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -fi - -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_cc_needs_belf=yes -else - lt_cv_cc_needs_belf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MANIFEST_TOOL"; then - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL - # Extract the first word of "mt", so it can be a program name with args. -set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_MANIFEST_TOOL" = x; then - MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi -else - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -fi - -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&5 - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi - - - - - - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIPO=$ac_ct_LIPO - fi -else - LIPO="$ac_cv_prog_LIPO" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL=$ac_ct_OTOOL - fi -else - OTOOL="$ac_cv_prog_OTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL64=$ac_ct_OTOOL64 - fi -else - OTOOL64="$ac_cv_prog_OTOOL64" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - -done - - - - -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf - - - - - -# Set options - - - - enable_dlopen=no - - - enable_win32_dll=no - - - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - - - - - - - - - - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - - - - - - - - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default - - - - - - - - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi - - - - - - - - - - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -test -z "$LN_S" && LN_S="ln -s" - - - - - - - - - - - - - - -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - - - - - -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF - - - - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - -# Use C for the default configuration in the libtool script - -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - -lt_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi - -fi - - - - - - - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi - -fi - - - - - - - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; - esac - - ld_shlibs=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; - *\ \(GNU\ Binutils\)\ [3-9]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - link_all_deplibs=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - always_export_symbols=yes - file_list_spec='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - enable_shared_with_static_runtimes=yes - ;; - esac - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec='' - fi - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - - else - ld_shlibs=no - fi - - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } - -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -fi - - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int foo (void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -with_gnu_ld=$with_gnu_ld - - - - - - - - - - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } - -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes -else - ac_cv_lib_dld_shl_load=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes -else - ac_cv_lib_svld_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes -else - ac_cv_lib_dld_dld_link=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - - - - - - - - - - - - - - - - -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } - - - - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -compiler_needs_object_CXX=no -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_direct_absolute_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -inherit_rpath_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -reload_flag_CXX=$reload_flag -reload_cmds_CXX=$reload_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - - ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' - else - lt_prog_compiler_no_builtin_flag_CXX= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec_CXX='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath__CXX -fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath__CXX -fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - fi - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_CXX=' ' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=yes - file_list_spec_CXX='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' - enable_shared_with_static_runtimes_CXX=yes - # Don't use ranlib - old_postinstall_cmds_CXX='chmod 644 $oldlib' - postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - - - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec_CXX='' - fi - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - - else - ld_shlibs_CXX=no - fi - - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no - ;; - - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs_CXX=yes - ;; - - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - inherit_rpath_CXX=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [1-5].* | *pgcpp\ [1-5].*) - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object_CXX=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - ld_shlibs_CXX=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - hardcode_direct_absolute_CXX=yes - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - ld_shlibs_CXX=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - case $host in - osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - ;; - *) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - ;; - esac - - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" - reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" - LD_CXX="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - # Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= - -cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF - - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - compiler_lib_search_dirs_CXX= -if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic_CXX='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static_CXX= - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-qpic' - lt_prog_compiler_static_CXX='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs_CXX=no - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -with_gnu_ld_CXX=$with_gnu_ld - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc_CXX=no - else - lt_cv_archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } - archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || - test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RC"; then - ac_cv_prog_RC="$RC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RC="${ac_tool_prefix}windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RC=$ac_cv_prog_RC -if test -n "$RC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5 -$as_echo "$RC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RC"; then - ac_ct_RC=$RC - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RC"; then - ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RC="windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RC=$ac_cv_prog_ac_ct_RC -if test -n "$ac_ct_RC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5 -$as_echo "$ac_ct_RC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RC" = x; then - RC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RC=$ac_ct_RC - fi -else - RC="$ac_cv_prog_RC" -fi - - - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -objext_RC=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - -lt_cv_prog_compiler_c_o_RC=yes - -if test -n "$compiler"; then - : - - - -fi - -GCC=$lt_save_GCC -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS - - -# Extract the first word of "autogen", so it can be a program name with args. -set dummy autogen; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAVE_AUTOGEN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAVE_AUTOGEN"; then - ac_cv_prog_HAVE_AUTOGEN="$HAVE_AUTOGEN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_HAVE_AUTOGEN="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_HAVE_AUTOGEN" && ac_cv_prog_HAVE_AUTOGEN="no" -fi -fi -HAVE_AUTOGEN=$ac_cv_prog_HAVE_AUTOGEN -if test -n "$HAVE_AUTOGEN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_AUTOGEN" >&5 -$as_echo "$HAVE_AUTOGEN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "wine", so it can be a program name with args. -set dummy wine; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAVE_WINE+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAVE_WINE"; then - ac_cv_prog_HAVE_WINE="$HAVE_WINE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_HAVE_WINE="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_HAVE_WINE" && ac_cv_prog_HAVE_WINE="no" -fi -fi -HAVE_WINE=$ac_cv_prog_HAVE_WINE -if test -n "$HAVE_WINE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_WINE" >&5 -$as_echo "$HAVE_WINE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - - -#------------------------------------------------------------------------------------ -# Rules for library version information: -# -# 1. Start with version information of `0:0:0' for each libtool library. -# 2. Update the version information only immediately before a public release of -# your software. More frequent updates are unnecessary, and only guarantee -# that the current interface number gets larger faster. -# 3. If the library source code has changed at all since the last update, then -# increment revision (`c:r:a' becomes `c:r+1:a'). -# 4. If any interfaces have been added, removed, or changed since the last update, -# increment current, and set revision to 0. -# 5. If any interfaces have been added since the last public release, then increment -# age. -# 6. If any interfaces have been removed since the last public release, then set age -# to 0. - -CLEAN_VERSION=`echo $PACKAGE_VERSION | $SED "s/p.*//"` -VERSION_MINOR=`echo $CLEAN_VERSION | $SED "s/.*\.//"` - -SHARED_VERSION_INFO="1:$VERSION_MINOR:0" - -#------------------------------------------------------------------------------------ - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - - -for ac_header in endian.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "endian.h" "ac_cv_header_endian_h" "$ac_includes_default" -if test "x$ac_cv_header_endian_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ENDIAN_H 1 -_ACEOF - -fi - -done - -for ac_header in byteswap.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" -if test "x$ac_cv_header_byteswap_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BYTESWAP_H 1 -_ACEOF - -fi - -done - -for ac_header in locale.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LOCALE_H 1 -_ACEOF - -fi - -done - -for ac_header in sys/time.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_time_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TIME_H 1 -_ACEOF - -fi - -done - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if ${ac_cv_header_sys_wait_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif - -int -main () -{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_sys_wait_h=yes -else - ac_cv_header_sys_wait_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } -if test $ac_cv_header_sys_wait_h = yes; then - -$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h - -fi - - -ac_fn_c_check_decl "$LINENO" "S_IRGRP" "ac_cv_have_decl_S_IRGRP" "$ac_includes_default" -if test "x$ac_cv_have_decl_S_IRGRP" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_S_IRGRP $ac_have_decl -_ACEOF - -if test x$ac_cv_have_decl_S_IRGRP = xyes ; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_S_IRGRP 1 -_ACEOF - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_S_IRGRP 0 -_ACEOF - - fi - - if test "$build_os:$target_os:$host_os:$HAVE_WINE" = "linux-gnu:mingw32msvc:mingw32msvc:yes"; then - LINUX_MINGW_CROSS_TEST_TRUE= - LINUX_MINGW_CROSS_TEST_FALSE='#' -else - LINUX_MINGW_CROSS_TEST_TRUE='#' - LINUX_MINGW_CROSS_TEST_FALSE= -fi - - -#==================================================================================== -# Check for support of the struct hack. - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking C99 struct flexible array support" >&5 -$as_echo_n "checking C99 struct flexible array support... " >&6; } -if ${ac_cv_c99_flexible_array+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Initialize to unknown -ac_cv_c99_flexible_array=no - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - typedef struct { - int k; - char buffer [] ; - } MY_STRUCT ; - -int -main () -{ - MY_STRUCT *p = calloc (1, sizeof (MY_STRUCT) + 42); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c99_flexible_array=yes -else - ac_cv_c99_flexible_array=no - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_flexible_array" >&5 -$as_echo "$ac_cv_c99_flexible_array" >&6; } - - -if test x$ac_cv_c99_flexible_array = xyes ; then - -$as_echo "#define HAVE_FLEXIBLE_ARRAY 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** This compiler does not support the 1999 ISO C Standard ***" >&5 -$as_echo "$as_me: WARNING: *** This compiler does not support the 1999 ISO C Standard ***" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** feature known as the flexible array struct member. ***" >&5 -$as_echo "$as_me: WARNING: *** feature known as the flexible array struct member. ***" >&2;} - $as_echo "#define HAVE_FLEXIBLE_ARRAY 0" >>confdefs.h - - fi - -#==================================================================================== -# Couple of initializations here. Fill in real values later. - -SHLIB_VERSION_ARG="" - -#==================================================================================== -# Finished checking, handle options. - -# Check whether --enable-experimental was given. -if test "${enable_experimental+set}" = set; then : - enableval=$enable_experimental; -fi - - -EXPERIMENTAL_CODE=0 -if test x$enable_experimental = xyes ; then - EXPERIMENTAL_CODE=1 - fi - -cat >>confdefs.h <<_ACEOF -#define ENABLE_EXPERIMENTAL_CODE ${EXPERIMENTAL_CODE} -_ACEOF - - -# Check whether --enable-gcc-werror was given. -if test "${enable_gcc_werror+set}" = set; then : - enableval=$enable_gcc_werror; -fi - - -# Check whether --enable-gcc-pipe was given. -if test "${enable_gcc_pipe+set}" = set; then : - enableval=$enable_gcc_pipe; -fi - - -# Check whether --enable-gcc-opt was given. -if test "${enable_gcc_opt+set}" = set; then : - enableval=$enable_gcc_opt; -fi - - -# Check whether --enable-cpu-clip was given. -if test "${enable_cpu_clip+set}" = set; then : - enableval=$enable_cpu_clip; -fi - - -# Check whether --enable-bow-docs was given. -if test "${enable_bow_docs+set}" = set; then : - enableval=$enable_bow_docs; -fi - - -# Check whether --enable-sqlite was given. -if test "${enable_sqlite+set}" = set; then : - enableval=$enable_sqlite; -fi - - -# Check whether --enable-alsa was given. -if test "${enable_alsa+set}" = set; then : - enableval=$enable_alsa; -fi - - -# Check whether --enable-external-libs was given. -if test "${enable_external_libs+set}" = set; then : - enableval=$enable_external_libs; -fi - - -# Check whether --enable-octave was given. -if test "${enable_octave+set}" = set; then : - enableval=$enable_octave; -fi - - -# Check whether --enable-test-coverage was given. -if test "${enable_test_coverage+set}" = set; then : - enableval=$enable_test_coverage; -fi - - if test "$enable_test_coverage" = yes; then - ENABLE_TEST_COVERAGE_TRUE= - ENABLE_TEST_COVERAGE_FALSE='#' -else - ENABLE_TEST_COVERAGE_TRUE='#' - ENABLE_TEST_COVERAGE_FALSE= -fi - - -#==================================================================================== -# Check types and their sizes. - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 -$as_echo_n "checking size of wchar_t... " >&6; } -if ${ac_cv_sizeof_wchar_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_wchar_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (wchar_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_wchar_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 -$as_echo "$ac_cv_sizeof_wchar_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -$as_echo_n "checking size of short... " >&6; } -if ${ac_cv_sizeof_short+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_short" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (short) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_short=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -$as_echo "$ac_cv_sizeof_short" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if ${ac_cv_sizeof_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (int) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_int=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if ${ac_cv_sizeof_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5 -$as_echo_n "checking size of float... " >&6; } -if ${ac_cv_sizeof_float+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_float" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (float) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_float=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5 -$as_echo "$ac_cv_sizeof_float" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_FLOAT $ac_cv_sizeof_float -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 -$as_echo_n "checking size of double... " >&6; } -if ${ac_cv_sizeof_double+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_double" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (double) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_double=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5 -$as_echo "$ac_cv_sizeof_double" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_DOUBLE $ac_cv_sizeof_double -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5 -$as_echo_n "checking size of void*... " >&6; } -if ${ac_cv_sizeof_voidp+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_voidp" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (void*) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_voidp=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5 -$as_echo "$ac_cv_sizeof_voidp" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_VOIDP $ac_cv_sizeof_voidp -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 -$as_echo_n "checking size of size_t... " >&6; } -if ${ac_cv_sizeof_size_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_size_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (size_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_size_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 -$as_echo "$ac_cv_sizeof_size_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int64_t" >&5 -$as_echo_n "checking size of int64_t... " >&6; } -if ${ac_cv_sizeof_int64_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int64_t))" "ac_cv_sizeof_int64_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_int64_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (int64_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_int64_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int64_t" >&5 -$as_echo "$ac_cv_sizeof_int64_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT64_T $ac_cv_sizeof_int64_t -_ACEOF - - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 -$as_echo_n "checking size of long long... " >&6; } -if ${ac_cv_sizeof_long_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_long_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -$as_echo "$ac_cv_sizeof_long_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long -_ACEOF - - - -#==================================================================================== -# Find an appropriate type for sf_count_t. -# On systems supporting files larger than 2 Gig, sf_count_t must be a 64 bit value. -# Unfortunately there is more than one way of ensuring this so need to do some -# pretty rigourous testing here. - -unset ac_cv_sizeof_off_t - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 -$as_echo_n "checking size of off_t... " >&6; } -if ${ac_cv_sizeof_off_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_off_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (off_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_off_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 -$as_echo "$ac_cv_sizeof_off_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF_T $ac_cv_sizeof_off_t -_ACEOF - - # Fake default value. - -case "$host_os" in - mingw32msvc | mingw32) - TYPEOF_SF_COUNT_T="__int64" - SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" - SIZEOF_SF_COUNT_T=8 - -$as_echo "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h - - ;; - *) - if test "x$ac_cv_sizeof_off_t" = "x8" ; then - # If sizeof (off_t) is 8, no further checking is needed. - TYPEOF_SF_COUNT_T="int64_t" - SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" - SIZEOF_SF_COUNT_T=8 - else - # Check for common 64 bit file offset types. - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of loff_t" >&5 -$as_echo_n "checking size of loff_t... " >&6; } -if ${ac_cv_sizeof_loff_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (loff_t))" "ac_cv_sizeof_loff_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_loff_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (loff_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_loff_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_loff_t" >&5 -$as_echo "$ac_cv_sizeof_loff_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LOFF_T $ac_cv_sizeof_loff_t -_ACEOF - - # Fake default value. - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off64_t" >&5 -$as_echo_n "checking size of off64_t... " >&6; } -if ${ac_cv_sizeof_off64_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off64_t))" "ac_cv_sizeof_off64_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_off64_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (off64_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_off64_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off64_t" >&5 -$as_echo "$ac_cv_sizeof_off64_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF64_T $ac_cv_sizeof_off64_t -_ACEOF - - # Fake default value. - - TYPEOF_SF_COUNT_T="unknown" - if test "x$ac_cv_sizeof_loff_t" = "x8" ; then - TYPEOF_SF_COUNT_T="int64_t" - SIZEOF_SF_COUNT_T=8 - elif test "x$ac_cv_sizeof_off64_t" = "x8" ; then - TYPEOF_SF_COUNT_T="int64_t" - SIZEOF_SF_COUNT_T=8 - fi - - # Save the old sizeof (off_t) value and then unset it to see if it - # changes when Large File Support is enabled. - - pre_largefile_sizeof_off_t=$ac_cv_sizeof_off_t - unset ac_cv_sizeof_off_t - - - # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; -fi - - if test "$enable_largefile" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args. -set dummy ${ac_tool_prefix}getconf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GETCONF+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GETCONF"; then - ac_cv_prog_GETCONF="$GETCONF" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GETCONF="${ac_tool_prefix}getconf" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -GETCONF=$ac_cv_prog_GETCONF -if test -n "$GETCONF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GETCONF" >&5 -$as_echo "$GETCONF" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_GETCONF"; then - ac_ct_GETCONF=$GETCONF - # Extract the first word of "getconf", so it can be a program name with args. -set dummy getconf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_GETCONF+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_GETCONF"; then - ac_cv_prog_ac_ct_GETCONF="$ac_ct_GETCONF" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_GETCONF="getconf" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_GETCONF=$ac_cv_prog_ac_ct_GETCONF -if test -n "$ac_ct_GETCONF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GETCONF" >&5 -$as_echo "$ac_ct_GETCONF" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_GETCONF" = x; then - GETCONF="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - GETCONF=$ac_ct_GETCONF - fi -else - GETCONF="$ac_cv_prog_GETCONF" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS value to request large file support" >&5 -$as_echo_n "checking for CFLAGS value to request large file support... " >&6; } -if ${ac_cv_sys_largefile_CFLAGS+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_CFLAGS=`($GETCONF LFS_CFLAGS) 2>/dev/null` || { - ac_cv_sys_largefile_CFLAGS=no - case "$host_os" in - # IRIX 6.2 and later require cc -n32. - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) - if test "$GCC" != yes; then - ac_cv_sys_largefile_CFLAGS=-n32 - fi - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - ac_cv_sys_largefile_CFLAGS=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CC="$ac_save_CC" - esac - } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CFLAGS" >&5 -$as_echo "$ac_cv_sys_largefile_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDFLAGS value to request large file support" >&5 -$as_echo_n "checking for LDFLAGS value to request large file support... " >&6; } -if ${ac_cv_sys_largefile_LDFLAGS+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_LDFLAGS=`($GETCONF LFS_LDFLAGS) 2>/dev/null` || { - ac_cv_sys_largefile_LDFLAGS=no - - } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_LDFLAGS" >&5 -$as_echo "$ac_cv_sys_largefile_LDFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBS value to request large file support" >&5 -$as_echo_n "checking for LIBS value to request large file support... " >&6; } -if ${ac_cv_sys_largefile_LIBS+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_LIBS=`($GETCONF LFS_LIBS) 2>/dev/null` || { - ac_cv_sys_largefile_LIBS=no - - } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_LIBS" >&5 -$as_echo "$ac_cv_sys_largefile_LIBS" >&6; } - - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - no) ;; - -D_FILE_OFFSET_BITS=*) ;; - -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; - -D_LARGE_FILES | -D_LARGE_FILES=*) ;; - -D?* | -I?*) - case "$ac_flag" in - no) ;; - ?*) - case "$CPPFLAGS" in - '') CPPFLAGS="$ac_flag" ;; - *) CPPFLAGS=$CPPFLAGS' '"$ac_flag" ;; - esac ;; - esac ;; - *) - case "$ac_flag" in - no) ;; - ?*) - case "$CFLAGS" in - '') CFLAGS="$ac_flag" ;; - *) CFLAGS=$CFLAGS' '"$ac_flag" ;; - esac ;; - esac ;; - esac - done - case "$ac_cv_sys_largefile_LDFLAGS" in - no) ;; - ?*) - case "$LDFLAGS" in - '') LDFLAGS="$ac_cv_sys_largefile_LDFLAGS" ;; - *) LDFLAGS=$LDFLAGS' '"$ac_cv_sys_largefile_LDFLAGS" ;; - esac ;; - esac - case "$ac_cv_sys_largefile_LIBS" in - no) ;; - ?*) - case "$LIBS" in - '') LIBS="$ac_cv_sys_largefile_LIBS" ;; - *) LIBS=$LIBS' '"$ac_cv_sys_largefile_LIBS" ;; - esac ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_file_offset_bits=no - - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_FILE_OFFSET_BITS) - ac_cv_sys_file_offset_bits=1 ;; - -D_FILE_OFFSET_BITS=*) - ac_cv_sys_file_offset_bits=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } - if test "$ac_cv_sys_file_offset_bits" != no; then - -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF - - fi - case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_file_offset_bits=64 ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE... " >&6; } -if ${ac_cv_sys_largefile_source+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_source=no - case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_largefile_source=1 ;; - esac - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_LARGEFILE_SOURCE) - ac_cv_sys_largefile_source=1 ;; - -D_LARGEFILE_SOURCE=*) - ac_cv_sys_largefile_source=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } - if test "$ac_cv_sys_largefile_source" != no; then - -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES" >&5 -$as_echo_n "checking for _LARGE_FILES... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_large_files=no - case "$host_os" in - # AIX 4.2 and later - aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) - ac_cv_sys_large_files=1 ;; - esac - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_LARGE_FILES) - ac_cv_sys_large_files=1 ;; - -D_LARGE_FILES=*) - ac_cv_sys_large_files=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } - if test "$ac_cv_sys_large_files" != no; then - -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF - - fi - fi - - - if test "x$ac_cv_sys_largefile_CFLAGS" = "xno" ; then - ac_cv_sys_largefile_CFLAGS="" - fi - if test "x$ac_cv_sys_largefile_LDFLAGS" = "xno" ; then - ac_cv_sys_largefile_LDFLAGS="" - fi - if test "x$ac_cv_sys_largefile_LIBS" = "xno" ; then - ac_cv_sys_largefile_LIBS="" - fi - - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 -$as_echo_n "checking size of off_t... " >&6; } -if ${ac_cv_sizeof_off_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_off_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (off_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_off_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 -$as_echo "$ac_cv_sizeof_off_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF_T $ac_cv_sizeof_off_t -_ACEOF - - # Fake default value. - - if test "x$ac_cv_sizeof_off_t" = "x8" ; then - SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" - elif test "x$ac_cv_sizeof_off_t" = "x$pre_largefile_sizeof_off_t" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This machine does not seem to support 64 bit file offsets." >&5 -$as_echo "$as_me: WARNING: This machine does not seem to support 64 bit file offsets." >&2;} - TYPEOF_SF_COUNT_T="off_t" - SIZEOF_SF_COUNT_T=$ac_cv_sizeof_off_t - elif test "x$TYPEOF_SF_COUNT_T" = "xunknown" ; then - echo - echo "*** The configure process has determined that this system is capable" - echo "*** of Large File Support but has not been able to find a type which" - echo "*** is an unambiguous 64 bit file offset." - echo "*** Please contact the author to help resolve this problem." - echo - as_fn_error $? "Bad file offset type." "$LINENO" 5 - fi - fi - ;; - esac - -if test $SIZEOF_SF_COUNT_T = 4 ; then - SF_COUNT_MAX="0x7FFFFFFF" - fi - - -cat >>confdefs.h <<_ACEOF -#define TYPEOF_SF_COUNT_T ${TYPEOF_SF_COUNT_T} -_ACEOF - - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SF_COUNT_T ${SIZEOF_SF_COUNT_T} -_ACEOF - - - - -cat >>confdefs.h <<_ACEOF -#define SF_COUNT_MAX ${SF_COUNT_MAX} -_ACEOF - - - -ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -if test "x$ac_cv_type_ssize_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_SSIZE_T 1 -_ACEOF - - -fi - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 -$as_echo_n "checking size of ssize_t... " >&6; } -if ${ac_cv_sizeof_ssize_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_ssize_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (ssize_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_ssize_t=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5 -$as_echo "$ac_cv_sizeof_ssize_t" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t -_ACEOF - - - -#==================================================================================== -# Determine endian-ness of target processor. - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking processor byte ordering" >&5 -$as_echo_n "checking processor byte ordering... " >&6; } -if ${ac_cv_c_byte_order+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Initialize to unknown -ac_cv_c_byte_order=unknown - -if test x$ac_cv_header_endian_h = xyes ; then - - # First try which should set BYTE_ORDER. - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - -int -main () -{ -return 0 ; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c_byte_order=little - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - -int -main () -{ -return 0 ; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c_byte_order=big - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - fi - -if test $ac_cv_c_byte_order = unknown ; then - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #include - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros - #endif - -int -main () -{ -return 0 ; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - -int -main () -{ -return 0 ; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c_byte_order=little - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - -int -main () -{ -return 0 ; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c_byte_order=little - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - fi - -if test $ac_cv_c_byte_order = unknown ; then - if test $cross_compiling = yes ; then - # This is the last resort. Try to guess the target processor endian-ness - # by looking at the target CPU type. - - case "$target_cpu" in - alpha* | i?86* | mipsel* | ia64*) - ac_cv_c_byte_order=little - ;; - - m68* | mips* | powerpc* | hppa* | sparc*) - ac_cv_c_byte_order=big - ;; - - esac - - else - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - int main (void) - { /* Are we little or big endian? From Harbison&Steele. */ - union - { long l ; - char c [sizeof (long)] ; - } u ; - u.l = 1 ; - return (u.c [sizeof (long) - 1] == 1); - } - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_c_byte_order=big -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main (void) - { /* Are we little or big endian? From Harbison&Steele. */ - union - { long l ; - char c [sizeof (long)] ; - } u ; - u.l = 1 ; - return (u.c [0] == 1); - } -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_c_byte_order=little -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi - fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_byte_order" >&5 -$as_echo "$ac_cv_c_byte_order" >&6; } - -if test $ac_cv_c_byte_order = big ; then - ac_cv_c_big_endian=1 - ac_cv_c_little_endian=0 -elif test $ac_cv_c_byte_order = little ; then - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=1 -else - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=0 - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *****************************************************************" >&5 -$as_echo "$as_me: WARNING: *****************************************************************" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Not able to determine endian-ness of target processor. " >&5 -$as_echo "$as_me: WARNING: *** Not able to determine endian-ness of target processor. " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in " >&5 -$as_echo "$as_me: WARNING: *** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** src/config.h may need to be hand editied. " >&5 -$as_echo "$as_me: WARNING: *** src/config.h may need to be hand editied. " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *****************************************************************" >&5 -$as_echo "$as_me: WARNING: *****************************************************************" >&2;} - fi - - - - - -cat >>confdefs.h <<_ACEOF -#define CPU_IS_BIG_ENDIAN ${ac_cv_c_big_endian} -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define CPU_IS_LITTLE_ENDIAN ${ac_cv_c_little_endian} -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define WORDS_BIGENDIAN ${ac_cv_c_big_endian} -_ACEOF - - -#==================================================================================== -# Check for functions. - -for ac_func in malloc calloc realloc free -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -for ac_func in open read write lseek pread pwrite -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -for ac_func in fstat ftruncate fsync -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -for ac_func in snprintf vsnprintf -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -for ac_func in gmtime gmtime_r localtime localtime_r gettimeofday -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -for ac_func in mmap getpagesize -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -for ac_func in setlocale -do : - ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" -if test "x$ac_cv_func_setlocale" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SETLOCALE 1 -_ACEOF - -fi -done - -for ac_func in pipe waitpid -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 -$as_echo_n "checking for floor in -lm... " >&6; } -if ${ac_cv_lib_m_floor+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char floor (); -int -main () -{ -return floor (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_floor=yes -else - ac_cv_lib_m_floor=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 -$as_echo "$ac_cv_lib_m_floor" >&6; } -if test "x$ac_cv_lib_m_floor" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - -fi - -for ac_func in floor ceil fmod -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrint" >&5 -$as_echo_n "checking for lrint... " >&6; } -if ${ac_cv_c99_lrint+:} false; then : - $as_echo_n "(cached) " >&6 -else - -lrint_save_CFLAGS=$CFLAGS -CFLAGS="-lm" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include - -int -main () -{ -if (!lrint(3.14159)) lrint(2.7183); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c99_lrint=yes -else - ac_cv_c99_lrint=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -CFLAGS=$lrint_save_CFLAGS - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_lrint" >&5 -$as_echo "$ac_cv_c99_lrint" >&6; } - -if test "$ac_cv_c99_lrint" = yes; then - -$as_echo "#define HAVE_LRINT 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrintf" >&5 -$as_echo_n "checking for lrintf... " >&6; } -if ${ac_cv_c99_lrintf+:} false; then : - $as_echo_n "(cached) " >&6 -else - -lrintf_save_CFLAGS=$CFLAGS -CFLAGS="-lm" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include - -int -main () -{ -if (!lrintf(3.14159)) lrintf(2.7183); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c99_lrintf=yes -else - ac_cv_c99_lrintf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -CFLAGS=$lrintf_save_CFLAGS - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_lrintf" >&5 -$as_echo "$ac_cv_c99_lrintf" >&6; } - -if test "$ac_cv_c99_lrintf" = yes; then - -$as_echo "#define HAVE_LRINTF 1" >>confdefs.h - -fi - - -#==================================================================================== -# Check for requirements for building plugins for other languages/enviroments. - -if test x$cross_compiling = xno ; then - if test x$enable_octave = xno ; then - if false; then - BUILD_OCTAVE_MOD_TRUE= - BUILD_OCTAVE_MOD_FALSE='#' -else - BUILD_OCTAVE_MOD_TRUE='#' - BUILD_OCTAVE_MOD_FALSE= -fi - - else - - -OCTAVE_BUILD=no - - - - -# Check whether --with-octave was given. -if test "${with_octave+set}" = set; then : - withval=$with_octave; with_octave=$withval -fi - - -test -z "$with_octave" && with_octave=octave - -# Extract the first word of "$with_octave", so it can be a program name with args. -set dummy $with_octave; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAVE_OCTAVE+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAVE_OCTAVE"; then - ac_cv_prog_HAVE_OCTAVE="$HAVE_OCTAVE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_HAVE_OCTAVE="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_HAVE_OCTAVE" && ac_cv_prog_HAVE_OCTAVE="no" -fi -fi -HAVE_OCTAVE=$ac_cv_prog_HAVE_OCTAVE -if test -n "$HAVE_OCTAVE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_OCTAVE" >&5 -$as_echo "$HAVE_OCTAVE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - -if test "x$ac_cv_prog_HAVE_OCTAVE" = "xyes" ; then - OCTAVE=$with_octave - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCTAVE_VERSION in $OCTAVE" >&5 -$as_echo_n "checking for OCTAVE_VERSION in $OCTAVE... " >&6; } -OCTAVE_VERSION=`TERM=;$OCTAVE -qfH --eval "disp(OCTAVE_VERSION)"` -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_VERSION" >&5 -$as_echo "$OCTAVE_VERSION" >&6; } - - - fi - - - - - - - - - -# Check whether --with-mkoctfile was given. -if test "${with_mkoctfile+set}" = set; then : - withval=$with_mkoctfile; with_mkoctfile=$withval -fi - - -test -z "$with_mkoctfile" && with_mkoctfile=mkoctfile - -# Extract the first word of "$with_mkoctfile", so it can be a program name with args. -set dummy $with_mkoctfile; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAVE_MKOCTFILE+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAVE_MKOCTFILE"; then - ac_cv_prog_HAVE_MKOCTFILE="$HAVE_MKOCTFILE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_HAVE_MKOCTFILE="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_HAVE_MKOCTFILE" && ac_cv_prog_HAVE_MKOCTFILE="no" -fi -fi -HAVE_MKOCTFILE=$ac_cv_prog_HAVE_MKOCTFILE -if test -n "$HAVE_MKOCTFILE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_MKOCTFILE" >&5 -$as_echo "$HAVE_MKOCTFILE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - -if test "x$ac_cv_prog_HAVE_MKOCTFILE" = "xyes" ; then - MKOCTFILE=$with_mkoctfile - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version of $MKOCTFILE" >&5 -$as_echo_n "checking for version of $MKOCTFILE... " >&6; } - MKOCTFILE_VERSION=`$with_mkoctfile --version 2>&1 | sed 's/mkoctfile, version //g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE_VERSION" >&5 -$as_echo "$MKOCTFILE_VERSION" >&6; } - fi - - - - - - - - -# Check whether --with-octave-config was given. -if test "${with_octave_config+set}" = set; then : - withval=$with_octave_config; with_octave_config=$withval -fi - - -test -z "$with_octave_config" && with_octave_config=octave-config - -# Extract the first word of "$with_octave_config", so it can be a program name with args. -set dummy $with_octave_config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HAVE_OCTAVE_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAVE_OCTAVE_CONFIG"; then - ac_cv_prog_HAVE_OCTAVE_CONFIG="$HAVE_OCTAVE_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_HAVE_OCTAVE_CONFIG="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_HAVE_OCTAVE_CONFIG" && ac_cv_prog_HAVE_OCTAVE_CONFIG="no" -fi -fi -HAVE_OCTAVE_CONFIG=$ac_cv_prog_HAVE_OCTAVE_CONFIG -if test -n "$HAVE_OCTAVE_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_OCTAVE_CONFIG" >&5 -$as_echo "$HAVE_OCTAVE_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - -if test "x$ac_cv_prog_HAVE_OCTAVE_CONFIG" = "xyes" ; then - OCTAVE_CONFIG=$with_octave_config - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version of $OCTAVE_CONFIG" >&5 -$as_echo_n "checking for version of $OCTAVE_CONFIG... " >&6; } - OCTAVE_CONFIG_VERSION=`$OCTAVE_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG_VERSION" >&5 -$as_echo "$OCTAVE_CONFIG_VERSION" >&6; } - fi - - - - - - -prog_concat="$ac_cv_prog_HAVE_OCTAVE$ac_cv_prog_HAVE_OCTAVE_CONFIG$ac_cv_prog_HAVE_MKOCTFILE" - -if test "x$prog_concat" = "xyesyesyes" ; then - if test "x$OCTAVE_VERSION" != "x$MKOCTFILE_VERSION" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** Mismatch between versions of octave and mkoctfile. **" >&5 -$as_echo "$as_me: WARNING: ** Mismatch between versions of octave and mkoctfile. **" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** Octave libsndfile modules will not be built. **" >&5 -$as_echo "$as_me: WARNING: ** Octave libsndfile modules will not be built. **" >&2;} - elif test "x$OCTAVE_VERSION" != "x$OCTAVE_CONFIG_VERSION" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** Mismatch between versions of octave and octave-config. **" >&5 -$as_echo "$as_me: WARNING: ** Mismatch between versions of octave and octave-config. **" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** Octave libsndfile modules will not be built. **" >&5 -$as_echo "$as_me: WARNING: ** Octave libsndfile modules will not be built. **" >&2;} - else - case "$MKOCTFILE_VERSION" in - 2.*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Octave version 2.X is not supported." >&5 -$as_echo "$as_me: WARNING: Octave version 2.X is not supported." >&2;} - ;; - 3.0.*) - OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir | sed 's%^/usr%${prefix}%'` - OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir | sed 's%^/usr%${prefix}%'` - - OCTAVE_BUILD=yes - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Octave version $MKOCTFILE_VERSION is not supported." >&5 -$as_echo "$as_me: WARNING: Octave version $MKOCTFILE_VERSION is not supported." >&2;} - ;; - esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: building octave libsndfile module... $OCTAVE_BUILD" >&5 -$as_echo "building octave libsndfile module... $OCTAVE_BUILD" >&6; } - fi - - - - - - - if test "x$OCTAVE_BUILD" = xyes; then - BUILD_OCTAVE_MOD_TRUE= - BUILD_OCTAVE_MOD_FALSE='#' -else - BUILD_OCTAVE_MOD_TRUE='#' - BUILD_OCTAVE_MOD_FALSE= -fi - - - - fi -else - if false; then - BUILD_OCTAVE_MOD_TRUE= - BUILD_OCTAVE_MOD_FALSE='#' -else - BUILD_OCTAVE_MOD_TRUE='#' - BUILD_OCTAVE_MOD_FALSE= -fi - - fi - -#==================================================================================== -# Check for Ogg, Vorbis and FLAC. - -HAVE_EXTERNAL_LIBS=0 -EXTERNAL_CFLAGS="" -EXTERNAL_LIBS="" - -# Check for pkg-config outside the if statement. - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - -if test -n "$PKG_CONFIG" ; then - if test x$enable_external_libs = xno ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** External libs (FLAC, Ogg, Vorbis) disabled. ***" >&5 -$as_echo "$as_me: WARNING: *** External libs (FLAC, Ogg, Vorbis) disabled. ***" >&2;} - else - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flac >= 1.2.1 " >&5 -$as_echo_n "checking for flac >= 1.2.1 ... " >&6; } - -if test -n "$FLAC_CFLAGS"; then - pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_FLAC_CFLAGS=`$PKG_CONFIG --cflags "flac >= 1.2.1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$FLAC_LIBS"; then - pkg_cv_FLAC_LIBS="$FLAC_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_FLAC_LIBS=`$PKG_CONFIG --libs "flac >= 1.2.1" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "flac >= 1.2.1"` - else - FLAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "flac >= 1.2.1"` - fi - # Put the nasty error message in config.log where it belongs - echo "$FLAC_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_cv_flac=no -elif test $pkg_failed = untried; then - ac_cv_flac=no -else - FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS - FLAC_LIBS=$pkg_cv_FLAC_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_cv_flac=yes -fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg >= 1.1.3 " >&5 -$as_echo_n "checking for ogg >= 1.1.3 ... " >&6; } - -if test -n "$OGG_CFLAGS"; then - pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.1.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ogg >= 1.1.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.1.3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$OGG_LIBS"; then - pkg_cv_OGG_LIBS="$OGG_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.1.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ogg >= 1.1.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.1.3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg >= 1.1.3"` - else - OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.1.3"` - fi - # Put the nasty error message in config.log where it belongs - echo "$OGG_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_cv_ogg=no -elif test $pkg_failed = untried; then - ac_cv_ogg=no -else - OGG_CFLAGS=$pkg_cv_OGG_CFLAGS - OGG_LIBS=$pkg_cv_OGG_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_cv_ogg=yes -fi - - # Vorbis versions earlier than 1.2.3 have bugs that cause the libsndfile - # test suite to fail on MIPS, PowerPC and others. - # See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549899 - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis >= 1.2.3 " >&5 -$as_echo_n "checking for vorbis >= 1.2.3 ... " >&6; } - -if test -n "$VORBIS_CFLAGS"; then - pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbis >= 1.2.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "vorbis >= 1.2.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "vorbis >= 1.2.3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$VORBIS_LIBS"; then - pkg_cv_VORBIS_LIBS="$VORBIS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbis >= 1.2.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "vorbis >= 1.2.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "vorbis >= 1.2.3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vorbis >= 1.2.3"` - else - VORBIS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vorbis >= 1.2.3"` - fi - # Put the nasty error message in config.log where it belongs - echo "$VORBIS_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_cv_vorbis=no -elif test $pkg_failed = untried; then - ac_cv_vorbis=no -else - VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS - VORBIS_LIBS=$pkg_cv_VORBIS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_cv_vorbis=yes -fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbisenc >= 1.2.3 " >&5 -$as_echo_n "checking for vorbisenc >= 1.2.3 ... " >&6; } - -if test -n "$VORBISENC_CFLAGS"; then - pkg_cv_VORBISENC_CFLAGS="$VORBISENC_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbisenc >= 1.2.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "vorbisenc >= 1.2.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_VORBISENC_CFLAGS=`$PKG_CONFIG --cflags "vorbisenc >= 1.2.3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$VORBISENC_LIBS"; then - pkg_cv_VORBISENC_LIBS="$VORBISENC_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbisenc >= 1.2.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "vorbisenc >= 1.2.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_VORBISENC_LIBS=`$PKG_CONFIG --libs "vorbisenc >= 1.2.3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vorbisenc >= 1.2.3"` - else - VORBISENC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vorbisenc >= 1.2.3"` - fi - # Put the nasty error message in config.log where it belongs - echo "$VORBISENC_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_cv_vorbisenc=no -elif test $pkg_failed = untried; then - ac_cv_vorbisenc=no -else - VORBISENC_CFLAGS=$pkg_cv_VORBISENC_CFLAGS - VORBISENC_LIBS=$pkg_cv_VORBISENC_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_cv_vorbisenc=yes -fi - enable_external_libs=yes - fi - -if test x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc = "xyesyesyesyes" ; then - HAVE_EXTERNAL_LIBS=1 - enable_external_libs=yes - - EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBISENC_CFLAGS" - EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS" - else - echo - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** One or more of the external libraries (ie libflac, libogg and" >&5 -$as_echo "$as_me: WARNING: *** One or more of the external libraries (ie libflac, libogg and" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** libvorbis) is either missing (possibly only the development" >&5 -$as_echo "$as_me: WARNING: *** libvorbis) is either missing (possibly only the development" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** headers) or is of an unsupported version." >&5 -$as_echo "$as_me: WARNING: *** headers) or is of an unsupported version." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5 -$as_echo "$as_me: WARNING: ***" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unfortunately, for ease of maintenance, the external libs" >&5 -$as_echo "$as_me: WARNING: *** Unfortunately, for ease of maintenance, the external libs" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** are an all or nothing affair." >&5 -$as_echo "$as_me: WARNING: *** are an all or nothing affair." >&2;} - echo - enable_external_libs=no - fi - fi - - -cat >>confdefs.h <<_ACEOF -#define HAVE_EXTERNAL_LIBS $HAVE_EXTERNAL_LIBS -_ACEOF - - -#==================================================================================== -# Check for libsqlite3 (only used in regtest). - -ac_cv_sqlite3=no -if test x$enable_sqlite != xno ; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.2 " >&5 -$as_echo_n "checking for sqlite3 >= 3.2 ... " >&6; } - -if test -n "$SQLITE3_CFLAGS"; then - pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.2") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SQLITE3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.2" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SQLITE3_LIBS"; then - pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.2") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SQLITE3_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.2" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sqlite3 >= 3.2"` - else - SQLITE3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$SQLITE3_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_cv_sqlite3=no -elif test $pkg_failed = untried; then - ac_cv_sqlite3=no -else - SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS - SQLITE3_LIBS=$pkg_cv_SQLITE3_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_cv_sqlite3=yes -fi - fi - -if test x$ac_cv_sqlite3 = "xyes" ; then - HAVE_SQLITE3=1 -else - HAVE_SQLITE3=0 - fi - - -cat >>confdefs.h <<_ACEOF -#define HAVE_SQLITE3 $HAVE_SQLITE3 -_ACEOF - - -#==================================================================================== -# Determine if the processor can do clipping on float to int conversions. - -if test x$enable_cpu_clip != "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking processor clipping capabilities" >&5 -$as_echo_n "checking processor clipping capabilities... " >&6; } -if ${ac_cv_c_clip_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Initialize to unknown -ac_cv_c_clip_positive=unknown -ac_cv_c_clip_negative=unknown - - -if test $ac_cv_c_clip_positive = unknown ; then - if test "$cross_compiling" = yes; then : - ac_cv_c_clip_positive=unknown - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #define _ISOC9X_SOURCE 1 - #define _ISOC99_SOURCE 1 - #define __USE_ISOC99 1 - #define __USE_ISOC9X 1 - #include - int main (void) - { double fval ; - int k, ival ; - - fval = 1.0 * 0x7FFFFFFF ; - for (k = 0 ; k < 100 ; k++) - { ival = (lrint (fval)) >> 24 ; - if (ival != 127) - return 1 ; - - fval *= 1.2499999 ; - } ; - - return 0 ; - } - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_clip_positive=yes -else - ac_cv_c_clip_positive=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - - if test "$cross_compiling" = yes; then : - ac_cv_c_clip_negative=unknown - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #define _ISOC9X_SOURCE 1 - #define _ISOC99_SOURCE 1 - #define __USE_ISOC99 1 - #define __USE_ISOC9X 1 - #include - int main (void) - { double fval ; - int k, ival ; - - fval = -8.0 * 0x10000000 ; - for (k = 0 ; k < 100 ; k++) - { ival = (lrint (fval)) >> 24 ; - if (ival != -128) - return 1 ; - - fval *= 1.2499999 ; - } ; - - return 0 ; - } - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_clip_negative=yes -else - ac_cv_c_clip_negative=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi - -if test $ac_cv_c_clip_positive = yes ; then - ac_cv_c_clip_positive=1 -else - ac_cv_c_clip_positive=0 - fi - -if test $ac_cv_c_clip_negative = yes ; then - ac_cv_c_clip_negative=1 -else - ac_cv_c_clip_negative=0 - fi - - -case "$ac_cv_c_clip_positive$ac_cv_c_clip_negative" in - "00") - ac_cv_c_clip_type="none" - ;; - "10") - ac_cv_c_clip_type="positive" - ;; - "01") - ac_cv_c_clip_type="negative" - ;; - "11") - ac_cv_c_clip_type="both" - ;; - esac - - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_clip_type" >&5 -$as_echo "$ac_cv_c_clip_type" >&6; } - - - -else - echo "checking processor clipping capabilities... disabled" - ac_cv_c_clip_positive=0 - ac_cv_c_clip_negative=0 - fi - - -cat >>confdefs.h <<_ACEOF -#define CPU_CLIPS_POSITIVE ${ac_cv_c_clip_positive} -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define CPU_CLIPS_NEGATIVE ${ac_cv_c_clip_negative} -_ACEOF - - -#==================================================================================== -# Target OS specific stuff. - -OS_SPECIFIC_CFLAGS="" -OS_SPECIFIC_LINKS="" -os_is_win32=0 -os_is_macosx=0 -use_windows_api=0 - -case "$host_os" in - darwin* | rhapsody*) - os_is_macosx=1 - OS_SPECIFIC_CFLAGS="-I/Developer/Headers/FlatCarbon" - OS_SPECIFIC_LINKS="-framework CoreAudio" - ;; - mingw*) - os_is_win32=1 - use_windows_api=1 - OS_SPECIFIC_LINKS="-lwinmm" - ;; - esac - - -cat >>confdefs.h <<_ACEOF -#define OS_IS_WIN32 ${os_is_win32} -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define OS_IS_MACOSX ${os_is_macosx} -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define USE_WINDOWS_API ${use_windows_api} -_ACEOF - - - if test ${use_windows_api} -eq 1; then - USE_WIN_VERSION_FILE_TRUE= - USE_WIN_VERSION_FILE_FALSE='#' -else - USE_WIN_VERSION_FILE_TRUE='#' - USE_WIN_VERSION_FILE_FALSE= -fi - - -#==================================================================================== -# Check for ALSA. - -ALSA_LIBS="" - -if test x$enable_alsa != xno ; then - for ac_header in alsa/asoundlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ALSA_ASOUNDLIB_H 1 -_ACEOF - -fi - -done - - if test x$ac_cv_header_alsa_asoundlib_h = xyes ; then - ALSA_LIBS="-lasound" - enable_alsa=yes - fi - fi - -#==================================================================================== -# Check for OpenBSD's sndio. - -SNDIO_LIBS="" -for ac_header in sndio.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sndio.h" "ac_cv_header_sndio_h" "$ac_includes_default" -if test "x$ac_cv_header_sndio_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SNDIO_H 1 -_ACEOF - -fi - -done - -if test x$ac_cv_header_sndio_h = xyes ; then - SNDIO_LIBS="-lsndio" - fi - -#==================================================================================== -# Test for sanity when cross-compiling. - -if test x$cross_compiling = xyes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** We are cross-compiling, so have to assume sizeof (short) == 2 " >&5 -$as_echo "$as_me: WARNING: *** We are cross-compiling, so have to assume sizeof (short) == 2 " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** and sizeof (int) == 4. If this is not the case there is no " >&5 -$as_echo "$as_me: WARNING: *** and sizeof (int) == 4. If this is not the case there is no " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** chance of this working. Please contact the mantainer. " >&5 -$as_echo "$as_me: WARNING: *** chance of this working. Please contact the mantainer. " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - fi - -if test $ac_cv_sizeof_short != 2 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** sizeof (short) != 2. " >&5 -$as_echo "$as_me: WARNING: *** sizeof (short) != 2. " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - fi - -if test $ac_cv_sizeof_int != 4 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** sizeof (int) != 4 " >&5 -$as_echo "$as_me: WARNING: *** sizeof (int) != 4 " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - fi - -if test $ac_cv_sizeof_float != 4 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** sizeof (float) != 4. " >&5 -$as_echo "$as_me: WARNING: *** sizeof (float) != 4. " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - fi - -if test $ac_cv_sizeof_double != 8 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** sizeof (double) != 8. " >&5 -$as_echo "$as_me: WARNING: *** sizeof (double) != 8. " >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******************************************************************" >&5 -$as_echo "$as_me: WARNING: ******************************************************************" >&2;} - fi - -#if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then -# AC_MSG_WARN([[Touching files in directory tests/.]]) -# touch tests/*.c tests/*.h -# fi - -#==================================================================================== -# Settings for the HTML documentation. - -htmldocdir=$prefix/share/doc/libsndfile1-dev/html - -if test $prefix = "NONE" ; then - htmldocdir=/usr/local/share/doc/libsndfile1-dev/html -else - htmldocdir=$prefix/share/doc/libsndfile1-dev/html - fi - -if test x$enable_bow_docs = "xyes" ; then - HTML_BGCOLOUR="white" - HTML_FGCOLOUR="black" -else - HTML_BGCOLOUR="black" - HTML_FGCOLOUR="white" - fi - -#==================================================================================== -# Now use the information from the checking stage. - -win32_target_dll=0 -COMPILER_IS_GCC=0 - -if test x$ac_cv_c_compiler_gnu = xyes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -std=gnu99" >&5 -$as_echo_n "checking if $CC accepts -std=gnu99... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-std=gnu99" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -puts("Hello, World!"); return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -std=gnu99" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$ac_add_cflags__old_cflags" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - - -if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version of $CC" >&5 -$as_echo_n "checking for version of $CC... " >&6; } - GCC_VERSION=`$CC -dumpversion` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_VERSION" >&5 -$as_echo "$GCC_VERSION" >&6; } - - GCC_MINOR_VERSION=`echo $GCC_VERSION | sed "s/^[0-9]\+\.//" | sed "s/\..*//"` - GCC_MAJOR_VERSION=`echo $GCC_VERSION | sed "s/\..*//"` - fi - - - - - - - - if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****************************************************************" >&5 -$as_echo "$as_me: WARNING: ****************************************************************" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** GCC version 4.2 warns about the inline keyword for no good **" >&5 -$as_echo "$as_me: WARNING: ** GCC version 4.2 warns about the inline keyword for no good **" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** reason but the maintainers do not see it as a bug. **" >&5 -$as_echo "$as_me: WARNING: ** reason but the maintainers do not see it as a bug. **" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33995 **" >&5 -$as_echo "$as_me: WARNING: ** See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33995 **" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** Using -fgnu-inline to avoid this stupidity. **" >&5 -$as_echo "$as_me: WARNING: ** Using -fgnu-inline to avoid this stupidity. **" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****************************************************************" >&5 -$as_echo "$as_me: WARNING: ****************************************************************" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fgnu89-inline" >&5 -$as_echo_n "checking if $CC accepts -fgnu89-inline... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-fgnu89-inline" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -puts("Hello, World!"); return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -fgnu89-inline" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$ac_add_cflags__old_cflags" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - fi - - CFLAGS="$CFLAGS -Wall" - CXXFLAGS="$CXXFLAGS -Wall" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wextra" >&5 -$as_echo_n "checking if $CC accepts -Wextra... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-Wextra" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -puts("Hello, World!"); return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -Wextra" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$ac_add_cflags__old_cflags" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Wextra" >&5 -$as_echo_n "checking if $CXX accepts -Wextra... " >&6; } - - ac_add_cxxflags__old_cxxflags="$CXXFLAGS" - CXXFLAGS="-Wextra" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -puts("Hello, World!"); return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CXXFLAGS="$ac_add_cxxflags__old_cxxflags -Wextra" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CXXFLAGS="$ac_add_cxxflags__old_cxxflags" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wdeclaration-after-statement" >&5 -$as_echo_n "checking if $CC accepts -Wdeclaration-after-statement... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-Wdeclaration-after-statement" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -puts("Hello, World!"); return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -Wdeclaration-after-statement" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$ac_add_cflags__old_cflags" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wpointer-arith" >&5 -$as_echo_n "checking if $CC accepts -Wpointer-arith... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-Wpointer-arith" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -puts("Hello, World!"); return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -Wpointer-arith" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$ac_add_cflags__old_cflags" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -funsigned-char" >&5 -$as_echo_n "checking if $CC accepts -funsigned-char... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-funsigned-char" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -puts("Hello, World!"); return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -funsigned-char" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$ac_add_cflags__old_cflags" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - - if test x$enable_gcc_werror = "xyes" ; then - CFLAGS="-Werror $CFLAGS" - CXXFLAGS="-Werror $CXXFLAGS" - fi - - if test x$enable_test_coverage = "xyes" ; then - # MN_ADD_CFLAGS([-ftest-coverage]) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -coverage" >&5 -$as_echo_n "checking if $CC accepts -coverage... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-coverage" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -puts("Hello, World!"); return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -coverage" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - CFLAGS="$ac_add_cflags__old_cflags" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - fi - - CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wbad-function-cast -Wwrite-strings " - # -Wundef -Wmissing-declarations -Winline -Wconversion" - CXXFLAGS="$CXXFLAGS -Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wreorder -Wsign-promo " - - if test "x$enable_gcc_opt" = "xno" ; then - temp_CFLAGS=`echo $CFLAGS | $SED "s/O2/O0/"` - CFLAGS=$temp_CFLAGS - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Compiler optimisations switched off. ***" >&5 -$as_echo "$as_me: WARNING: *** Compiler optimisations switched off. ***" >&2;} - fi - - # OS specific tweaks. - case "$host_os" in - darwin* | rhapsody*) - # Disable -Wall, -pedantic and -Wshadow for Apple Darwin/Rhapsody. - # System headers on these systems are broken. - temp_CFLAGS=`echo $CFLAGS | $SED "s/-Wall -pedantic//" | $SED "s/-Wshadow//" | $SED "s/-Waggregate-return//"` - CFLAGS=$temp_CFLAGS - SHLIB_VERSION_ARG="-Wl,-exported_symbols_list -Wl,\$(srcdir)/Symbols.darwin" - ;; - linux*|kfreebsd*-gnu*|gnu*) - SHLIB_VERSION_ARG="-Wl,--version-script=\$(srcdir)/Symbols.gnu-binutils" - ;; - mingw*) - # Linker flag '-Wl,--out-implib' does not work with mingw cross compiler - # so we don't use it here. - SHLIB_VERSION_ARG="-Wl,\$(srcdir)/libsndfile-1.def" - win32_target_dll=1 - if test x"$enable_shared" = xno ; then - win32_target_dll=0 - fi - ;; - os2*) - SHLIB_VERSION_ARG="-Wl,-export-symbols \$(srcdir)/Symbols.os2" - ;; - *) - ;; - esac - if test x$enable_gcc_pipe != "xno" ; then - CFLAGS="$CFLAGS -pipe" - fi - - COMPILER_IS_GCC=1 - fi - - -cat >>confdefs.h <<_ACEOF -#define WIN32_TARGET_DLL ${win32_target_dll} -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define COMPILER_IS_GCC ${COMPILER_IS_GCC} -_ACEOF - - -CFLAGS="$CFLAGS $OS_SPECIFIC_CFLAGS" - -if test x"$CFLAGS" = x ; then - echo "Error in configure script. CFLAGS has been screwed up." - exit - fi - -HOST_TRIPLET="${host_cpu}-${host_vendor}-${host_os}" - -if test "$HOST_TRIPLET" = "x86_64-w64-mingw32" ; then - OS_SPECIFIC_LINKS=" -static-libgcc $OS_SPECIFIC_LINKS" - fi - -WIN_RC_VERSION=`echo $PACKAGE_VERSION | $SED -e "s/p.*//" -e "s/\./,/g"` - -#------------------------------------------------------------------------------- - - - - - - - - - - - - - - - - - - - - - - -ac_config_files="$ac_config_files src/sndfile.h src/Makefile src/GSM610/Makefile src/G72x/Makefile src/version-metadata.rc man/Makefile examples/Makefile tests/Makefile regtest/Makefile M4/Makefile doc/Makefile Win32/Makefile Octave/Makefile programs/Makefile doc/libsndfile.css Makefile libsndfile.spec sndfile.pc tests/test_wrapper.sh tests/pedantic-header-test.sh build-test-tarball.mk" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -else - am__EXEEXT_TRUE='#' - am__EXEEXT_FALSE= -fi - -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LINUX_MINGW_CROSS_TEST_TRUE}" && test -z "${LINUX_MINGW_CROSS_TEST_FALSE}"; then - as_fn_error $? "conditional \"LINUX_MINGW_CROSS_TEST\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${ENABLE_TEST_COVERAGE_TRUE}" && test -z "${ENABLE_TEST_COVERAGE_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_TEST_COVERAGE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_OCTAVE_MOD_TRUE}" && test -z "${BUILD_OCTAVE_MOD_FALSE}"; then - as_fn_error $? "conditional \"BUILD_OCTAVE_MOD\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_OCTAVE_MOD_TRUE}" && test -z "${BUILD_OCTAVE_MOD_FALSE}"; then - as_fn_error $? "conditional \"BUILD_OCTAVE_MOD\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${BUILD_OCTAVE_MOD_TRUE}" && test -z "${BUILD_OCTAVE_MOD_FALSE}"; then - as_fn_error $? "conditional \"BUILD_OCTAVE_MOD\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${USE_WIN_VERSION_FILE_TRUE}" && test -z "${USE_WIN_VERSION_FILE_FALSE}"; then - as_fn_error $? "conditional \"USE_WIN_VERSION_FILE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by libsndfile $as_me 1.0.24, which was -generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to . -libsndfile home page: ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" -ac_cs_version="\\ -libsndfile config.status 1.0.24 -configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2012 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -AWK='$AWK' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' -predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' -predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' -postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' -LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`' -reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' -reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`' -reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' -reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_cmds_RC='`$ECHO "$old_archive_cmds_RC" | $SED "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' -compiler_RC='`$ECHO "$compiler_RC" | $SED "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' -GCC_RC='`$ECHO "$GCC_RC" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_RC='`$ECHO "$lt_prog_compiler_no_builtin_flag_RC" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic_RC='`$ECHO "$lt_prog_compiler_pic_RC" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_RC='`$ECHO "$lt_prog_compiler_wl_RC" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static_RC='`$ECHO "$lt_prog_compiler_static_RC" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_RC='`$ECHO "$lt_cv_prog_compiler_c_o_RC" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc_RC='`$ECHO "$archive_cmds_need_lc_RC" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_RC='`$ECHO "$enable_shared_with_static_runtimes_RC" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec_RC='`$ECHO "$export_dynamic_flag_spec_RC" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec_RC='`$ECHO "$whole_archive_flag_spec_RC" | $SED "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' -compiler_needs_object_RC='`$ECHO "$compiler_needs_object_RC" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds_RC='`$ECHO "$old_archive_from_new_cmds_RC" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_RC='`$ECHO "$old_archive_from_expsyms_cmds_RC" | $SED "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_RC='`$ECHO "$archive_cmds_RC" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds_RC='`$ECHO "$archive_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_cmds_RC='`$ECHO "$module_cmds_RC" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds_RC='`$ECHO "$module_expsym_cmds_RC" | $SED "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' -with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L_RC='`$ECHO "$hardcode_minus_L_RC" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var_RC='`$ECHO "$hardcode_shlibpath_var_RC" | $SED "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_automatic_RC='`$ECHO "$hardcode_automatic_RC" | $SED "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' -inherit_rpath_RC='`$ECHO "$inherit_rpath_RC" | $SED "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -link_all_deplibs_RC='`$ECHO "$link_all_deplibs_RC" | $SED "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' -always_export_symbols_RC='`$ECHO "$always_export_symbols_RC" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds_RC='`$ECHO "$export_symbols_cmds_RC" | $SED "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -exclude_expsyms_RC='`$ECHO "$exclude_expsyms_RC" | $SED "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -include_expsyms_RC='`$ECHO "$include_expsyms_RC" | $SED "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`' -postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' -file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs_RC='`$ECHO "$compiler_lib_search_dirs_RC" | $SED "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' -predep_objects_RC='`$ECHO "$predep_objects_RC" | $SED "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' -postdep_objects_RC='`$ECHO "$postdep_objects_RC" | $SED "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' -predeps_RC='`$ECHO "$predeps_RC" | $SED "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' -postdeps_RC='`$ECHO "$postdeps_RC" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path_RC='`$ECHO "$compiler_lib_search_path_RC" | $SED "$delay_single_quote_subst"`' - -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in SHELL \ -ECHO \ -PATH_SEPARATOR \ -SED \ -GREP \ -EGREP \ -FGREP \ -LD \ -NM \ -LN_S \ -lt_SP2NL \ -lt_NL2SP \ -reload_flag \ -OBJDUMP \ -deplibs_check_method \ -file_magic_cmd \ -file_magic_glob \ -want_nocaseglob \ -DLLTOOL \ -sharedlib_from_linklib_cmd \ -AR \ -AR_FLAGS \ -archiver_list_spec \ -STRIP \ -RANLIB \ -CC \ -CFLAGS \ -compiler \ -lt_cv_sys_global_symbol_pipe \ -lt_cv_sys_global_symbol_to_cdecl \ -lt_cv_sys_global_symbol_to_c_name_address \ -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -nm_file_list_spec \ -lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_pic \ -lt_prog_compiler_wl \ -lt_prog_compiler_static \ -lt_cv_prog_compiler_c_o \ -need_locks \ -MANIFEST_TOOL \ -DSYMUTIL \ -NMEDIT \ -LIPO \ -OTOOL \ -OTOOL64 \ -shrext_cmds \ -export_dynamic_flag_spec \ -whole_archive_flag_spec \ -compiler_needs_object \ -with_gnu_ld \ -allow_undefined_flag \ -no_undefined_flag \ -hardcode_libdir_flag_spec \ -hardcode_libdir_separator \ -exclude_expsyms \ -include_expsyms \ -file_list_spec \ -variables_saved_for_relink \ -libname_spec \ -library_names_spec \ -soname_spec \ -install_override_mode \ -finish_eval \ -old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -LD_RC \ -reload_flag_CXX \ -reload_flag_RC \ -compiler_CXX \ -compiler_RC \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_no_builtin_flag_RC \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_pic_RC \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_wl_RC \ -lt_prog_compiler_static_CXX \ -lt_prog_compiler_static_RC \ -lt_cv_prog_compiler_c_o_CXX \ -lt_cv_prog_compiler_c_o_RC \ -export_dynamic_flag_spec_CXX \ -export_dynamic_flag_spec_RC \ -whole_archive_flag_spec_CXX \ -whole_archive_flag_spec_RC \ -compiler_needs_object_CXX \ -compiler_needs_object_RC \ -with_gnu_ld_CXX \ -with_gnu_ld_RC \ -allow_undefined_flag_CXX \ -allow_undefined_flag_RC \ -no_undefined_flag_CXX \ -no_undefined_flag_RC \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_RC \ -hardcode_libdir_separator_CXX \ -hardcode_libdir_separator_RC \ -exclude_expsyms_CXX \ -exclude_expsyms_RC \ -include_expsyms_CXX \ -include_expsyms_RC \ -file_list_spec_CXX \ -file_list_spec_RC \ -compiler_lib_search_dirs_CXX \ -compiler_lib_search_dirs_RC \ -predep_objects_CXX \ -predep_objects_RC \ -postdep_objects_CXX \ -postdep_objects_RC \ -predeps_CXX \ -predeps_RC \ -postdeps_CXX \ -postdeps_RC \ -compiler_lib_search_path_CXX \ -compiler_lib_search_path_RC; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in reload_cmds \ -old_postinstall_cmds \ -old_postuninstall_cmds \ -old_archive_cmds \ -extract_expsyms_cmds \ -old_archive_from_new_cmds \ -old_archive_from_expsyms_cmds \ -archive_cmds \ -archive_expsym_cmds \ -module_cmds \ -module_expsym_cmds \ -export_symbols_cmds \ -prelink_cmds \ -postlink_cmds \ -postinstall_cmds \ -postuninstall_cmds \ -finish_cmds \ -sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -reload_cmds_CXX \ -reload_cmds_RC \ -old_archive_cmds_CXX \ -old_archive_cmds_RC \ -old_archive_from_new_cmds_CXX \ -old_archive_from_new_cmds_RC \ -old_archive_from_expsyms_cmds_CXX \ -old_archive_from_expsyms_cmds_RC \ -archive_cmds_CXX \ -archive_cmds_RC \ -archive_expsym_cmds_CXX \ -archive_expsym_cmds_RC \ -module_cmds_CXX \ -module_cmds_RC \ -module_expsym_cmds_CXX \ -module_expsym_cmds_RC \ -export_symbols_cmds_CXX \ -export_symbols_cmds_RC \ -prelink_cmds_CXX \ -prelink_cmds_RC \ -postlink_cmds_CXX \ -postlink_cmds_RC; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' - -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - - - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile' - - - - - - - - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "src/sndfile.h") CONFIG_FILES="$CONFIG_FILES src/sndfile.h" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/GSM610/Makefile") CONFIG_FILES="$CONFIG_FILES src/GSM610/Makefile" ;; - "src/G72x/Makefile") CONFIG_FILES="$CONFIG_FILES src/G72x/Makefile" ;; - "src/version-metadata.rc") CONFIG_FILES="$CONFIG_FILES src/version-metadata.rc" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "regtest/Makefile") CONFIG_FILES="$CONFIG_FILES regtest/Makefile" ;; - "M4/Makefile") CONFIG_FILES="$CONFIG_FILES M4/Makefile" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "Win32/Makefile") CONFIG_FILES="$CONFIG_FILES Win32/Makefile" ;; - "Octave/Makefile") CONFIG_FILES="$CONFIG_FILES Octave/Makefile" ;; - "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; - "doc/libsndfile.css") CONFIG_FILES="$CONFIG_FILES doc/libsndfile.css" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "libsndfile.spec") CONFIG_FILES="$CONFIG_FILES libsndfile.spec" ;; - "sndfile.pc") CONFIG_FILES="$CONFIG_FILES sndfile.pc" ;; - "tests/test_wrapper.sh") CONFIG_FILES="$CONFIG_FILES tests/test_wrapper.sh" ;; - "tests/pedantic-header-test.sh") CONFIG_FILES="$CONFIG_FILES tests/pedantic-header-test.sh" ;; - "build-test-tarball.mk") CONFIG_FILES="$CONFIG_FILES build-test-tarball.mk" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF - -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. - -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 - fi -# Compute "$ac_file"'s index in $config_headers. -_am_arg="$ac_file" -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - - - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} - ;; - "libtool":C) - - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -# The names of the tagged configurations supported by this script. -available_tags="CXX RC " - -# ### BEGIN LIBTOOL CONFIG - -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# What type of objects to build. -pic_mode=$pic_mode - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that protects backslashes. -ECHO=$lt_ECHO - -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="\$SED -e 1s/^X//" - -# A grep program that handles long lines. -GREP=$lt_GREP - -# An ERE matcher. -EGREP=$lt_EGREP - -# A literal string matcher. -FGREP=$lt_FGREP - -# A BSD- or MS-compatible name lister. -NM=$lt_NM - -# Whether we need soft or hard links. -LN_S=$lt_LN_S - -# What is the maximum length of a command? -max_cmd_len=$max_cmd_len - -# Object file suffix (normally "o"). -objext=$ac_objext - -# Executable file suffix (normally ""). -exeext=$exeext - -# whether the shell understands "unset". -lt_unset=$lt_unset - -# turn spaces into newlines. -SP2NL=$lt_lt_SP2NL - -# turn newlines into spaces. -NL2SP=$lt_lt_NL2SP - -# convert \$build file names to \$host format. -to_host_file_cmd=$lt_cv_to_host_file_cmd - -# convert \$build files to toolchain format. -to_tool_file_cmd=$lt_cv_to_tool_file_cmd - -# An object symbol dumper. -OBJDUMP=$lt_OBJDUMP - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method = "file_magic". -file_magic_cmd=$lt_file_magic_cmd - -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob=$lt_file_magic_glob - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob=$lt_want_nocaseglob - -# DLL creation program. -DLLTOOL=$lt_DLLTOOL - -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd - -# The archiver. -AR=$lt_AR - -# Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS - -# How to feed a file listing to the archiver. -archiver_list_spec=$lt_archiver_list_spec - -# A symbol stripping program. -STRIP=$lt_STRIP - -# Commands used to install an old-style archive. -RANLIB=$lt_RANLIB -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction - -# A C compiler. -LTCC=$lt_CC - -# LTCC compiler flags. -LTCFLAGS=$lt_CFLAGS - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration. -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -# Specify filename containing input files for \$NM. -nm_file_list_spec=$lt_nm_file_list_spec - -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot=$lt_sysroot - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# Used to examine libraries when file_magic_cmd begins with "file". -MAGIC_CMD=$MAGIC_CMD - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Manifest tool. -MANIFEST_TOOL=$lt_MANIFEST_TOOL - -# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -DSYMUTIL=$lt_DSYMUTIL - -# Tool to change global to local symbols on Mac OS X. -NMEDIT=$lt_NMEDIT - -# Tool to manipulate fat objects and archives on Mac OS X. -LIPO=$lt_LIPO - -# ldd/readelf like tool for Mach-O binaries on Mac OS X. -OTOOL=$lt_OTOOL - -# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -OTOOL64=$lt_OTOOL64 - -# Old archive suffix (normally "a"). -libext=$libext - -# Shared library suffix (normally ".so"). -shrext_cmds=$lt_shrext_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at link time. -variables_saved_for_relink=$lt_variables_saved_for_relink - -# Do we need the "lib" prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Library versioning type. -version_type=$version_type - -# Shared library runtime path variable. -runpath_var=$runpath_var - -# Shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode - -# Command to use after installation of a shared archive. -postinstall_cmds=$lt_postinstall_cmds - -# Command to use after uninstallation of a shared archive. -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# As "finish_cmds", except a single script fragment to be evaled but -# not shown. -finish_eval=$lt_finish_eval - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Compile-time system search path for libraries. -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - - -# The linker used to build libraries. -LD=$lt_LD - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds - -# A language specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU compiler? -with_gcc=$GCC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - -ltmain="$ac_aux_dir/ltmain.sh" - - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# How to create reloadable object files. -reload_flag=$lt_reload_flag_CXX -reload_cmds=$lt_reload_cmds_CXX - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX - -# A language specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds_CXX - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF - - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: RC - -# The linker used to build libraries. -LD=$lt_LD_RC - -# How to create reloadable object files. -reload_flag=$lt_reload_flag_RC -reload_cmds=$lt_reload_cmds_RC - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_RC - -# A language specific compiler. -CC=$lt_compiler_RC - -# Is the compiler the GNU compiler? -with_gcc=$GCC_RC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_RC - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_RC - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_RC - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_RC - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_RC - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_RC -archive_expsym_cmds=$lt_archive_expsym_cmds_RC - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_RC -module_expsym_cmds=$lt_module_expsym_cmds_RC - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_RC - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_RC - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_RC - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_RC - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_RC - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_RC - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_RC - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_RC - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_RC - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_RC - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_RC - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_RC - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_RC - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_RC - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_RC - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds_RC - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_RC - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_RC - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_RC -postdep_objects=$lt_postdep_objects_RC -predeps=$lt_predeps_RC -postdeps=$lt_postdeps_RC - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC - -# ### END LIBTOOL TAG CONFIG: RC -_LT_EOF - - ;; - - esac -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - - -# Make sure these are executable. -chmod u+x tests/test_wrapper.sh build-test-tarball.mk - -#==================================================================================== - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: --=-=-=-=-=-=-=-=-=-= Configuration Complete =-=-=-=-=-=-=-=-=-=- - - Configuration summary : - - libsndfile version : .................. ${VERSION} - - Host CPU : ............................ ${host_cpu} - Host Vendor : ......................... ${host_vendor} - Host OS : ............................. ${host_os} - - Experimental code : ................... ${enable_experimental:-no} - Using ALSA in example programs : ...... ${enable_alsa:-no} - External FLAC/Ogg/Vorbis : ............ ${enable_external_libs:-no} -" >&5 -$as_echo " --=-=-=-=-=-=-=-=-=-= Configuration Complete =-=-=-=-=-=-=-=-=-=- - - Configuration summary : - - libsndfile version : .................. ${VERSION} - - Host CPU : ............................ ${host_cpu} - Host Vendor : ......................... ${host_vendor} - Host OS : ............................. ${host_os} - - Experimental code : ................... ${enable_experimental:-no} - Using ALSA in example programs : ...... ${enable_alsa:-no} - External FLAC/Ogg/Vorbis : ............ ${enable_external_libs:-no} -" >&6; } - -if test -z "$PKG_CONFIG" ; then - echo " *****************************************************************" - echo " *** The pkg-config program is missing. ***" - echo " *** External FLAC/Ogg/Vorbis libs cannot be found without it. ***" - echo " *** http://pkg-config.freedesktop.org/wiki/ ***" - echo " *****************************************************************" - echo - fi - -if test x$ac_cv_c_compiler_gnu = xyes ; then - echo " Tools :" - echo - echo " Compiler is GCC : ..................... ${ac_cv_c_compiler_gnu}" - echo " GCC version : ......................... ${GCC_VERSION}" - if test $GCC_MAJOR_VERSION -lt 3 ; then - echo "\n" - echo " ** This compiler version allows applications to write" - echo " ** to static strings within the library." - echo " ** Compile with GCC version 3.X or above to avoid this problem." - fi - fi - -if test $libdir = "\${exec_prefix}/lib" ; then - libdir="$prefix/lib" - fi - -if test $bindir = "\${exec_prefix}/bin" ; then - bindir="$prefix/bin" - fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: - Installation directories : - - Library directory : ................... $libdir - Program directory : ................... $bindir - Pkgconfig directory : ................. $libdir/pkgconfig - HTML docs directory : ................. $htmldocdir -" >&5 -$as_echo " - Installation directories : - - Library directory : ................... $libdir - Program directory : ................... $bindir - Pkgconfig directory : ................. $libdir/pkgconfig - HTML docs directory : ................. $htmldocdir -" >&6; } - -if test x$prefix != "x/usr" ; then - echo "Compiling some other packages against libsndfile may require" - echo "the addition of '$libdir/pkgconfig' to the" - echo "PKG_CONFIG_PATH environment variable." - echo - fi - -#(cd src && make genfiles) -#(cd tests && make genfiles) diff --git a/lib-src/libsndfile/configure.ac b/lib-src/libsndfile/configure.ac index 92dd4ab01..584ffdb67 100644 --- a/lib-src/libsndfile/configure.ac +++ b/lib-src/libsndfile/configure.ac @@ -1,636 +1,700 @@ -# Copyright (C) 1999-2011 Erik de Castro Lopo (erikd AT mega-nerd DOT com). +dnl Copyright (C) 1999-2019 Erik de Castro Lopo . -dnl Require autoconf version -AC_PREREQ(2.57) +dnl Require autoconf version >= 2.69 +AC_PREREQ([2.69]) -AC_INIT([libsndfile],[1.0.24],[sndfile@mega-nerd.com], +AC_INIT([libsndfile],[1.0.29pre2],[sndfile@mega-nerd.com], [libsndfile],[http://www.mega-nerd.com/libsndfile/]) -# Put config stuff in Cfg. -AC_CONFIG_AUX_DIR(Cfg) +dnl Check whether we want to set defaults for CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS +AC_MSG_CHECKING([whether configure should try to set CFLAGS/CXXFLAGS/CPPFLAGS/LDFLAGS]) +AS_IF([test "x${CFLAGS+set}" = "xset" || test "x${CXXFLAGS+set}" = "xset" || test "x${CPPFLAGS+set}" = "xset" || test "x${LDFLAGS+set}" = "xset"], [ + enable_flags_setting=no + : ${CFLAGS=""} + : ${CXXFLAGS=""} + ], [ + enable_flags_setting=yes + dnl Set to empty flags so AC_PROG_CC and + dnl AC_PROG_CXX do not add -g -O2 + CFLAGS="" + CXXFLAGS="" + ]) +AC_MSG_RESULT([${enable_flags_setting}]) + +dnl Put config stuff in 'build-aux'. +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([src/sndfile.c]) -AC_CANONICAL_TARGET([]) +AC_CANONICAL_HOST -AC_CONFIG_MACRO_DIR([M4]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([src/config.h]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([1.14 foreign dist-bzip2 no-dist-gzip serial-tests subdir-objects]) AM_SILENT_RULES([yes]) -dnl Audacity policy: don't enable automatic rebuild of configure et al if -dnl sources change -AM_MAINTAINER_MODE([disable]) - -AC_LANG([C]) +dnl ==================================================================================== AC_PROG_CC -AM_PROG_CC_C_O +AC_PROG_CC_C99 + +AS_IF([test "x$ac_cv_prog_cc_c99" = "xno"], [ + AC_MSG_ERROR([libsndfile requires a C99 capable compiler!]) + ]) + +AC_USE_SYSTEM_EXTENSIONS AC_PROG_CXX + +AC_LANG([C]) +AX_COMPILER_VENDOR +AX_COMPILER_VERSION + +AC_LANG_PUSH([C++]) +AX_COMPILER_VENDOR +AX_COMPILER_VERSION +AC_LANG_POP([C++]) + AC_PROG_SED +AM_PROG_AR -# Do not check for F77. -define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl - -AM_PROG_LIBTOOL +LT_INIT([win32-dll]) LT_PROG_RC -AC_CHECK_PROG(HAVE_AUTOGEN, autogen, yes, no) -AC_CHECK_PROG(HAVE_WINE, wine, yes, no) - AC_PROG_INSTALL AC_PROG_LN_S -#------------------------------------------------------------------------------------ -# Rules for library version information: -# -# 1. Start with version information of `0:0:0' for each libtool library. -# 2. Update the version information only immediately before a public release of -# your software. More frequent updates are unnecessary, and only guarantee -# that the current interface number gets larger faster. -# 3. If the library source code has changed at all since the last update, then -# increment revision (`c:r:a' becomes `c:r+1:a'). -# 4. If any interfaces have been added, removed, or changed since the last update, -# increment current, and set revision to 0. -# 5. If any interfaces have been added since the last public release, then increment -# age. -# 6. If any interfaces have been removed since the last public release, then set age -# to 0. +AM_PATH_PYTHON + +AC_CHECK_PROG([HAVE_AUTOGEN], [autogen], [yes], [no]) +AC_CHECK_PROG([HAVE_WINE], [wine], [yes], [no]) +AC_CHECK_PROG([HAVE_XCODE_SELECT], [xcode-select], [yes], [no]) + +dnl ------------------------------------------------------------------------------------ +dnl Rules for library version information: +dnl +dnl 1. Start with version information of `0:0:0' for each libtool library. +dnl 2. Update the version information only immediately before a public release of +dnl your software. More frequent updates are unnecessary, and only guarantee +dnl that the current interface number gets larger faster. +dnl 3. If the library source code has changed at all since the last update, then +dnl increment revision (`c:r:a' becomes `c:r+1:a'). +dnl 4. If any interfaces have been added, removed, or changed since the last update, +dnl increment current, and set revision to 0. +dnl 5. If any interfaces have been added since the last public release, then increment +dnl age. +dnl 6. If any interfaces have been removed since the last public release, then set age +dnl to 0. CLEAN_VERSION=`echo $PACKAGE_VERSION | $SED "s/p.*//"` +VERSION_MAJOR=`echo $PACKAGE_VERSION | $SED "s/\..*//"` VERSION_MINOR=`echo $CLEAN_VERSION | $SED "s/.*\.//"` +GEN_TOOL="autoconf" -SHARED_VERSION_INFO="1:$VERSION_MINOR:0" +SHARED_VERSION_INFO="$VERSION_MAJOR:$VERSION_MINOR:0" -#------------------------------------------------------------------------------------ +dnl ------------------------------------------------------------------------------------ AC_HEADER_STDC -AC_CHECK_HEADERS(endian.h) -AC_CHECK_HEADERS(byteswap.h) -AC_CHECK_HEADERS(locale.h) -AC_CHECK_HEADERS(sys/time.h) +AC_CHECK_HEADERS([endian.h]) +AC_CHECK_HEADERS([byteswap.h]) +AC_CHECK_HEADERS([locale.h]) +AC_CHECK_HEADERS([sys/time.h]) AC_HEADER_SYS_WAIT -AC_CHECK_DECLS(S_IRGRP) -if test x$ac_cv_have_decl_S_IRGRP = xyes ; then - AC_DEFINE_UNQUOTED([HAVE_DECL_S_IRGRP],1,[Set to 1 if S_IRGRP is defined.]) -else - AC_DEFINE_UNQUOTED([HAVE_DECL_S_IRGRP],0) - fi +AC_CHECK_DECLS([S_IRGRP]) +AS_IF([test "x$ac_cv_have_decl_S_IRGRP" = "xyes"], [ + AC_DEFINE_UNQUOTED([HAVE_DECL_S_IRGRP], [1], [Set to 1 if S_IRGRP is defined.]) + ], [ + AC_DEFINE_UNQUOTED([HAVE_DECL_S_IRGRP], [0], [Set to 0 if S_IRGRP is not defined.]) + ]) AM_CONDITIONAL([LINUX_MINGW_CROSS_TEST], - [test "$build_os:$target_os:$host_os:$HAVE_WINE" = "linux-gnu:mingw32msvc:mingw32msvc:yes"]) + [test "x${build_os}:${host_os}:${HAVE_WINE}" = "xlinux-gnu:mingw32msvc:yes"]) -#==================================================================================== -# Check for support of the struct hack. - -MN_C99_FLEXIBLE_ARRAY - -if test x$ac_cv_c99_flexible_array = xyes ; then - AC_DEFINE([HAVE_FLEXIBLE_ARRAY],1, [Set to 1 if the compile supports the struct hack.]) -else - AC_MSG_WARN([[*** This compiler does not support the 1999 ISO C Standard ***]]) - AC_MSG_WARN([[*** feature known as the flexible array struct member. ***]]) - AC_DEFINE([HAVE_FLEXIBLE_ARRAY],0) - fi - -#==================================================================================== -# Couple of initializations here. Fill in real values later. +dnl ==================================================================================== +dnl Couple of initializations here. Fill in real values later. SHLIB_VERSION_ARG="" -#==================================================================================== -# Finished checking, handle options. +dnl ==================================================================================== +dnl Finished checking, handle options. AC_ARG_ENABLE(experimental, - AC_HELP_STRING([--enable-experimental], [enable experimental code])) + AS_HELP_STRING([--enable-experimental], [enable experimental code])) -EXPERIMENTAL_CODE=0 -if test x$enable_experimental = xyes ; then - EXPERIMENTAL_CODE=1 - fi -AC_DEFINE_UNQUOTED([ENABLE_EXPERIMENTAL_CODE],${EXPERIMENTAL_CODE}, [Set to 1 to enable experimental code.]) +AS_IF([test "x$enable_experimental" = "xyes"], [ + EXPERIMENTAL_CODE=1 + ], [ + EXPERIMENTAL_CODE=0 + ]) +AC_DEFINE_UNQUOTED([ENABLE_EXPERIMENTAL_CODE], [${EXPERIMENTAL_CODE}], [Set to 1 to enable experimental code.]) -AC_ARG_ENABLE(gcc-werror, - AC_HELP_STRING([--enable-gcc-werror], [enable -Werror in all Makefiles])) +AC_ARG_ENABLE([werror], + [AS_HELP_STRING([--enable-werror], [enable -Werror in all Makefiles])]) -AC_ARG_ENABLE(gcc-pipe, - AC_HELP_STRING([--disable-gcc-pipe], [disable gcc -pipe option])) +AC_ARG_ENABLE([stack-smash-protection], + [AS_HELP_STRING([--enable-stack-smash-protection], [Enable GNU GCC stack smash protection])]) -AC_ARG_ENABLE(gcc-opt, - AC_HELP_STRING([--disable-gcc-opt], [disable gcc optimisations])) +AC_ARG_ENABLE([cpu-clip], + [AS_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific clipper])]) -AC_ARG_ENABLE(cpu-clip, - AC_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific clipper])) +AC_ARG_ENABLE([bow-docs], + [AS_HELP_STRING([--enable-bow-docs], [enable black-on-white html docs])]) -AC_ARG_ENABLE(bow-docs, - AC_HELP_STRING([--enable-bow-docs], [enable black-on-white html docs])) +AC_ARG_ENABLE([sqlite], + [AS_HELP_STRING([--disable-sqlite], [disable use of sqlite])]) -AC_ARG_ENABLE(sqlite, - AC_HELP_STRING([--disable-sqlite], [disable use of sqlite])) +AC_ARG_ENABLE([alsa], + [AS_HELP_STRING([--disable-alsa], [disable ALSA support (default=autodetect)])], [], [enable_alsa=auto]) -AC_ARG_ENABLE(alsa, - AC_HELP_STRING([--disable-alsa], [disable use of ALSA])) - -AC_ARG_ENABLE(external-libs, - AC_HELP_STRING([--disable-external-libs], [disable use of FLAC, Ogg and Vorbis [[default=no]]])) +AC_ARG_ENABLE([external-libs], + [AS_HELP_STRING([--disable-external-libs], [disable use of FLAC, Ogg and Vorbis [[default=no]]])]) AC_ARG_ENABLE(octave, - AC_HELP_STRING([--enable-octave], [disable building of GNU Octave module])) + [AS_HELP_STRING([--enable-octave], [enable building of GNU Octave module])]) -AC_ARG_ENABLE(test-coverage, - AC_HELP_STRING([--enable-test-coverage], [enable test coverage])) -AM_CONDITIONAL([ENABLE_TEST_COVERAGE], [test "$enable_test_coverage" = yes]) +AC_ARG_ENABLE([full-suite], + [AS_HELP_STRING([--disable-full-suite], [disable building and installing programs, documentation, only build library [[default=no]]])]) +AM_CONDITIONAL([FULL_SUITE], [test "x$enable_full_suite" != "xno"]) -#==================================================================================== -# Check types and their sizes. +AC_ARG_ENABLE([test-coverage], + [AS_HELP_STRING([--enable-test-coverage], [enable test coverage])]) +AM_CONDITIONAL([ENABLE_TEST_COVERAGE], [test "x$enable_test_coverage" = "xyes"]) -AC_CHECK_SIZEOF(wchar_t,4) -AC_CHECK_SIZEOF(short,2) -AC_CHECK_SIZEOF(int,4) -AC_CHECK_SIZEOF(long,4) -AC_CHECK_SIZEOF(float,4) -AC_CHECK_SIZEOF(double,4) -AC_CHECK_SIZEOF(void*,8) -AC_CHECK_SIZEOF(size_t,4) -AC_CHECK_SIZEOF(int64_t,8) -AC_CHECK_SIZEOF(long long,8) +dnl ==================================================================================== +dnl Check types and their sizes. -#==================================================================================== -# Find an appropriate type for sf_count_t. -# On systems supporting files larger than 2 Gig, sf_count_t must be a 64 bit value. -# Unfortunately there is more than one way of ensuring this so need to do some -# pretty rigourous testing here. +AC_CHECK_SIZEOF([wchar_t], [4]) +AC_CHECK_SIZEOF([short], [2]) +AC_CHECK_SIZEOF([int], [4]) +AC_CHECK_SIZEOF([long], [4]) +AC_CHECK_SIZEOF([float], [4]) +AC_CHECK_SIZEOF([double], [4]) +AC_CHECK_SIZEOF([void*], [8]) +AC_CHECK_SIZEOF([size_t], [4]) +AC_CHECK_SIZEOF([int64_t], [8]) +AC_CHECK_SIZEOF([long long], [8]) -unset ac_cv_sizeof_off_t +dnl ==================================================================================== +dnl Find an appropriate type for sf_count_t. +dnl On systems supporting files larger than 2 Gig, sf_count_t must be a 64 bit value. +dnl Unfortunately there is more than one way of ensuring this so need to do some +dnl pretty rigourous testing here. -AC_CHECK_SIZEOF(off_t,1) # Fake default value. +dnl Check for common 64 bit file offset types. +AC_CHECK_SIZEOF([off_t], [1]) -case "$host_os" in - mingw32msvc | mingw32) +AS_IF([test "x$enable_largefile:$ac_cv_sizeof_off_t" = "xno:8"], [ + AC_MSG_ERROR(["Error : Cannot disable large file support because sizeof (off_t) == 8."]) + ]) + +AS_CASE([$host_os], + [mingw32*], [ TYPEOF_SF_COUNT_T="__int64" SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" SIZEOF_SF_COUNT_T=8 - AC_DEFINE([__USE_MINGW_ANSI_STDIO],1,[Set to 1 to use C99 printf/snprintf in MinGW.]) - ;; - *) - if test "x$ac_cv_sizeof_off_t" = "x8" ; then - # If sizeof (off_t) is 8, no further checking is needed. - TYPEOF_SF_COUNT_T="int64_t" - SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" - SIZEOF_SF_COUNT_T=8 - else - # Check for common 64 bit file offset types. - AC_CHECK_SIZEOF(loff_t,1) # Fake default value. - AC_CHECK_SIZEOF(off64_t,1) # Fake default value. + AC_DEFINE([__USE_MINGW_ANSI_STDIO], [1], [Set to 1 to use C99 printf/snprintf in MinGW.]) + ], - TYPEOF_SF_COUNT_T="unknown" - if test "x$ac_cv_sizeof_loff_t" = "x8" ; then + [linux-android*], [ + TYPEOF_SF_COUNT_T="int64_t" + SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" + SIZEOF_SF_COUNT_T=8 + ], + + [ + SIZEOF_SF_COUNT_T=0 + AS_IF([test "x$ac_cv_sizeof_off_t" = "x8"], [ + dnl If sizeof (off_t) is 8, no further checking is needed. TYPEOF_SF_COUNT_T="int64_t" - SIZEOF_SF_COUNT_T=8 - elif test "x$ac_cv_sizeof_off64_t" = "x8" ; then - TYPEOF_SF_COUNT_T="int64_t" - SIZEOF_SF_COUNT_T=8 - fi - - # Save the old sizeof (off_t) value and then unset it to see if it - # changes when Large File Support is enabled. - - pre_largefile_sizeof_off_t=$ac_cv_sizeof_off_t - unset ac_cv_sizeof_off_t - - AC_SYS_EXTRA_LARGEFILE - - if test "x$ac_cv_sys_largefile_CFLAGS" = "xno" ; then - ac_cv_sys_largefile_CFLAGS="" - fi - if test "x$ac_cv_sys_largefile_LDFLAGS" = "xno" ; then - ac_cv_sys_largefile_LDFLAGS="" - fi - if test "x$ac_cv_sys_largefile_LIBS" = "xno" ; then - ac_cv_sys_largefile_LIBS="" - fi - - AC_CHECK_SIZEOF(off_t,1) # Fake default value. - - if test "x$ac_cv_sizeof_off_t" = "x8" ; then SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" - elif test "x$ac_cv_sizeof_off_t" = "x$pre_largefile_sizeof_off_t" ; then - AC_MSG_WARN([[This machine does not seem to support 64 bit file offsets.]]) - TYPEOF_SF_COUNT_T="off_t" - SIZEOF_SF_COUNT_T=$ac_cv_sizeof_off_t - elif test "x$TYPEOF_SF_COUNT_T" = "xunknown" ; then - echo - echo "*** The configure process has determined that this system is capable" - echo "*** of Large File Support but has not been able to find a type which" - echo "*** is an unambiguous 64 bit file offset." - echo "*** Please contact the author to help resolve this problem." - echo - AC_MSG_ERROR([[Bad file offset type.]]) - fi - fi - ;; - esac + SIZEOF_SF_COUNT_T=8 + ], [ + dnl Save the old sizeof (off_t) value and then unset it to see if it + dnl changes when Large File Support is enabled. + pre_largefile_sizeof_off_t=$ac_cv_sizeof_off_t + unset ac_cv_sizeof_off_t -if test $SIZEOF_SF_COUNT_T = 4 ; then - SF_COUNT_MAX="0x7FFFFFFF" - fi + AC_SYS_LARGEFILE + AS_IF([test "x$ac_cv_sys_largefile_CFLAGS" = "xno"], [ + ac_cv_sys_largefile_CFLAGS="" + ]) + AS_IF([test "x$ac_cv_sys_largefile_LDFLAGS" = "xno"], [ + ac_cv_sys_largefile_LDFLAGS="" + ]) + AS_IF([test "x$ac_cv_sys_largefile_LIBS" = "xno"], [ + ac_cv_sys_largefile_LIBS="" + ]) -AC_DEFINE_UNQUOTED([TYPEOF_SF_COUNT_T],${TYPEOF_SF_COUNT_T}, [Set to long if unknown.]) + AC_CHECK_SIZEOF(off_t,1) + + AS_IF([test "x$ac_cv_sizeof_off_t" = "x8"], [ + TYPEOF_SF_COUNT_T="int64_t" + SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" + SIZEOF_SF_COUNT_T=8 + ], [test "x$TYPEOF_SF_COUNT_T" = "xunknown"], [ + AS_ECHO([""]) + AS_ECHO(["*** The configure process has determined that this system is capable"]) + AS_ECHO(["*** of Large File Support but has not been able to find a type which"]) + AS_ECHO(["*** is an unambiguous 64 bit file offset."]) + AS_ECHO(["*** Please contact the author to help resolve this problem."]) + AS_ECHO([""]) + AC_MSG_ERROR([[Bad file offset type.]]) + ]) + ]) + ]) + +AS_CASE([$host_vendor], + [vita], [ + TYPEOF_SF_COUNT_T="int64_t" + SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" + SIZEOF_SF_COUNT_T=8 + ]) + +AS_IF([test "x$SIZEOF_SF_COUNT_T" = "x4"], [ + SF_COUNT_MAX="0x7FFFFFFF" + ]) + +AC_DEFINE_UNQUOTED([TYPEOF_SF_COUNT_T], [${TYPEOF_SF_COUNT_T}], [Set to long if unknown.]) AC_SUBST(TYPEOF_SF_COUNT_T) -AC_DEFINE_UNQUOTED([SIZEOF_SF_COUNT_T],${SIZEOF_SF_COUNT_T}, [Set to sizeof (long) if unknown.]) +AC_DEFINE_UNQUOTED([SIZEOF_SF_COUNT_T], [${SIZEOF_SF_COUNT_T}], [Set to sizeof (long) if unknown.]) AC_SUBST(SIZEOF_SF_COUNT_T) -AC_DEFINE_UNQUOTED([SF_COUNT_MAX],${SF_COUNT_MAX}, [Set to maximum allowed value of sf_count_t type.]) +AC_DEFINE_UNQUOTED([SF_COUNT_MAX], [${SF_COUNT_MAX}], [Set to maximum allowed value of sf_count_t type.]) AC_SUBST(SF_COUNT_MAX) -AC_CHECK_TYPES(ssize_t) -AC_CHECK_SIZEOF(ssize_t,4) +AC_TYPE_SSIZE_T -#==================================================================================== -# Determine endian-ness of target processor. +dnl ==================================================================================== +dnl Determine endian-ness of host processor. -MN_C_FIND_ENDIAN +AC_C_BIGENDIAN([ + dnl big-endian + ac_cv_c_big_endian=1 + ac_cv_c_little_endian=0 + ], [ + dnl little-endian + ac_cv_c_big_endian=0 + ac_cv_c_little_endian=1 + ]) -AC_DEFINE_UNQUOTED(CPU_IS_BIG_ENDIAN, ${ac_cv_c_big_endian}, - [Target processor is big endian.]) -AC_DEFINE_UNQUOTED(CPU_IS_LITTLE_ENDIAN, ${ac_cv_c_little_endian}, - [Target processor is little endian.]) -AC_DEFINE_UNQUOTED(WORDS_BIGENDIAN, ${ac_cv_c_big_endian}, - [Target processor is big endian.]) +AC_DEFINE_UNQUOTED([CPU_IS_BIG_ENDIAN], [${ac_cv_c_big_endian}], [Host processor is big endian.]) +AC_DEFINE_UNQUOTED([CPU_IS_LITTLE_ENDIAN], [${ac_cv_c_little_endian}], [Host processor is little endian.]) -#==================================================================================== -# Check for functions. +dnl ==================================================================================== +dnl Check for functions. -AC_CHECK_FUNCS(malloc calloc realloc free) -AC_CHECK_FUNCS(open read write lseek pread pwrite) -AC_CHECK_FUNCS(fstat ftruncate fsync) -AC_CHECK_FUNCS(snprintf vsnprintf) -AC_CHECK_FUNCS(gmtime gmtime_r localtime localtime_r gettimeofday) -AC_CHECK_FUNCS(mmap getpagesize) -AC_CHECK_FUNCS(setlocale) -AC_CHECK_FUNCS(pipe waitpid) +AC_CHECK_FUNCS([malloc calloc realloc free]) +AC_CHECK_FUNCS([open read write lseek lseek64]) +AC_CHECK_FUNCS([fstat fstat64 ftruncate fsync]) +AC_CHECK_FUNCS([snprintf vsnprintf]) +AC_CHECK_FUNCS([gmtime gmtime_r localtime localtime_r gettimeofday]) +AC_CHECK_FUNCS([mmap getpagesize]) +AC_CHECK_FUNCS([setlocale]) +AC_CHECK_FUNCS([pipe waitpid]) -AC_CHECK_LIB([m],floor) -AC_CHECK_FUNCS(floor ceil fmod) +AC_SEARCH_LIBS([floor], [m], [], [ + AC_MSG_ERROR([unable to find the floor() function!]) + ]) +AC_CHECK_FUNCS([floor ceil fmod lrint lrintf]) -MN_C99_FUNC_LRINT -MN_C99_FUNC_LRINTF - -#==================================================================================== -# Check for requirements for building plugins for other languages/enviroments. +dnl ==================================================================================== +dnl Check for requirements for building plugins for other languages/enviroments. dnl Octave maths environment http://www.octave.org/ -if test x$cross_compiling = xno ; then - if test x$enable_octave = xno ; then +AS_IF([test "x$cross_compiling" = "xno"], [ + AS_IF([test "x$enable_octave" = "xno"], [ + AM_CONDITIONAL(BUILD_OCTAVE_MOD, false) + ], [ + AC_OCTAVE_BUILD + ]) + ], [ AM_CONDITIONAL(BUILD_OCTAVE_MOD, false) - else - AC_OCTAVE_BUILD - fi -else - AM_CONDITIONAL(BUILD_OCTAVE_MOD, false) - fi + ]) -#==================================================================================== -# Check for Ogg, Vorbis and FLAC. +dnl ==================================================================================== +dnl Check for Ogg, Vorbis and FLAC. -HAVE_EXTERNAL_LIBS=0 -EXTERNAL_CFLAGS="" -EXTERNAL_LIBS="" +HAVE_EXTERNAL_XIPH_LIBS=0 +EXTERNAL_XIPH_CFLAGS="" +EXTERNAL_XIPH_LIBS="" +EXTERNAL_XIPH_REQUIRE="" -# Check for pkg-config outside the if statement. +dnl Check for pkg-config outside the if statement. PKG_PROG_PKG_CONFIG +AX_REQUIRE_DEFINED([PKG_INSTALLDIR]) +PKG_INSTALLDIR -if test -n "$PKG_CONFIG" ; then - if test x$enable_external_libs = xno ; then - AC_MSG_WARN([[*** External libs (FLAC, Ogg, Vorbis) disabled. ***]]) - else - PKG_CHECK_MOD_VERSION(FLAC, flac >= 1.2.1, ac_cv_flac=yes, ac_cv_flac=no) - PKG_CHECK_MOD_VERSION(OGG, ogg >= 1.1.3, ac_cv_ogg=yes, ac_cv_ogg=no) +AS_IF([test -n "$PKG_CONFIG"], [ + AS_IF([test "x$enable_external_libs" = "xno"], [ + AC_MSG_WARN([[*** External libs (FLAC, Ogg, Vorbis) disabled. ***]]) + ], [ + PKG_CHECK_MOD_VERSION(FLAC, flac >= 1.3.1, ac_cv_flac=yes, ac_cv_flac=no) - # Vorbis versions earlier than 1.2.3 have bugs that cause the libsndfile - # test suite to fail on MIPS, PowerPC and others. - # See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549899 - PKG_CHECK_MOD_VERSION(VORBIS, vorbis >= 1.2.3, ac_cv_vorbis=yes, ac_cv_vorbis=no) - PKG_CHECK_MOD_VERSION(VORBISENC, vorbisenc >= 1.2.3, ac_cv_vorbisenc=yes, ac_cv_vorbisenc=no) - enable_external_libs=yes - fi + dnl Make sure the FLAC_CFLAGS value is sane. + FLAC_CFLAGS=`echo $FLAC_CFLAGS | $SED "s|include/FLAC|include|"` -if test x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc = "xyesyesyesyes" ; then - HAVE_EXTERNAL_LIBS=1 - enable_external_libs=yes + PKG_CHECK_MOD_VERSION(OGG, ogg >= 1.3.0, ac_cv_ogg=yes, ac_cv_ogg=no) - EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBISENC_CFLAGS" - EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS" - else - echo - AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]]) - AC_MSG_WARN([[*** libvorbis) is either missing (possibly only the development]]) - AC_MSG_WARN([[*** headers) or is of an unsupported version.]]) - AC_MSG_WARN([[***]]) - AC_MSG_WARN([[*** Unfortunately, for ease of maintenance, the external libs]]) - AC_MSG_WARN([[*** are an all or nothing affair.]]) - echo - enable_external_libs=no - fi - fi + AS_IF([test "x$enable_experimental" = "xyes"], [ + PKG_CHECK_MOD_VERSION(SPEEX, speex >= 1.2, ac_cv_speex=yes, ac_cv_speex=no) + ], [ + SPEEX_CFLAGS="" + SPEEX_LIBS="" + ]) -AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_LIBS], $HAVE_EXTERNAL_LIBS, [Will be set to 1 if flac, ogg and vorbis are available.]) + dnl Vorbis versions earlier than 1.2.3 have bugs that cause the libsndfile + dnl test suite to fail on MIPS, PowerPC and others. + dnl See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549899 + PKG_CHECK_MOD_VERSION(VORBIS, vorbis >= 1.2.3, ac_cv_vorbis=yes, ac_cv_vorbis=no) + PKG_CHECK_MOD_VERSION(VORBISENC, vorbisenc >= 1.2.3, ac_cv_vorbisenc=yes, ac_cv_vorbisenc=no) -#==================================================================================== -# Check for libsqlite3 (only used in regtest). + PKG_CHECK_MOD_VERSION(OPUS, opus >= 1.1, ac_cv_opus=yes, ac_cv_opus=no) + enable_external_libs=yes + ]) -ac_cv_sqlite3=no -if test x$enable_sqlite != xno ; then - PKG_CHECK_MOD_VERSION(SQLITE3, sqlite3 >= 3.2, ac_cv_sqlite3=yes, ac_cv_sqlite3=no) - fi + AS_IF([test "x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc$ac_cv_opus" = "xyesyesyesyesyes"], [ + HAVE_EXTERNAL_XIPH_LIBS=1 + enable_external_libs=yes -if test x$ac_cv_sqlite3 = "xyes" ; then - HAVE_SQLITE3=1 -else - HAVE_SQLITE3=0 - fi + EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS " + EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS " + EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc opus" -AC_DEFINE_UNQUOTED([HAVE_SQLITE3],$HAVE_SQLITE3,[Set to 1 if you have libsqlite3.]) + if test x$ac_cv_speex = "xyes" ; then + EXTERNAL_XIPH_REQUIRE="$EXTERNAL_XIPH_REQUIRE speex" + fi + ], [ + AS_ECHO([""]) + AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]]) + AC_MSG_WARN([[*** libvorbis) is either missing (possibly only the development]]) + AC_MSG_WARN([[*** headers) or is of an unsupported version.]]) + AC_MSG_WARN([[***]]) + AC_MSG_WARN([[*** Unfortunately, for ease of maintenance, the external libs]]) + AC_MSG_WARN([[*** are an all or nothing affair.]]) + AS_ECHO([""]) + enable_external_libs=no + ]) + ]) -#==================================================================================== -# Determine if the processor can do clipping on float to int conversions. +AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_XIPH_LIBS], [$HAVE_EXTERNAL_XIPH_LIBS], [Will be set to 1 if flac, ogg, vorbis, and opus are available.]) -if test x$enable_cpu_clip != "xno" ; then - MN_C_CLIP_MODE -else - echo "checking processor clipping capabilities... disabled" - ac_cv_c_clip_positive=0 - ac_cv_c_clip_negative=0 - fi +dnl ==================================================================================== +dnl Check for libsqlite3 (only used in regtest). -AC_DEFINE_UNQUOTED(CPU_CLIPS_POSITIVE, ${ac_cv_c_clip_positive}, - [Target processor clips on positive float to int conversion.]) -AC_DEFINE_UNQUOTED(CPU_CLIPS_NEGATIVE, ${ac_cv_c_clip_negative}, - [Target processor clips on negative float to int conversion.]) +ac_cv_sqlite3=0 +AS_IF([test "x$enable_sqlite" != "xno"], [ + PKG_CHECK_MOD_VERSION([SQLITE3], [sqlite3 >= 3.2], [ac_cv_sqlite3=1], [ac_cv_sqlite3=0]) + ]) -#==================================================================================== -# Target OS specific stuff. +AC_DEFINE_UNQUOTED([HAVE_SQLITE3], [${ac_cv_sqlite3}], [Set to 1 if you have libsqlite3.]) +AM_CONDITIONAL([HAVE_SQLITE3], [test "x$ac_cv_sqlite3" = "x1"]) + +dnl ==================================================================================== +dnl Determine if the processor can do clipping on float to int conversions. + +AS_IF([test "x$enable_cpu_clip" != "xno"], [ + MN_C_CLIP_MODE + ], [ + AS_ECHO(["checking processor clipping capabilities... disabled"]) + ac_cv_c_clip_positive=0 + ac_cv_c_clip_negative=0 + ]) + +AC_DEFINE_UNQUOTED([CPU_CLIPS_POSITIVE], [${ac_cv_c_clip_positive}], + [Host processor clips on positive float to int conversion.]) +AC_DEFINE_UNQUOTED([CPU_CLIPS_NEGATIVE], [${ac_cv_c_clip_negative}], + [Host processor clips on negative float to int conversion.]) + +dnl ==================================================================================== +dnl Host OS specific stuff. OS_SPECIFIC_CFLAGS="" OS_SPECIFIC_LINKS="" os_is_win32=0 -os_is_macosx=0 +os_is_openbsd=0 use_windows_api=0 - -case "$host_os" in - darwin* | rhapsody*) - os_is_macosx=1 - OS_SPECIFIC_CFLAGS="-I/Developer/Headers/FlatCarbon" - OS_SPECIFIC_LINKS="-framework CoreAudio" - ;; - mingw*) +AS_CASE([$host_os], + [darwin* | rhapsody*], [ + AS_IF([test "x$HAVE_XCODE_SELECT" = "xyes"], [ + developer_path=`xcode-select --print-path` + ], [ + developer_path="/Developer" + ]) + OS_SPECIFIC_LINKS="-framework CoreAudio -framework AudioToolbox -framework CoreFoundation"], + [mingw*], [ os_is_win32=1 use_windows_api=1 - OS_SPECIFIC_LINKS="-lwinmm" - ;; - esac - -AC_DEFINE_UNQUOTED(OS_IS_WIN32, ${os_is_win32}, [Set to 1 if compiling for Win32]) -AC_DEFINE_UNQUOTED(OS_IS_MACOSX, ${os_is_macosx}, [Set to 1 if compiling for MacOSX]) -AC_DEFINE_UNQUOTED(USE_WINDOWS_API, ${use_windows_api}, [Set to 1 to use the native windows API]) + OS_SPECIFIC_LINKS="-lwinmm"], + [openbsd*], [ + os_is_openbsd=1 + ]) +AC_DEFINE_UNQUOTED([OS_IS_WIN32], [${os_is_win32}], [Set to 1 if compiling for Win32]) +AC_DEFINE_UNQUOTED([OS_IS_OPENBSD], [${os_is_openbsd}], [Set to 1 if compiling for OpenBSD]) +AC_DEFINE_UNQUOTED([USE_WINDOWS_API], [${use_windows_api}], [Set to 1 to use the native windows API]) AM_CONDITIONAL(USE_WIN_VERSION_FILE, test ${use_windows_api} -eq 1) -#==================================================================================== -# Check for ALSA. +dnl ==================================================================================== +dnl Check for ALSA. -ALSA_LIBS="" +AS_IF([test "x$enable_alsa" != "xno"], [ + PKG_CHECK_MODULES([ALSA], [alsa], [ + dnl actually test whether ALSA really works, in + dnl order to dodge wrong cross-compilation pickups + save_CFLAGS="${CFLAGS}" + save_LIBS="${LIBS}" + CFLAGS="${CFLAGS} ${ALSA_CFLAGS}" + LIBS="${LIBS} ${ALSA_LIBS}" + AC_CHECK_HEADERS([alsa/asoundlib.h]) + AS_IF([test "x$ac_cv_header_alsa_asoundlib_h" = "xyes"], [ + dnl ALSA definitely works + AC_DEFINE([HAVE_ALSA], [1], [Set to 1 if you have alsa]) + alsa_works="yes" + ], [ + dnl picked up wrong ALSA + alsa_works="no" -if test x$enable_alsa != xno ; then - AC_CHECK_HEADERS(alsa/asoundlib.h) - if test x$ac_cv_header_alsa_asoundlib_h = xyes ; then - ALSA_LIBS="-lasound" - enable_alsa=yes - fi - fi + dnl reset flags + ALSA_CFLAGS="" + ALSA_LIBS="" + ]) + CFLAGS="${save_CFLAGS}" + LIBS="${save_LIBS}" + ], [ + dnl could not find ALSA + alsa_works="no" + ]) -#==================================================================================== -# Check for OpenBSD's sndio. + AS_IF([test "x$alsa_works" = "xno"], [ + AS_IF([test "x$enable_alsa" = "xyes"], [ + dnl explicitly passed --enable-alsa, hence error out loud and clearly + AC_MSG_ERROR([You explicitly requested alsa support, but alsa could not be found!]) + ], [ + dnl did not explicitly pass --enable-alsa, relying on default automagic on + enable_alsa="no (auto)" + ]) + ]) + ]) + +dnl ==================================================================================== +dnl Check for OpenBSD's sndio. SNDIO_LIBS="" -AC_CHECK_HEADERS(sndio.h) -if test x$ac_cv_header_sndio_h = xyes ; then - SNDIO_LIBS="-lsndio" - fi +HAVE_SNDIO_H=0 +AS_CASE([$host_os], + [openbsd*], [ + AC_CHECK_HEADERS(sndio.h) + AS_IF([test "x$ac_cv_header_sndio_h" = "xyes"], [ + SNDIO_LIBS="-lsndio" + HAVE_SNDIO_H=1 + ]) + ]) -#==================================================================================== -# Test for sanity when cross-compiling. +AC_DEFINE_UNQUOTED([HAVE_SNDIO_H], [${HAVE_SNDIO_H}], [Set to 1 if is available.]) -if test x$cross_compiling = xyes ; then - AC_MSG_WARN([[******************************************************************]]) - AC_MSG_WARN([[*** We are cross-compiling, so have to assume sizeof (short) == 2 ]]) - AC_MSG_WARN([[*** and sizeof (int) == 4. If this is not the case there is no ]]) - AC_MSG_WARN([[*** chance of this working. Please contact the mantainer. ]]) - AC_MSG_WARN([[******************************************************************]]) - fi +dnl ==================================================================================== +dnl Test for sanity when cross-compiling. -if test $ac_cv_sizeof_short != 2 ; then - AC_MSG_WARN([[******************************************************************]]) - AC_MSG_WARN([[*** sizeof (short) != 2. ]]) - AC_MSG_WARN([[******************************************************************]]) - fi +AS_IF([test "x$ac_cv_sizeof_short" != "x2"], [ + AC_MSG_WARN([[******************************************************************]]) + AC_MSG_WARN([[*** sizeof (short) != 2. ]]) + AC_MSG_WARN([[******************************************************************]]) + ]) -if test $ac_cv_sizeof_int != 4 ; then - AC_MSG_WARN([[******************************************************************]]) - AC_MSG_WARN([[*** sizeof (int) != 4 ]]) - AC_MSG_WARN([[******************************************************************]]) - fi +AS_IF([test "x$ac_cv_sizeof_int" != "x4"], [ + AC_MSG_WARN([[******************************************************************]]) + AC_MSG_WARN([[*** sizeof (int) != 4 ]]) + AC_MSG_WARN([[******************************************************************]]) + ]) -if test $ac_cv_sizeof_float != 4 ; then - AC_MSG_WARN([[******************************************************************]]) - AC_MSG_WARN([[*** sizeof (float) != 4. ]]) - AC_MSG_WARN([[******************************************************************]]) - fi +AS_IF([test "x$ac_cv_sizeof_float" != "x4"], [ + AC_MSG_WARN([[******************************************************************]]) + AC_MSG_WARN([[*** sizeof (float) != 4. ]]) + AC_MSG_WARN([[******************************************************************]]) + ]) -if test $ac_cv_sizeof_double != 8 ; then - AC_MSG_WARN([[******************************************************************]]) - AC_MSG_WARN([[*** sizeof (double) != 8. ]]) - AC_MSG_WARN([[******************************************************************]]) - fi +AS_IF([test "x$ac_cv_sizeof_double" != "x8"], [ + AC_MSG_WARN([[******************************************************************]]) + AC_MSG_WARN([[*** sizeof (double) != 8. ]]) + AC_MSG_WARN([[******************************************************************]]) + ]) -#if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then -# AC_MSG_WARN([[Touching files in directory tests/.]]) -# touch tests/*.c tests/*.h -# fi +AS_IF([test "x$ac_cv_prog_HAVE_AUTOGEN" = "xno"], [ + AC_MSG_WARN([[Touching files in directory tests/.]]) + touch tests/*.c tests/*.h + ]) -#==================================================================================== -# Settings for the HTML documentation. +dnl ==================================================================================== +dnl Settings for the HTML documentation. -htmldocdir=$prefix/share/doc/libsndfile1-dev/html +AS_IF([test "x$enable_bow_docs" = "xyes"], [ + HTML_BGCOLOUR="white" + HTML_FGCOLOUR="black" + ], [ + HTML_BGCOLOUR="black" + HTML_FGCOLOUR="white" + ]) -if test $prefix = "NONE" ; then - htmldocdir=/usr/local/share/doc/libsndfile1-dev/html -else - htmldocdir=$prefix/share/doc/libsndfile1-dev/html - fi - -if test x$enable_bow_docs = "xyes" ; then - HTML_BGCOLOUR="white" - HTML_FGCOLOUR="black" -else - HTML_BGCOLOUR="black" - HTML_FGCOLOUR="white" - fi - -#==================================================================================== -# Now use the information from the checking stage. +dnl ==================================================================================== +dnl Now use the information from the checking stage. win32_target_dll=0 COMPILER_IS_GCC=0 -if test x$ac_cv_c_compiler_gnu = xyes ; then - MN_ADD_CFLAGS(-std=gnu99) +AS_IF([test "x$enable_flags_setting" = "xyes"], [ + AX_APPEND_COMPILE_FLAGS([-O2 -pipe], [CFLAGS]) - MN_GCC_VERSION + AC_LANG_PUSH([C++]) + AX_APPEND_COMPILE_FLAGS([-O2 -pipe], [CXXFLAGS]) + AC_LANG_POP([C++]) - if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then - AC_MSG_WARN([****************************************************************]) - AC_MSG_WARN([** GCC version 4.2 warns about the inline keyword for no good **]) - AC_MSG_WARN([** reason but the maintainers do not see it as a bug. **]) - AC_MSG_WARN([** See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33995 **]) - AC_MSG_WARN([** Using -fgnu-inline to avoid this stupidity. **]) - AC_MSG_WARN([****************************************************************]) - MN_ADD_CFLAGS([-fgnu89-inline]) - fi + AS_CASE([${host_os}], + [darwin*], [ + ldflags_test="-Wl,-dead_strip_dylibs"], + [linux*], [ + ldflags_test="-Wl,-O1 -Wl,--as-needed -Wl,--no-undefined -Wl,--gc-sections"] + ) + AX_APPEND_LINK_FLAGS([${ldflags_test}], [LDFLAGS]) + ]) - CFLAGS="$CFLAGS -Wall" - CXXFLAGS="$CXXFLAGS -Wall" +AS_IF([test "x$enable_werror" = "xyes"], [ + AX_APPEND_COMPILE_FLAGS([-Werror], [CFLAGS]) - MN_ADD_CFLAGS([-Wextra]) + AC_LANG_PUSH([C++]) + AX_APPEND_COMPILE_FLAGS([-Werror], [CXXFLAGS]) + AC_LANG_POP([C++]) + ]) - AC_LANG_PUSH([C++]) - MN_ADD_CXXFLAGS([-Wextra]) - AC_LANG_POP([C++]) +common_flags="-Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wundef -Wuninitialized -Winit-self -Wno-format-truncation" +AX_APPEND_COMPILE_FLAGS([${common_flags} -Wvla -Wbad-function-cast -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Waggregate-return], [CFLAGS]) - MN_ADD_CFLAGS([-Wdeclaration-after-statement]) - MN_ADD_CFLAGS([-Wpointer-arith]) - MN_ADD_CFLAGS([-funsigned-char]) +AC_LANG_PUSH([C++]) +AX_APPEND_COMPILE_FLAGS([${common_flags} -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wreorder -Wsign-promo], [CXXFLAGS]) +AC_LANG_POP([C++]) - if test x$enable_gcc_werror = "xyes" ; then - CFLAGS="-Werror $CFLAGS" - CXXFLAGS="-Werror $CXXFLAGS" - fi +AS_IF([test "x$enable_stack_smash_protection" = "xyes"], [ + XIPH_GCC_STACK_PROTECTOR + XIPH_GXX_STACK_PROTECTOR + ]) - if test x$enable_test_coverage = "xyes" ; then - # MN_ADD_CFLAGS([-ftest-coverage]) - MN_ADD_CFLAGS([-coverage]) - fi +AS_IF([test "x$enable_test_coverage" = "xyes"], [ + AX_APPEND_COMPILE_FLAGS([-coverage], [CFLAGS]) + ]) - CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wbad-function-cast -Wwrite-strings " - # -Wundef -Wmissing-declarations -Winline -Wconversion" - CXXFLAGS="$CXXFLAGS -Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wreorder -Wsign-promo " +dnl some distributions (such as Gentoo) have _FORTIFY_SOURCE always +dnl enabled. We test for this situation in order to prevent polluting +dnl the console with messages of macro redefinitions. +AX_ADD_FORTIFY_SOURCE - if test "x$enable_gcc_opt" = "xno" ; then - temp_CFLAGS=`echo $CFLAGS | $SED "s/O2/O0/"` - CFLAGS=$temp_CFLAGS - AC_MSG_WARN([[*** Compiler optimisations switched off. ***]]) - fi +AS_IF([test "x$ax_cv_c_compiler_vendor" = "xgnu"], [ + dnl OS specific tweaks. + AS_CASE([$host_os], + [darwin* | rhapsody*], [ + dnl Disable -Wall, -pedantic and -Wshadow for Apple Darwin/Rhapsody. + dnl System headers on these systems are broken. + temp_CFLAGS=`echo $CFLAGS | $SED "s/-Wall -pedantic//" | $SED "s/-Wshadow//" | $SED "s/-Waggregate-return//"` + CFLAGS=$temp_CFLAGS + SHLIB_VERSION_ARG="-Wl,-exported_symbols_list -Wl,\$(top_srcdir)/src/Symbols.darwin"], + [linux*|kfreebsd*-gnu*|gnu*], [ + SHLIB_VERSION_ARG="-Wl,--version-script=\$(top_srcdir)/src/Symbols.gnu-binutils"], + [mingw*], [ + SHLIB_VERSION_ARG="-Wc,-static-libgcc -Wl,\$(top_srcdir)/src/libsndfile-1.def" + win32_target_dll=1 + AS_IF([test "x$enable_shared" = "xno"], [ + win32_target_dll=0 + ]) + AX_APPEND_COMPILE_FLAGS([-mstackrealign], [CFLAGS]) + ], + [os2*], [ + SHLIB_VERSION_ARG="-Wl,-export-symbols \$(top_srcdir)/src/Symbols.os2" + ]) - # OS specific tweaks. - case "$host_os" in - darwin* | rhapsody*) - # Disable -Wall, -pedantic and -Wshadow for Apple Darwin/Rhapsody. - # System headers on these systems are broken. - temp_CFLAGS=`echo $CFLAGS | $SED "s/-Wall -pedantic//" | $SED "s/-Wshadow//" | $SED "s/-Waggregate-return//"` - CFLAGS=$temp_CFLAGS - SHLIB_VERSION_ARG="-Wl,-exported_symbols_list -Wl,\$(srcdir)/Symbols.darwin" - ;; - linux*|kfreebsd*-gnu*|gnu*) - SHLIB_VERSION_ARG="-Wl,--version-script=\$(srcdir)/Symbols.gnu-binutils" - ;; - mingw*) - # Linker flag '-Wl,--out-implib' does not work with mingw cross compiler - # so we don't use it here. - SHLIB_VERSION_ARG="-Wl,\$(srcdir)/libsndfile-1.def" - win32_target_dll=1 - if test x"$enable_shared" = xno ; then - win32_target_dll=0 - fi - ;; - os2*) - SHLIB_VERSION_ARG="-Wl,-export-symbols \$(srcdir)/Symbols.os2" - ;; - *) - ;; - esac - if test x$enable_gcc_pipe != "xno" ; then - CFLAGS="$CFLAGS -pipe" - fi + COMPILER_IS_GCC=1 + ]) - COMPILER_IS_GCC=1 - fi - -AC_DEFINE_UNQUOTED([WIN32_TARGET_DLL], ${win32_target_dll}, [Set to 1 if windows DLL is being built.]) -AC_DEFINE_UNQUOTED([COMPILER_IS_GCC], ${COMPILER_IS_GCC}, [Set to 1 if the compile is GNU GCC.]) +AC_DEFINE_UNQUOTED([WIN32_TARGET_DLL], [${win32_target_dll}], [Set to 1 if windows DLL is being built.]) +AC_DEFINE_UNQUOTED([COMPILER_IS_GCC], [${COMPILER_IS_GCC}], [Set to 1 if the compile is GNU GCC.]) CFLAGS="$CFLAGS $OS_SPECIFIC_CFLAGS" -if test x"$CFLAGS" = x ; then - echo "Error in configure script. CFLAGS has been screwed up." - exit - fi +AS_IF([test "x$CFLAGS" = "x"], [ + AC_MSG_ERROR(["Error in configure script. CFLAGS has been screwed up."]) + ]) HOST_TRIPLET="${host_cpu}-${host_vendor}-${host_os}" -if test "$HOST_TRIPLET" = "x86_64-w64-mingw32" ; then - OS_SPECIFIC_LINKS=" -static-libgcc $OS_SPECIFIC_LINKS" - fi +AC_DEFINE_UNQUOTED([HOST_TRIPLET], [${HOST_TRIPLET}], [The host triplet of the compiled binary.]) + +AS_IF([test "$HOST_TRIPLET" = "x86_64-w64-mingw32"], [ + OS_SPECIFIC_LINKS=" -static-libgcc $OS_SPECIFIC_LINKS" + ]) WIN_RC_VERSION=`echo $PACKAGE_VERSION | $SED -e "s/p.*//" -e "s/\./,/g"` -#------------------------------------------------------------------------------- + +AS_IF([test "x$enable_static" = "xno"], [ + SRC_BINDIR=src/.libs/ + TEST_BINDIR=tests/.libs/ + ], [ + SRC_BINDIR=src/ + TEST_BINDIR=tests/ + ]) + +dnl ------------------------------------------------------------------------------- AC_SUBST(HOST_TRIPLET) -AC_SUBST(htmldocdir) AC_SUBST(HTML_BGCOLOUR) AC_SUBST(HTML_FGCOLOUR) AC_SUBST(SHLIB_VERSION_ARG) AC_SUBST(SHARED_VERSION_INFO) AC_SUBST(CLEAN_VERSION) +AC_SUBST(VERSION_MAJOR) +AC_SUBST(GEN_TOOL) + AC_SUBST(WIN_RC_VERSION) +AC_SUBST(HAVE_EXTERNAL_XIPH_LIBS) AC_SUBST(OS_SPECIFIC_CFLAGS) AC_SUBST(OS_SPECIFIC_LINKS) -AC_SUBST(ALSA_LIBS) AC_SUBST(SNDIO_LIBS) -AC_SUBST(EXTERNAL_CFLAGS) -AC_SUBST(EXTERNAL_LIBS) +AC_SUBST(EXTERNAL_XIPH_CFLAGS) +AC_SUBST(EXTERNAL_XIPH_LIBS) +AC_SUBST(EXTERNAL_XIPH_REQUIRE) +AC_SUBST(SRC_BINDIR) +AC_SUBST(TEST_BINDIR) -dnl The following line causes the libtool distributed with the source -dnl to be replaced if the build system has a more recent version. -AC_SUBST(LIBTOOL_DEPS) - -AC_CONFIG_FILES([ \ - src/sndfile.h src/Makefile src/GSM610/Makefile src/G72x/Makefile \ - src/version-metadata.rc \ - man/Makefile examples/Makefile tests/Makefile regtest/Makefile \ - M4/Makefile doc/Makefile Win32/Makefile Octave/Makefile \ - programs/Makefile doc/libsndfile.css \ - Makefile libsndfile.spec sndfile.pc \ - tests/test_wrapper.sh tests/pedantic-header-test.sh \ - build-test-tarball.mk \ +AC_CONFIG_FILES([ + Makefile Octave/Makefile + src/version-metadata.rc src/sndfile.h + tests/test_wrapper.sh tests/pedantic-header-test.sh + doc/libsndfile.css libsndfile.spec sndfile.pc + Scripts/build-test-tarball.mk ]) AC_OUTPUT -# Make sure these are executable. -chmod u+x tests/test_wrapper.sh build-test-tarball.mk +dnl ==================================================================================== -#==================================================================================== +AS_IF([test -z "$PKG_CONFIG"], [ + AS_ECHO([" *****************************************************************"]) + AS_ECHO([" *** The pkg-config program is missing. ***"]) + AS_ECHO([" *** External FLAC/Ogg/Vorbis libs cannot be found without it. ***"]) + AS_ECHO([" *** http://pkg-config.freedesktop.org/wiki/ ***"]) + AS_ECHO([" *****************************************************************"]) + ]) +AX_RECURSIVE_EVAL([$libdir], [full_absolute_libdir]) +AX_RECURSIVE_EVAL([$bindir], [full_absolute_bindir]) +AX_RECURSIVE_EVAL([$pkgconfigdir], [full_absolute_pkgconfigdir]) +AX_RECURSIVE_EVAL([$htmldir], [full_absolute_htmldir]) AC_MSG_RESULT([ --=-=-=-=-=-=-=-=-=-= Configuration Complete =-=-=-=-=-=-=-=-=-=- +-=-=-=-=-=-=-=-=-=-= Configuration Complete =-=-=-=-=-=-=-=-=-=-=- Configuration summary : @@ -640,56 +704,35 @@ AC_MSG_RESULT([ Host Vendor : ......................... ${host_vendor} Host OS : ............................. ${host_os} + CFLAGS : .............................. ${CFLAGS} + CXXFLAGS : ............................ ${CXXFLAGS} + CPPFLAGS : ............................ ${CPPFLAGS} + LDFLAGS : ............................. ${LDFLAGS} + Experimental code : ................... ${enable_experimental:-no} Using ALSA in example programs : ...... ${enable_alsa:-no} - External FLAC/Ogg/Vorbis : ............ ${enable_external_libs:-no} -]) + External FLAC/Ogg/Vorbis/Opus : ....... ${enable_external_libs:-no} + Building Octave interface : ........... ${OCTAVE_BUILD} -if test -z "$PKG_CONFIG" ; then - echo " *****************************************************************" - echo " *** The pkg-config program is missing. ***" - echo " *** External FLAC/Ogg/Vorbis libs cannot be found without it. ***" - echo " *** http://pkg-config.freedesktop.org/wiki/ ***" - echo " *****************************************************************" - echo - fi + Tools : -if test x$ac_cv_c_compiler_gnu = xyes ; then - echo " Tools :" - echo - echo " Compiler is GCC : ..................... ${ac_cv_c_compiler_gnu}" - echo " GCC version : ......................... ${GCC_VERSION}" - if test $GCC_MAJOR_VERSION -lt 3 ; then - echo "\n" - echo " ** This compiler version allows applications to write" - echo " ** to static strings within the library." - echo " ** Compile with GCC version 3.X or above to avoid this problem." - fi - fi + C Compiler Vendor is : ................ ${ax_cv_c_compiler_vendor} (${ax_cv_c_compiler_version}) + CXX Compiler Vendor is : .............. ${ax_cv_cxx_compiler_vendor} (${ax_cv_cxx_compiler_version}) -if test $libdir = "\${exec_prefix}/lib" ; then - libdir="$prefix/lib" - fi + Sanitizer enabled : ................... ${enable_sanitizer:-no} + Stack smash protection : .............. ${enable_stack_smash_protection:-no} -if test $bindir = "\${exec_prefix}/bin" ; then - bindir="$prefix/bin" - fi - -AC_MSG_RESULT([[ Installation directories : - Library directory : ................... $libdir - Program directory : ................... $bindir - Pkgconfig directory : ................. $libdir/pkgconfig - HTML docs directory : ................. $htmldocdir -]]) + Library directory : ................... ${full_absolute_libdir} + Program directory : ................... ${full_absolute_bindir} + Pkgconfig directory : ................. ${full_absolute_pkgconfigdir} + HTML docs directory : ................. ${full_absolute_htmldir} -if test x$prefix != "x/usr" ; then - echo "Compiling some other packages against libsndfile may require" - echo "the addition of '$libdir/pkgconfig' to the" - echo "PKG_CONFIG_PATH environment variable." - echo - fi +Compiling some other packages against libsndfile may require +the addition of '$full_absolute_pkgconfigdir' to the +PKG_CONFIG_PATH environment variable. +]) -#(cd src && make genfiles) -#(cd tests && make genfiles) +dnl Remove symlink created by Scripts/android-configure.sh. +rm -f gdbclient diff --git a/lib-src/libsndfile/doc/FAQ.html b/lib-src/libsndfile/doc/FAQ.html index baaef9aab..3acc18626 100644 --- a/lib-src/libsndfile/doc/FAQ.html +++ b/lib-src/libsndfile/doc/FAQ.html @@ -26,7 +26,8 @@ Q6 : What's the best format for storing temporary files?
Q7 : On Linux/Unix/MacOS X, what's the best way of detecting the presence of libsndfile?
-Q8 : But I just want a simple Makefile! What do I do?
+Q8 : I have libsndfile installed and now I want to use it. I + just want a simple Makefile! What do I do?
Q9 : How about adding the ability to write/read sound files to/from memory buffers?
Q10 : Reading a 16 bit PCM file as normalised floats and then @@ -49,8 +50,7 @@ Q19 : I have project files for Visual Studio / XCode / Whatever. Why don't you distribute them with libsndfile?
-Q20 : Why doesn't libsndfile support MP3? Lots of other Open Source - projects support it! +Q20 : Why doesn't libsndfile support MP3?
Q21 : How do I use libsndfile in a closed source or commercial program and comply with the license? @@ -95,7 +95,7 @@ If you can't find either then the answer is no.

As documented - here + here there is now a well defined behaviour which ensures that no matter what the bit width of the source file, the scaling always does something sensible. This makes it safe to read 8, 16, 24 and 32 bit PCM files using sf_read_short() @@ -116,7 +116,7 @@ case.

To fix this I suggest that you install the GNU Bash shell, rename /bin/sh to /bin/sh.old and make a symlink from /bin/sh to the bash shell. -Bash is designed to behave as a Bourne shell when is is called as /bin/sh. +Bash is designed to behave as a Bourne shell when it is called as /bin/sh.

When I did this on my iBook running MacOS X, compile times dropped from 13 minutes @@ -133,7 +133,7 @@ It seems that the Solaris Bourne shell disagrees with GNU libtool.

To fix this I suggest that you install the GNU Bash shell, rename /bin/sh to /bin/sh.old and make a symlink from /bin/sh to the bash shell. -Bash is designed to behave as a Bourne shell when is is called as /bin/sh. +Bash is designed to behave as a Bourne shell when it is called as /bin/sh.

@@ -246,7 +246,8 @@ libsndfile configure process. For instance on my system I get this: -


Q8 : But I just want a simple Makefile! What do I do?

+


Q8 : I have libsndfile installed and now I want to use it. I just want + a simple Makefile! What do I do?

The pkg-config program makes finding the correct compiler flag values and @@ -339,7 +340,7 @@ other than normalized floats in the application. Alternatives to normalized floats are the short and int data types (ie using sf_read_short or sf_read_int) or using un-normalized floats (see - + SFC_SET_NORM_FLOAT).

@@ -389,11 +390,12 @@ is the risk of breaking something that currently works.

-An itemtt> is a single sample of the data type you are reading; ie a +An item is a single sample of the data type you are reading; ie a single short value for sf_read_short or a single float for sf_read_float.

+

For a sound file with only one channel, a frame is the same as a item (ie a single sample) while for multi channel sound files, a single frame contains a single item for each channel. @@ -412,7 +414,7 @@ on a stereo file, first using items:

-and now readng the exact same amount of data using frames: +and now reading the exact same amount of data using frames: 

@@ -640,7 +642,7 @@ CPU and run them on the other, the test suite will fail.
 

 
 

-Part of the problem is the the CPU endian-ness is detected at configure time.
+Part of the problem is that the CPU endian-ness is detected at configure time.
 Yes, I know the Apple compiler defines one of the macros __LITTLE_ENDIAN__
 and __BIG_ENDIAN__, but those macros are not part of the 1999 ISO C Standard
 and they are not portable.
@@ -726,42 +728,18 @@ Hence, I'm not willing to enter into an arrangement like that again.
 
 
 
-

Q20 : Why doesn't libsndfile support MP3? Lots of other Open Source
-	projects support it!
+

Q20 : Why doesn't libsndfile support MP3?
 

 
 

-MP3 is not supported for one very good reason; doing so requires the payment
-of licensing fees.
-As can be seen from
-	
-	mp3licensing.com
-the required royalty payments are not cheap.
+In the past, MP3 was not supported because the technology behind MP3 was
+patented.
+Those patents have now expired and there is an
+	
+	open ticket
+to implement MP3 support.
 

 
-

-Yes, I know other libraries ignore the licensing requirements, but their legal
-status is extremely dubious.
-At any time, the body selling the licenses could go after the authors of those
-libraries.
-Some of those authors may be students and hence wouldn't be worth pursuing.
-

-
-

-However, libsndfile is released under the name of a company, Mega Nerd Pty Ltd;
-a company which has income from from libsamplerate licensing, libsndfile based
-consulting income and other unrelated consulting income.
-Adding MP3 support to libsndfile could place that income would be under legal
-threat.
-

-
-

-Fortunately, Ogg Vorbis exists as an alternative to MP3.
-Support for Ogg Vorbis was added to libsndfile (mostly due to the efforts of
-John ffitch of the Csound project) in version 1.0.18.
-

-
-
 
 
 

Q21 : How do I use libsndfile in a closed source or commercial program
@@ -842,7 +820,7 @@ the top level of the extracted tarball.
 		
 			http://www.mega-nerd.com/libsndfile/.
 

-Version : 1.0.24
+Version : 1.0.28
 

 
 
diff --git a/lib-src/libsndfile/doc/Makefile.am b/lib-src/libsndfile/doc/Makefile.am
deleted file mode 100644
index 40a04d970..000000000
--- a/lib-src/libsndfile/doc/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-htmldir = $(htmldocdir)
-html_DATA = index.html libsndfile.jpg libsndfile.css api.html command.html \
-			bugs.html sndfile_info.html new_file_type.HOWTO pkgconfig.html \
-			win32.html FAQ.html lists.html embedded_files.html octave.html \
-			dither.html tutorial.html
-
-EXTRA_DIST = $(html_DATA)
-
diff --git a/lib-src/libsndfile/doc/Makefile.in b/lib-src/libsndfile/doc/Makefile.in
deleted file mode 100644
index 1ebe80ea3..000000000
--- a/lib-src/libsndfile/doc/Makefile.in
+++ /dev/null
@@ -1,551 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/libsndfile.css.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \
-	$(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \
-	$(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \
-	$(top_srcdir)/M4/extra_pkg.m4 \
-	$(top_srcdir)/M4/flexible_array.m4 \
-	$(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \
-	$(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \
-	$(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \
-	$(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \
-	$(top_srcdir)/M4/mkoctfile_version.m4 \
-	$(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = libsndfile.css
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(htmldir)"
-DATA = $(html_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CLEAN_VERSION = @CLEAN_VERSION@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@
-EXTERNAL_LIBS = @EXTERNAL_LIBS@
-FGREP = @FGREP@
-FLAC_CFLAGS = @FLAC_CFLAGS@
-FLAC_LIBS = @FLAC_LIBS@
-GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@
-GCC_MINOR_VERSION = @GCC_MINOR_VERSION@
-GCC_VERSION = @GCC_VERSION@
-GETCONF = @GETCONF@
-GREP = @GREP@
-HAVE_AUTOGEN = @HAVE_AUTOGEN@
-HAVE_MKOCTFILE = @HAVE_MKOCTFILE@
-HAVE_OCTAVE = @HAVE_OCTAVE@
-HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@
-HAVE_WINE = @HAVE_WINE@
-HOST_TRIPLET = @HOST_TRIPLET@
-HTML_BGCOLOUR = @HTML_BGCOLOUR@
-HTML_FGCOLOUR = @HTML_FGCOLOUR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKOCTFILE = @MKOCTFILE@
-MKOCTFILE_VERSION = @MKOCTFILE_VERSION@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OCTAVE = @OCTAVE@
-OCTAVE_CONFIG = @OCTAVE_CONFIG@
-OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@
-OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@
-OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@
-OCTAVE_VERSION = @OCTAVE_VERSION@
-OGG_CFLAGS = @OGG_CFLAGS@
-OGG_LIBS = @OGG_LIBS@
-OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@
-OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-RC = @RC@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SF_COUNT_MAX = @SF_COUNT_MAX@
-SHARED_VERSION_INFO = @SHARED_VERSION_INFO@
-SHELL = @SHELL@
-SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@
-SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@
-SNDIO_LIBS = @SNDIO_LIBS@
-SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-SQLITE3_LIBS = @SQLITE3_LIBS@
-STRIP = @STRIP@
-TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@
-VERSION = @VERSION@
-VORBISENC_CFLAGS = @VORBISENC_CFLAGS@
-VORBISENC_LIBS = @VORBISENC_LIBS@
-VORBIS_CFLAGS = @VORBIS_CFLAGS@
-VORBIS_LIBS = @VORBIS_LIBS@
-WIN_RC_VERSION = @WIN_RC_VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = $(htmldocdir)
-htmldocdir = @htmldocdir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-html_DATA = index.html libsndfile.jpg libsndfile.css api.html command.html \
-			bugs.html sndfile_info.html new_file_type.HOWTO pkgconfig.html \
-			win32.html FAQ.html lists.html embedded_files.html octave.html \
-			dither.html tutorial.html
-
-EXTRA_DIST = $(html_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-libsndfile.css: $(top_builddir)/config.status $(srcdir)/libsndfile.css.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-htmlDATA: $(html_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
-	done
-
-uninstall-htmlDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(htmldir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-htmlDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-htmlDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmlDATA install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags-am uninstall uninstall-am uninstall-htmlDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lib-src/libsndfile/doc/api.html b/lib-src/libsndfile/doc/api.html
index dc11a423f..ec4305e90 100644
--- a/lib-src/libsndfile/doc/api.html
+++ b/lib-src/libsndfile/doc/api.html
@@ -34,7 +34,7 @@
 	Every effort is made to keep these documents up-to-date, error free and
 	unambiguous.
 	However, since maintaining the documentation is the least fun part of working
-	on libsndfile, these docs can and do fall behind the behaviour of library.
+	on libsndfile, these docs can and do fall behind the behaviour of the library.
 	If any errors, omissions or ambiguities are found, please notify me (erikd)
 	at mega-nerd dot com.
 

@@ -63,6 +63,7 @@ The functions of libsndfile are defined as follows:
       #include <sndfile.h>
 
       SNDFILE*    sf_open          (const char *path, int mode, SF_INFO *sfinfo) ;
+      SNDFILE*    sf_wchar_open    (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ;
       SNDFILE*    sf_open_fd       (int fd, int mode, SF_INFO *sfinfo, int close_desc) ;
       SNDFILE* 	  sf_open_virtual  (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
       int         sf_format_check  (const SF_INFO *info) ;
@@ -121,6 +122,18 @@ SNDFILE* is an anonymous pointer to data which is private to the library.
       SNDFILE*  sf_open    (const char *path, int mode, SF_INFO *sfinfo) ;
+

+The sf_open() function opens the sound file at the specified path. +The filename is byte encoded, but may be utf-8 on Linux, while on Mac OS X it +will use the filesystem character set. +On Windows, there is also a Windows specific sf_wchar_open() that takes a +UTF16_BE encoded filename. +

+ +
+      SNDFILE*  sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ;
+
+

The SF_INFO structure is for passing data between the calling function and the library when opening a file for reading or writing. It is defined in sndfile.h as follows: @@ -524,7 +537,7 @@ SFM_READ no action is taken. -


File Read Functions (Items)

+


File Read Functions

       sf_count_t  sf_read_short   (SNDFILE *sndfile, short *ptr, sf_count_t items) ;
@@ -533,32 +546,7 @@ SFM_READ no action is taken.
       sf_count_t  sf_read_double  (SNDFILE *sndfile, double *ptr, sf_count_t items) ;
-

-The file read items functions fill the array pointed to by ptr with the requested -number of items. The items parameter must be an integer product of the number -of channels or an error will occur. -

- -

-It is important to note that the data type used by the calling program and the data -format of the file do not need to be the same. For instance, it is possible to open -a 16 bit PCM encoded WAV file and read the data using sf_read_float(). The library -seamlessly converts between the two formats on-the-fly. See -Note 1. -

- -

-The sf_read_XXXX functions return the number of items read. -Unless the end of the file was reached during the read, the return value should -equal the number of items requested. -Attempts to read beyond the end of the file will not result in an error but will -cause the sf_read_XXXX functions to return less than the number of items requested -or 0 if already at the end of the file. -

- -


File Read Functions (Frames)

- 
       sf_count_t  sf_readf_short   (SNDFILE *sndfile, short *ptr, sf_count_t frames) ;
       sf_count_t  sf_readf_int     (SNDFILE *sndfile, int *ptr, sf_count_t frames) ;
@@ -567,27 +555,55 @@ or 0 if already at the end of the file.

-The file read frames functions fill the array pointed to by ptr with the requested -number of frames of data. The array must be large enough to hold the product of -frames and the number of channels. +The file read functions fill the array pointed to by ptr with the +requested number of items or frames.

-

-Care must be taken to ensure that there is enough space in the array pointed to by -ptr, to take (frames * channels) number of items (shorts, ints, floats or doubles). +

+For the frames-count functions, the frames parameter specifies the number +of frames. A frame is just a block of samples, one for each +channel. Care must be taken to ensure that there is enough space +in the array pointed to by ptr, to take (frames * channels) number of +items (shorts, ints, floats or doubles).

-The sf_readf_XXXX functions return the number of frames read. -Unless the end of the file was reached during the read, the return value should equal -the number of frames requested. -Attempts to read beyond the end of the file will not result in an error but will cause -the sf_readf_XXXX functions to return less than the number of frames requested or 0 if -already at the end of the file. +For the items-count functions, the items parameter must be an integer product +of the number of channels or an error will occur. Here, an item is just a +sample. +

+ +

+Note: The only difference between the "items" and "frames" versions of +each read function is the units in which the object count is specified +- calling sf_readf_short with a count argument of N, on a SNDFILE with +C channels, is the same as calling sf_read_short with a count argument +of N*C. The buffer pointed to by "ptr" should be the same number of +bytes in each case. +

+ + +

+Note: The data type used by the calling program and the data format of +the file do not need to be the same. For instance, it is possible to +open a 16 bit PCM encoded WAV file and read the data using +sf_read_float(). The library seamlessly converts between the two +formats on-the-fly. See +Note 1. +

+ +

+The sf_read_XXXX and sf_readf_XXXX functions return the number of +items or frames read, respectively. Unless the end of the file was +reached during the read, the return value should equal the number of +objects requested. Attempts to read beyond the end of the file will +not result in an error but will cause the read functions to return +less than the number of objects requested or 0 if already at the end +of the file.

-


File Write Functions (Items)

+


File Write Functions

       sf_count_t  sf_write_short   (SNDFILE *sndfile, short *ptr, sf_count_t items) ;
@@ -596,27 +612,7 @@ already at the end of the file.
       sf_count_t  sf_write_double  (SNDFILE *sndfile, double *ptr, sf_count_t items) ;
-

-The file write items functions write the data in the array pointed to by ptr to the file. -The items parameter must be an integer product of the number of channels or an error -will occur. -

- -

-It is important to note that the data type used by the calling program and the data -format of the file do not need to be the same. For instance, it is possible to open -a 16 bit PCM encoded WAV file and write the data using sf_write_float(). The library -seamlessly converts between the two formats on-the-fly. See -Note 1. -

-

-The sf_write_XXXX functions return the number of items written (which should be the -same as the items parameter). -

- -


File Write Functions (Frames)

- 
       sf_count_t  sf_writef_short  (SNDFILE *sndfile, short *ptr, sf_count_t frames) ;
       sf_count_t  sf_writef_int    (SNDFILE *sndfile, int *ptr, sf_count_t frames) ;
@@ -625,14 +621,35 @@ same as the items parameter).

-The file write frames functions write the data in the array pointed to by ptr to the file. -The array must be large enough to hold the product of frames and the number of channels. +The file write functions write the data in the array pointed to by ptr to the file.

+

-The sf_writef_XXXX functions return the number of frames written (which should be the -same as the frames parameter). +For items-count functions, the items parameter specifies the size of +the array and must be an integer product of the number of channels or +an error will occur.

+

+For the frames-count functions, the array is expected to be large enough +to hold a number of items equal to the product of frames and the +number of channels. +

+ +

As with the read functions above, the only +difference in the items and frames version of each write function is +the units in which the buffer size is specified. Again, the data type +used by the calling program and the data format of the file do not +need to be the same (Note 1). +

+ +

+The sf_write_XXXX and sf_writef_XXXX functions respectively return the +number of items or frames written (which should be the same as the +items or frames parameter). +

+ +


Raw File Read and Write Functions

@@ -692,7 +709,11 @@ The str_type parameter can be any one of the following string types: SF_STR_SOFTWARE, SF_STR_ARTIST, SF_STR_COMMENT, - SF_STR_DATE + SF_STR_DATE, + SF_STR_ALBUM, + SF_STR_LICENSE, + SF_STR_TRACKNUMBER, + SF_STR_GENRE } ; @@ -710,9 +731,20 @@ It returns zero on success and non-zero on error. The error code can be converted to a string using sf_error_number().

+

+Strings passed to and retrieved from these two functions are assumed to be +utf-8. +However, while formats like Ogg/Vorbis and FLAC fully support utf-8, others +like WAV and AIFF officially only support ASCII. +Writing utf-8 strings to WAV and AIF files with libsndfile will work when read +back with libsndfile, but may not work with other programs. +

- +The suggested method of dealing with tags retrived using sf_get_string() is to +assume they are utf-8. +Similarly if you have a string in some exotic format like utf-16, it should be +encoded to utf-8 before being written using libsndfile.

@@ -721,8 +753,9 @@ The error code can be converted to a string using sf_error_number().


Note 1

-When converting between integer PCM formats of differing size (ie using sf_read_int() -to read a 16 bit PCM encoded WAV file) libsndfile obeys one simple rule: +When converting between integer PCM formats of differing size +(e.g. using sf_read_int() to read a 16 bit PCM encoded WAV file) +libsndfile obeys one simple rule:

@@ -766,7 +799,7 @@ and a parameter of SF_TRUE to force correct scaling. here.

-Version : 1.0.24 +Version : 1.0.28

diff --git a/lib-src/libsndfile/doc/bugs.html b/lib-src/libsndfile/doc/bugs.html index 937e189d7..3a441fef1 100644 --- a/lib-src/libsndfile/doc/bugs.html +++ b/lib-src/libsndfile/doc/bugs.html @@ -68,9 +68,8 @@ problems.

- Once you have the above information you should email it to one of the - mailing lists - (posting to these lists is limited to the list subscribers). + Once you have the above information you should submit a ticket on the libsnfile + github issue tracker.

diff --git a/lib-src/libsndfile/doc/command.html b/lib-src/libsndfile/doc/command.html index 17f8f35fc..14e38e97b 100644 --- a/lib-src/libsndfile/doc/command.html +++ b/lib-src/libsndfile/doc/command.html @@ -49,6 +49,10 @@ SFC_GET_LOG_INFO Retrieve the internal per-file operation log. + + SFC_GET_CURRENT_SF_INFO + Retrieve SF_INFO struct of opened file. + SFC_CALC_SIGNAL_MAX Calculate the measured maximum signal value. @@ -177,22 +181,27 @@ - SFC_GET_AMBISONIC + SFC_WAVEX_GET_AMBISONIC Test a WAVEX file for Ambisonic format - SFC_SET_AMBISONIC + SFC_WAVEX_SET_AMBISONIC Modify a WAVEX header for Ambisonic format SFC_SET_VBR_ENCODING_QUALITY - Set the the Variable Bit Rate encoding quality + Set the Variable Bit Rate encoding quality - SFC_RAW_NEEDS_ENDSWAP + SFC_SET_COMPRESSION_LEVEL + Set the compression level. + + + + SFC_RAW_DATA_NEEDS_ENDSWAP Determine if raw data needs endswapping @@ -206,6 +215,68 @@ Set the Broadcast Chunk info + + SFC_GET_CHANNEL_MAP_INFO + Retrieve the channel map info + + + + SFC_SET_CHANNEL_MAP_INFO + Set the channel map info + + + + SFC_SET_CART_INFO + Set the Cart Chunk info + + + + SFC_GET_CART_INFO + Retrieve the Cart Chunk info + + + + SFC_GET_LOOP_INFO + Get loop info + + + + SFC_GET_INSTRUMENT + Get instrument info + + + + SFC_SET_INSTRUMENT + Set instrument info + + + + SFC_GET_CUE_COUNT + Get the cue marker count + + + + SFC_GET_CUE + Get cue marker info + + + + SFC_SET_CUE + Set cue marker info + + + + SFC_RF64_AUTO_DOWNGRADE + Enable auto downgrade from RF64 to WAV + + + SFC_GET_ORIGINAL_SAMPLERATE + Get original samplerate + + + SFC_SET_ORIGINAL_SAMPLERATE + Set original samplerate + + +


SFC_GET_CURRENT_SF_INFO

+

+Retrieve SF_INFO struct of opened file. +

+

+SFC_GET_CURRENT_SF_INFO command copies SF_INFO struct of +sndfile object to provided buffer. +

+ +

+Parameters: +

+        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_GET_CURRENT_SF_INFO
+        data     : A pointer to a valid SF_INFO* pointer
+        datasize : sizeof (SF_INFO)
+
+

+Example: +

+
+        SF_INFO  sfinfo ;
+        sf_command (sndfile, SFC_GET_CURRENT_SF_INFO, sfinfo, sizeof (SF_INFO)) ;
+
+ +
+
Return value:
+
Zero on success, non-zero otherwise. +
+


SFC_CALC_SIGNAL_MAX

@@ -1243,7 +1346,7 @@ Parameters:

Return value:
-
SF_AMBISONIC_NONE or SF_AMBISONIC_B_FORMAT or zero if the file format +
SF_AMBISONIC_NONE or SF_AMBISONIC_B_FORMAT or zero if the file format does not support ambisonic formats.
@@ -1280,9 +1383,11 @@ This command is currently only supported for files with SF_FORMAT_WAVEX format.


SFC_SET_VBR_ENCODING_QUALITY

-Set the the Variable Bit Rate encoding quality. +Set the Variable Bit Rate encoding quality. The encoding quality value should be between 0.0 (lowest quality) and 1.0 (highest quality). +Currenly this command is only implemented for FLAC and Ogg/Vorbis files. +It has no effect on un-compressed file formats.

Parameters: @@ -1298,13 +1403,43 @@ The command must be sent before any audio data is written to the file.

-
Return value:
-
Zero on success, non-zero otherwise. +
Return value:
+
SF_TRUE if VBR encoding quality was set. + SF_FALSE otherwise.
- -


SFC_RAW_NEEDS_ENDSWAP

+ +


SFC_SET_COMPRESSION_LEVEL

+

+Set the compression level. +The compression level should be between 0.0 (minimum compression level) and 1.0 +(highest compression level). +Currenly this command is only implemented for FLAC and Ogg/Vorbis files. +It has no effect on un-compressed file formats. +

+

+Parameters: +

+        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_SET_COMPRESSION_LEVEL
+        data     : A pointer to a double value
+        datasize : sizeof (double)
+
+

+The command must be sent before any audio data is written to the file. +

+

+

+
+
Return value:
+
SF_TRUE if compression level was set. + SF_FALSE otherwise. +
+ + + +


SFC_RAW_DATA_NEEDS_ENDSWAP

Determine if raw data read using @@ -1320,7 +1455,7 @@ machine. Parameters: 

         sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_RAW_NEEDS_ENDSWAP
+        cmd      : SFC_RAW_DATA_NEEDS_ENDSWAP
         data     : NULL
         datasize : 0
@@ -1392,7 +1527,528 @@ Parameters:
Return value:
SF_TRUE if setting the Broadcast Extension chunk was successful and SF_FALSE otherwise. + + + + +


SFC_GET_CHANNEL_MAP_INFO

+

+Retrieve the channel map contained in an AIFF or CAF Channel Layout chunk. +

+

+Parameters: +

+
+        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_GET_CHANNEL_MAP_INFO
+        data     : a pointer to an array of int, the same size as the number of channels in the file
+        datasize : number of channels * sizeof (int)
+
+

+Channel map positions are defined in an enum in <sndfile.h>. +

+ +
+
Return value:
+
SF_TRUE if the file contained a Channel Layout chunk or SF_FALSE otherwise. +
+ + + +


SFC_SET_CHANNEL_MAP_INFO

+

+Set the channel map contained in an AIFF or CAF Channel Layout chunk. +

+

+Parameters: +

+
+        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_SET_CHANNEL_MAP_INFO
+        data     : a pointer to an array of int, the same size as the number of channels in the file
+        datasize : number of channels * sizeof (int)
+
+ +
+
Return value:
+
SF_TRUE if setting the Channel Layout chunk was successful and SF_FALSE otherwise. + +
+ + + + +


SFC_GET_CART_INFO

+

Retrieve the Cart Chunk from WAV (and related) files. Based on AES46 standard for CartChunk (see CartChunk.org for more information. +

+

+Parameters: +

+
+        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_GET_CART_INFO
+        data     : a pointer to an SF_CART_INFO struct
+        datasize : sizeof (SF_CART_INFO)
+
+

+The SF_CART_INFO struct is defined in <sndfile.h> as: +

+
+#define SF_CART_INFO_VAR(p_tag_text_size) \
+                        struct
+                        {       char            version [4] ;
+                                char            title [64] ;
+                                char            artist [64] ;
+                                char            cut_id [64] ;
+                                char            client_id [64] ;
+                                char            category [64] ;
+                                char            classification [64] ;
+                                char            out_cue [64] ;
+                                char            start_date [10] ;
+                                char            start_time [8] ;
+                                char            end_date [10] ;
+                                char            end_time [8] ;
+                                char            producer_app_id [64] ;
+                                char            producer_app_version [64] ;
+                                char            user_def [64] ;
+                                long    level_reference ;
+                                SF_CART_TIMER   post_timers [8] ;
+                                char            reserved [276] ;
+                                char            url [1024] ;
+                                unsigned int    tag_text_size ;
+                                char            tag_text[p_tag_text_size] ;
+                        }
+
+ +
+
Return value:
+
SF_TRUE if the file contained a Cart chunk or SF_FALSE + otherwise. +
+ + + +


SFC_SET_CART_INFO

+

+Set the Cart Chunk for WAV (and related) files. +

+

+Parameters: +

+
+        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_SET_CART_INFO
+        data     : a pointer to an SF_CART_INFO struct
+        datasize : sizeof (SF_CART_INFO)
+
+ +
+
Return value:
+
SF_TRUE if setting the Cart chunk was successful and SF_FALSE + otherwise. +
+ + + +


SFC_GET_LOOP_INFO

+

+Retrieve loop information for file including time signature, length in +beats and original MIDI base note +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_GET_LOOP_INFO
+         data     : a pointer to an SF_LOOP_INFO struct
+         datasize : sizeof (SF_LOOP_INFO)
+
+

+The SF_BROADCAST_INFO struct is defined in <sndfile.h> as: +

+
+        typedef struct
+        {   short    time_sig_num ;   /* any positive integer    > 0  */
+            short    time_sig_den ;   /* any positive power of 2 > 0  */
+            int        loop_mode ;    /* see SF_LOOP enum             */
+
+            int        num_beats ;    /* this is NOT the amount of quarter notes !!!*/
+                                      /* a full bar of 4/4 is 4 beats */
+                                      /* a full bar of 7/8 is 7 beats */
+
+            float    bpm ;            /* suggestion, as it can be calculated using other fields:*/
+                                      /* file's lenght, file's sampleRate and our time_sig_den*/
+                                      /* -> bpms are always the amount of _quarter notes_ per minute */
+
+            int    root_key ;         /* MIDI note, or -1 for None */
+            int future [6] ;
+        } SF_LOOP_INFO ;
+
+

+Example: +

+
+         SF_LOOP_INFO loop;
+         sf_command (sndfile, SFC_GET_LOOP_INFO, &loop, sizeof (loop)) ;
+
+
+
Return value:
+
SF_TRUE if the file header contains loop information for the file. + SF_FALSE otherwise. +
+ + + + + +


SFC_GET_INSTRUMENT

+

+Retrieve instrument information from file including MIDI base note, +keyboard mapping and looping informations(start/stop and mode). +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_GET_INSTRUMENT
+         data     : a pointer to an SF_INSTRUMENT struct
+         datasize : sizeof (SF_INSTRUMENT)
+
+ +

+The SF_INSTRUMENT struct is defined in <sndfile.h> as: +

+
+        enum
+        {    /*
+            **    The loop mode field in SF_INSTRUMENT will be one of the following.
+            */
+            SF_LOOP_NONE = 800,
+            SF_LOOP_FORWARD,
+            SF_LOOP_BACKWARD,
+            SF_LOOP_ALTERNATING
+        } ;
+
+        typedef struct
+        {   int gain ;
+            char basenote, detune ;
+            char velocity_lo, velocity_hi ;
+            char key_lo, key_hi ;
+            int loop_count ;
+
+            struct
+            {   int mode ;
+                unsigned int start ;
+                unsigned int end ;
+                unsigned int count ;
+            } loops [16] ; /* make variable in a sensible way */
+        } SF_INSTRUMENT ;
+
+ +

+Example: +

+
+         SF_INSTRUMENT inst ;
+         sf_command (sndfile, SFC_GET_INSTRUMENT, &inst, sizeof (inst)) ;
+
+
+
Return value:
+
SF_TRUE if the file header contains instrument information for the + file. SF_FALSE otherwise. +
+ + + + + +


SFC_SET_INSTRUMENT

+

+Set the instrument information for the file. +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_SET_INSTRUMENT
+         data     : a pointer to an SF_INSTRUMENT struct
+         datasize : sizeof (SF_INSTRUMENT)
+
+

+Example: +

+
+         SF_INSTRUMENT inst ;
+         sf_command (sndfile, SFC_SET_INSTRUMENT, &inst, sizeof (inst)) ;
+
+
+
Return value:
+
SF_TRUE if the file header contains instrument information for the + file. SF_FALSE otherwise. +
+ + + + + +


SFC_GET_CUE_COUNT

+

+Retrieve the number of cue markers available for retrieval using the +SFC_GET_CUE command. +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_GET_CUE
+         data     : a pointer to a uint32_t
+         datasize : sizeof (uint32_t)
+
+ + +

+Example: +

+
+         uint32_t cue_count ;
+         sf_command (sndfile, SFC_GET_CUE_COUNT, &cue_count, sizeof (cue_count)) ;
+
+
+
Return value:
+
SF_TRUE if the file header contains cue marker information for the + file. SF_FALSE otherwise. +
+ + + + +


SFC_GET_CUE

+

+Retrieve cue marker information from file. +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_GET_CUE
+         data     : a pointer to an SF_CUES struct
+         datasize : sizeof (SF_CUES)
+
+ +

+The SF_CUES struct is defined in <sndfile.h> as: +

+
+    typedef struct
+    {	int cue_count ;
+
+    	struct
+    	{	int32_t   indx ;
+    		uint32_t  position ;
+    		int32_t   fcc_chunk ;
+    		int32_t   chunk_start ;
+    		int32_t   block_start ;
+    		uint32_t  sample_offset ;
+    		char name [256] ;
+    	} cue_points [100] ;
+    } SF_CUES ;
+
+ +

+There is also an SF_CUES_VAR #define that allows reading/writing more than 100 +cue markers. +

+ +

+Example: +

+
+         SF_CUES cues ;
+         sf_command (sndfile, SFC_GET_CUE, &cues, sizeof (cues)) ;
+
+
+
Return value:
+
SF_TRUE if the file header contains cue marker information for the + file. SF_FALSE otherwise. +
+ + + + + + +


SFC_SET_CUE

+

+Set the cue marker information for the file. +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_SET_CUE
+         data     : a pointer to an SF_CUES struct
+         datasize : sizeof (SF_CUES)
+
+

+Example: +

+
+         SF_CUES cues ;
+         sf_command (sndfile, SFC_SET_CUE, &cues, sizeof (cues)) ;
+
+
+
Return value:
+
SF_TRUE if the file header contains cue marker information for the + file. SF_FALSE otherwise. +
+ + + + + + +


SFC_RF64_AUTO_DOWNGRADE

+

+Enable auto downgrade from RF64 to WAV. +

+

+The EBU recomendation is that when writing RF64 files and the resulting file is +less than 4Gig in size, it should be downgraded to a WAV file (WAV files have a +maximum size of 4Gig). +libsndfile doesn't follow the EBU recommendations exactly, , mainly because the +test suite needs to be able test reading/writing RF64 files without having to +generate files larger than 4 gigabytes. +

+

+Note: This command should be issued before the first bit of audio data has been +written to the file. +Calling this command after audio data has been written will return the current +value of this setting, but will not allow it to be changed. +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_RF64_AUTO_DOWNGRADE
+         data     : NULL
+         datasize : SF_TRUE or SF_FALSE
+
+

+Example: +

+
+         /* Enable auto downgrade on file close. */
+         sf_command (sndfile, SFC_RF64_AUTO_DOWNGRADE, NULL, SF_TRUE) ;
+
+
+
Return value:
+
Returns SF_TRUE if SFC_RF64_AUTO_DOWNGRADE is set and SF_FALSE + otherwise. +
+ + + + +


SFC_GET_ORIGINAL_SAMPLERATE

+

+Get original samplerate metadata. +

+

+The Opus audio codec stores audio data independent of samplerate, but only +supports encoding or decoding at 8000Hz, 12000Hz, 16000Hz, 24000HZ or 48000Hz. +Opus includes a header field to record the original source input samplerate, and +a samplerate converter may be used if needed. +

+

+This command gets the original samplerate header field. It does not enable any +(non-existent) samplerate conversion, nor change the current decoder samplerate. +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_GET_ORIGINAL_SAMPLERATE
+         data     : pointer to an integer
+         datasize : sizeof (int)
+
+

+Example: +

+
+         /* Get the original sample rate */
+         int original_samplerate ;
+         sf_command (sndfile, SFC_GET_ORIGINAL_SAMPLERATE, &original_samplerate, sizeof (original_samplerate)) ;
+
+
+
Return value:
+
Returns SF_TRUE on success, SF_FALSE otherwise. +
The passed integer is set to the value of the original samplerate. +
+ + + + +


SFC_SET_ORIGINAL_SAMPLERATE

+

+Set original samplerate metadata. +

+

+The Opus audio codec stores audio data independent of samplerate, but only +supports encoding or decoding at 8000Hz, 12000Hz, 16000Hz, 24000HZ or 48000Hz. +Opus includes a header field to record the original source input samplerate, and +a samplerate converter may be used if needed. +

+

+When writing an Opus file this command sets the original samplerate header field +to the provided value, which is then stored in the file. This has no effect on +the current encoder samplerate. +

+

+When reading an Opus file this command overrides the original samplerate value +as read from the file. libsndfile uses this value to choose what samplerate +to decode at, rounding up to the nearest valid Opus samplerate. After a +successful call, the file samplerate and frames count may have changed. +

+

+Note: This command should be issued before the first bit of audio data has been +read from or written to the file. +

+

+Parameters: +

+
+         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_SET_ORIGINAL_SAMPLERATE
+         data     : pointer to an integer
+         datasize : sizeof (int)
+
+

+Example: +

+
+         /* Store the original sample rate as 44100 */
+         int original_samplerate 44100;
+         sf_command (sndfile, SFC_SET_ORIGINAL_SAMPLERATE, &original_samplerate, sizeof (input_samplerate)) ;
+
+
+
Return value:
+
Returns SF_TRUE on success, SF_FALSE otherwise. +
On write, can only succeed if no data has been written. +
On read, if successful, SFC_GET_CURRENT_SF_INFO + should be called to determine the new frames count and samplerate +
+ + + @@ -1402,7 +2058,7 @@ Parameters: http://www.mega-nerd.com/libsndfile/.
-Version : 1.0.24 +Version : 1.0.25

diff --git a/lib-src/libsndfile/doc/development.html b/lib-src/libsndfile/doc/development.html new file mode 100644 index 000000000..abd13b303 --- /dev/null +++ b/lib-src/libsndfile/doc/development.html @@ -0,0 +1,42 @@ + + + + + + libsndfile Development + + + + + + + + +


libsndfile Development

+ +

+libsndfile is being developed by a small community of users and hackers. +People interested in helping can join the libsndfile-devel + mailing list +or raise an issue on Github. +

+ +

+The main repository can be found on Github: +

+ +
+ + https://github.com/erikd/libsndfile/ +
+ +

+and includes + + instuctions +on how to build libsndfile from the Git repo. +

+ + + + diff --git a/lib-src/libsndfile/doc/dither.html b/lib-src/libsndfile/doc/dither.html deleted file mode 100644 index 57b1b6ee0..000000000 --- a/lib-src/libsndfile/doc/dither.html +++ /dev/null @@ -1,1017 +0,0 @@ - - - - - - libsndfile : the sf_command function. - - - - - - - - - - - -

sf_command

-
-
-        int    sf_command (SNDFILE *sndfile, int cmd, void *data, int datasize) ;
-
-

- This function allows the caller to retrieve information from or change aspects of the - library behaviour. - Examples include retrieving a string containing the library version or changing the - scaling applied to floating point sample data during read and write. - Most of these operations are performed on a per-file basis. -

-

- The cmd parameter is a integer identifier which is defined in <sndfile.h>. - All of the valid command identifiers have names begining with "SFC_". - Data is passed to and returned from the library by use of a void pointer. - The library will not read or write more than datasize bytes from the void pointer. - For some calls no data is required in which case data should be NULL and datasize - may be used for some other purpose. -

-

- The available commands are as follows: -

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SFC_GET_LIB_VERSIONRetrieve the version of the library.
SFC_GET_LOG_INFORetrieve the internal per-file operation log.
SFC_CALC_SIGNAL_MAXRetrieve the measured maximum signal value.
SFC_CALC_NORM_SIGNAL_MAXRetrieve the measured normalised maximum signal value.
SFC_CALC_MAX_ALL_CHANNELSCalculate peaks for all channels.
SFC_CALC_NORM_MAX_ALL_CHANNELSCalculate normalised peaks for all channels.
SFC_SET_NORM_FLOATModify the normalisation behaviour of the floating point reading and writing functions.
SFC_SET_NORM_DOUBLEModify the normalisation behaviour of the double precision floating point reading and writing functions.
SFC_GET_NORM_FLOATRetrieve the current normalisation behaviour of the floating point reading and writing functions.
SFC_GET_NORM_DOUBLERetrieve the current normalisation behaviour of the double precision floating point reading and writing functions.
SFC_GET_SIMPLE_FORMAT_COUNTRetrieve the number of simple formats supported by libsndfile.
SFC_GET_SIMPLE_FORMATRetrieve information about a simple format.
SFC_GET_FORMAT_INFORetrieve information about a major or subtype format.
SFC_GET_FORMAT_MAJOR_COUNTRetrieve the number of major formats.
SFC_GET_FORMAT_MAJORRetrieve information about a major format type.
SFC_GET_FORMAT_SUBTYPE_COUNTRetrieve the number of subformats.
SFC_GET_FORMAT_SUBTYPERetrieve information about a subformat.
SFC_SET_ADD_PEAK_CHUNKSwitch the code for adding the PEAK chunk to WAV and AIFF files on or off.
SFC_UPDATE_HEADER_NOWUsed when a file is open for write, this command will update the file - header to reflect the data written so far.
SFC_SET_UPDATE_HEADER_AUTOUsed when a file is open for write, this command will cause the file header - to be updated after each write to the file.
SFC_FILE_TRUNCATETruncate a file open for write or for read/write.
SFC_SET_RAW_START_OFFSETChange the data start offset for files opened up as SF_FORMAT_RAW.
-
- -

- -
- - - -


SFC_GET_LIB_VERSION

-

-Retrieve the version of the library as a string. -

-

-Parameters: -

-        sndfile  : Not used
-        cmd      : SFC_GET_LIB_VERSION
-        data     : A pointer to a char buffer
-        datasize : The size of the the buffer
-
-

-Example: -

-
-        char  buffer [128] ;
-        sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer)) ;
-
- -
-
Return value:
-
This call will return the length of the retrieved version string. -
-
-
Notes:
-
-The string returned in the buffer passed to this function will not overflow -the buffer and will always be null terminated . -
- - - -


SFC_GET_LOG_INFO

-

-Retrieve the log buffer generated when opening a file as a string. This log -buffer can often contain a good reason for why libsndfile failed to open a -particular file. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_GET_LOG_INFO
-        data     : A pointer to a char buffer
-        datasize : The size of the the buffer
-
-

-Example: -

-
-        char  buffer [2048] ;
-        sf_command (sndfile, SFC_GET_LOG_INFO, buffer, sizeof (buffer)) ;
-
- -
-
Return value:
-
This call will return the length of the retrieved version string. -
-
-
Notes:
-
-The string returned in the buffer passed to this function will not overflow -the buffer and will always be null terminated . -
- - - -


SFC_CALC_SIGNAL_MAX

-

-Retrieve the measured maximum signal value. This involves reading through -the whole file which can be slow on large files. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_CALC_SIGNAL_MAX
-        data     : A pointer to a double
-        datasize : sizeof (double)
-
-

-Example: -

-
-        double   max_val ;
-        sf_command (sndfile, SFC_CALC_SIGNAL_MAX, &max_val, sizeof (max_val)) ;
-
- -
-
Return value:
-
Zero on success, non-zero otherwise. -
- - - -


SFC_CALC_NORM_SIGNAL_MAX

-

-Retrieve the measured normailised maximum signal value. This involves reading -through the whole file which can be slow on large files. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_CALC_NORM_SIGNAL_MAX
-        data     : A pointer to a double
-        datasize : sizeof (double)
-
-

-Example: -

-
-        double   max_val ;
-        sf_command (sndfile, SFC_CALC_NORM_SIGNAL_MAX, &max_val, sizeof (max_val)) ;
-
- -
-
Return value:
-
Zero on success, non-zero otherwise. -
- - - -


SFC_CALC_MAX_ALL_CHANNELS

-

-Calculate peaks for all channels. This involves reading through -the whole file which can be slow on large files. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_CALC_MAX_ALL_CHANNELS
-        data     : A pointer to a double
-        datasize : sizeof (double) * number_of_channels
-
-

-Example: -

-
-        double   peaks [number_of_channels] ;
-        sf_command (sndfile, SFC_CALC_MAX_ALL_CHANNELS, peaks, sizeof (peaks)) ;
-
-
-
Return value:
-
Zero if peaks have been calculated successfully and non-zero otherwise. -
- - - - -


SFC_CALC_NORM_MAX_ALL_CHANNELS

-

-Calculate normalised peaks for all channels. This involves reading through -the whole file which can be slow on large files. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_CALC_NORM_MAX_ALL_CHANNELS
-        data     : A pointer to a double
-        datasize : sizeof (double) * number_of_channels
-
-

-Example: -

-
-        double   peaks [number_of_channels] ;
-        sf_command (sndfile, SFC_CALC_NORM_MAX_ALL_CHANNELS, peaks, sizeof (peaks)) ;
-
-
-
Return value:
-
Zero if peaks have been calculated successfully and non-zero otherwise. -
- - - - - - - - - - - -


SFC_SET_NORM_FLOAT

-

-This command only affects data read from or written to using the floating point functions: -

-
-	size_t    sf_read_float    (SNDFILE *sndfile, float *ptr, size_t items) ;
-	size_t    sf_readf_float   (SNDFILE *sndfile, float *ptr, size_t frames) ;
-
-	size_t    sf_write_float   (SNDFILE *sndfile, float *ptr, size_t items) ;
-	size_t    sf_writef_float  (SNDFILE *sndfile, float *ptr, size_t frames) ;
-
-

-Parameters: -

-
-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_SET_NORM_FLOAT
-        data     : NULL
-        datasize : SF_TRUE or SF_FALSE
-
-

-For read operations setting normalisation to SF_TRUE means that the data from all -subsequent reads will be be normalised to the range [-1.0, 1.0]. -

-

-For write operations, setting normalisation to SF_TRUE means than all data supplied -to the float write functions should be in the range [-1.0, 1.0] and will be scaled -for the file format as necessary. -

-

-For both cases, setting normalisation to SF_FALSE means that no scaling will take place. -

-

-Example: -

-
-        sf_command (sndfile, SFC_SET_NORM_FLOAT, NULL, SF_TRUE) ;
-
-        sf_command (sndfile, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ;
-
-
-
Return value:
-
Returns 1 on success or 0 for failure. -
- - - -


SFC_SET_NORM_DOUBLE

-

-This command only affects data read from or written to using the double precision -floating point functions: -

-
-	size_t    sf_read_double    (SNDFILE *sndfile, double *ptr, size_t items) ;
-	size_t    sf_readf_double   (SNDFILE *sndfile, double *ptr, size_t frames) ;
-
-	size_t    sf_write_double   (SNDFILE *sndfile, double *ptr, size_t items) ;
-	size_t    sf_writef_double  (SNDFILE *sndfile, double *ptr, size_t frames) ;
-
-

-Parameters: -

-
-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_SET_NORM_DOUBLE
-        data     : NULL
-        datasize : SF_TRUE or SF_FALSE
-
-

-For read operations setting normalisation to SF_TRUE means that the data -from all subsequent reads will be be normalised to the range [-1.0, 1.0]. -

-

-For write operations, setting normalisation to SF_TRUE means than all data supplied -to the double write functions should be in the range [-1.0, 1.0] and will be scaled -for the file format as necessary. -

-

-For both cases, setting normalisation to SF_FALSE means that no scaling will take place. -

-

-Example: -

-
-        sf_command (sndfile, SFC_SET_NORM_DOUBLE, NULL, SF_TRUE) ;
-
-        sf_command (sndfile, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ;
-
-
-
Return value:
-
Returns 1 on success or 0 for failure. -
- - - -


SFC_GET_NORM_FLOAT

-

-Retrieve the current float normalisation mode. -

-

-Parameters: -

-
-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_GET_NORM_FLOAT
-        data     : NULL
-        datasize : anything
-
-

-Example: -

-
-        normalisation = sf_command (sndfile, SFC_GET_NORM_FLOAT, NULL, 0) ;
-
-
-
Return value:
-
Returns TRUE if normaisation is on and FALSE otherwise. -
- - - -


SFC_GET_NORM_DOUBLE

-

-Retrieve the current float normalisation mode. -

-

-Parameters: -

-
-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_GET_NORM_DOUBLE
-        data     : NULL
-        datasize : anything
-
-

-Example: -

-
-        normalisation = sf_command (sndfile, SFC_GET_NORM_DOUBLE, NULL, 0) ;
-
-
-
Return value:
-
Returns TRUE if normalisation is on and FALSE otherwise. -
- - - -


SFC_GET_SIMPLE_FORMAT_COUNT

-

-Retrieve the number of simple formats supported by libsndfile. -

-

-Parameters: -

-
-        sndfile  : Not used.
-        cmd      : SFC_GET_SIMPLE_FORMAT_COUNT
-        data     : a pointer to an int
-        datasize : sizeof (int)
-
-

-Example: -

-
-        int  count ;
-        sf_command (sndfile, SFC_GET_SIMPLE_FORMAT_COUNT, &count, sizeof (int)) ;
-
-
-
Return value:
-
0 -
- - - -


SFC_GET_SIMPLE_FORMAT

-

-Retrieve information about a simple format. -

-

-Parameters: -

-
-        sndfile  : Not used.
-        cmd      : SFC_GET_SIMPLE_FORMAT
-        data     : a pointer to an  SF_FORMAT_INFO struct
-        datasize : sizeof (SF_FORMAT_INFO)
-
-

-The SF_FORMAT_INFO struct is defined in <sndfile.h> as: -

-
-        typedef struct
-        {   int         format ;
-            const char  *name ;
-            const char  *extension ;
-        } SF_FORMAT_INFO ;
-
-

-When sf_command() is called with SF_GET_SIMPLE_FORMAT, the value of the format -field should be the format number (ie 0 <= format <= count value obtained using -SF_GET_SIMPLE_FORMAT_COUNT). -

-

-Example: -

-
-        SF_FORMAT_INFO	format_info ;
-        int             k, count ;
-
-        sf_command (sndfile, SFC_GET_SIMPLE_FORMAT_COUNT, &count, sizeof (int)) ;
-
-        for (k = 0 ; k < count ; k++)
-        {   format_info.format = k ;
-            sf_command (sndfile, SFC_GET_SIMPLE_FORMAT, &format_info, sizeof (format_info)) ;
-            printf ("%08x  %s %s\n", format_info.format, format_info.name, format_info.extension) ;
-            } ;
-
-
-
Return value:
-
0 on success and non-zero otherwise. -
The value of the format field of the SF_FORMAT_INFO struct will be an value which - can be placed in the format field of an SF_INFO struct when a file is to be opened - for write. -
The name field will contain a char* pointer to the name of the string ie "WAV (Microsoft 16 bit PCM)". -
The extention field will contain the most commonly used file extension for that file type. -
- - - -


SFC_GET_FORMAT_INFO

-

-Retrieve information about a major or subtype format. -

-

-Parameters: -

-
-        sndfile  : Not used.
-        cmd      : SFC_GET_FORMAT_INFO
-        data     : a pointer to an SF_FORMAT_INFO struct
-        datasize : sizeof (SF_FORMAT_INFO)
-
-

-The SF_FORMAT_INFO struct is defined in <sndfile.h> as: -

-
-        typedef struct
-        {   int         format ;
-            const char  *name ;
-            const char  *extension ;
-        } SF_FORMAT_INFO ;
-
-

-When sf_command() is called with SF_GET_FORMAT_INFO, the format field is -examined and if (format & SF_FORMAT_TYPEMASK) is a valid format then the struct -is filled in with information about the given major type. -If (format & SF_FORMAT_TYPEMASK) is FALSE and (format & SF_FORMAT_SUBMASK) is a -valid subtype format then the struct is filled in with information about the given -subtype. -

-

-Example: -

-
-        SF_FORMAT_INFO	format_info ;
-
-        format_info.format = SF_FORMAT_WAV ;
-        sf_command (sndfile, SFC_GET_FORMAT_INFO, &format_info, sizeof (format_info)) ;
-        printf ("%08x  %s %s\n", format_info.format, format_info.name, format_info.extension) ;
-
-        format_info.format = SF_FORMAT_ULAW ;
-        sf_command (sndfile, SFC_GET_FORMAT_INFO, &format_info, sizeof (format_info)) ;
-        printf ("%08x  %s\n", format_info.format, format_info.name) ;
-
-
-
Return value:
-
0 on success and non-zero otherwise. -
- - -


SFC_GET_FORMAT_MAJOR_COUNT

-

-Retrieve the number of major formats. -

-

-Parameters: -

-
-        sndfile  : Not used.
-        cmd      : SFC_GET_FORMAT_MAJOR_COUNT
-        data     : a pointer to an int
-        datasize : sizeof (int)
-
-

-Example: -

-
-        int  count ;
-        sf_command (sndfile, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof (int)) ;
-
-
-
Return value:
-
0 -
- - - -


SFC_GET_FORMAT_MAJOR

-

-Retrieve information about a major format type. -

-

-Parameters: -

-
-        sndfile  : Not used.
-        cmd      : SFC_GET_FORMAT_MAJOR
-        data     : a pointer to an  SF_FORMAT_INFO struct
-        datasize : sizeof (SF_FORMAT_INFO)
-
-

-Example: -

-
-        SF_FORMAT_INFO	format_info ;
-        int             k, count ;
-
-        sf_command (sndfile, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof (int)) ;
-
-        for (k = 0 ; k < count ; k++)
-        {   format_info.format = k ;
-            sf_command (sndfile, SFC_GET_FORMAT_MAJOR, &format_info, sizeof (format_info)) ;
-            printf ("%08x  %s %s\n", format_info.format, format_info.name, format_info.extension) ;
-            } ;
-
-

-For a more comprehensive example, see the program list_formats.c in the examples/ -directory of the libsndfile source code distribution. -

-
-
Return value:
-
0 on success and non-zero otherwise. -
The value of the format field will one of the major format identifiers suc as SF_FORMAT_WAV - SF_FORMAT_AIFF. -
The name field will contain a char* pointer to the name of the string ie "WAV (Microsoft)". -
The extention field will contain the most commonly used file extension for that file type. -
- - - -


SFC_GET_FORMAT_SUBTYPE_COUNT

-

-Retrieve the number of subformats. -

-

-Parameters: -

-
-        sndfile  : Not used.
-        cmd      : SFC_GET_FORMAT_SUBTYPE_COUNT
-        data     : a pointer to an int
-        datasize : sizeof (int)
-
-

-Example: -

-
-        int   count ;
-        sf_command (sndfile, SFC_GET_FORMAT_SUBTYPE_COUNT, &count, sizeof (int)) ;
-
-
-
Return value:
-
0 -
- - - -


SFC_GET_FORMAT_SUBTYPE

-

-Retrieve information about a subformat. -

-

-Parameters: -

-
-        sndfile  : Not used.
-        cmd      : SFC_GET_FORMAT_SUBTYPE
-        data     : a pointer to an SF_FORMAT_INFO struct
-        datasize : sizeof (SF_FORMAT_INFO)
-
-

-Example: -

-
-        SF_FORMAT_INFO	format_info ;
-        int             k, count ;
-
-        sf_command (sndfile, SFC_GET_FORMAT_SUBTYPE_COUNT, &count, sizeof (int)) ;
-
-        /* Retrieve all the subtypes supported by the WAV format. */
-        for (k = 0 ; k < count ; k++)
-        {   format_info.format = k ;
-            sf_command (sndfile, SFC_GET_FORMAT_SUBTYPE, &format_info, sizeof (format_info)) ;
-            if (! sf_format_check (format.info | SF_FORMAT_WAV))
-               continue ;
-            printf ("%08x  %s\n", format_info.format, format_info.name) ;
-            } ;
-
-

-For a more comprehensive example, see the program list_formats.c in the examples/ -directory of the libsndfile source code distribution. -

-
-
Return value:
-
0 on success and non-zero otherwise. -
The value of the format field will one of the major format identifiers such as SF_FORMAT_WAV - SF_FORMAT_AIFF. -
The name field will contain a char* pointer to the name of the string; for instance - "WAV (Microsoft)" or "AIFF (Apple/SGI)". -
The extention field will be a NULL pointer. -
- - - -


SFC_SET_ADD_PEAK_CHUNK

-

-By default, WAV and AIFF files which contain floating point data (subtype SF_FORMAT_FLOAT -or SF_FORMAT_DOUBLE) have a PEAK chunk. -By using this command, the addition of a PEAK chunk can be turned on or off. -

-

-Note : This call must be made before any data is written to the file. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_SET_ADD_PEAK_CHUNK
-        data     : Not used (should be NULL)
-        datasize : TRUE or FALSE.
-
-

-Example: -

-
-        /* Turn on the PEAK chunk. */
-        sf_command (sndfile, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_TRUE) ;
-
-        /* Turn off the PEAK chunk. */
-        sf_command (sndfile, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_FALSE) ;
-
-
-
Return value:
-
Returns SF_TRUE if the peak chunk will be written after this call. -
Returns SF_FALSE if the peak chunk will not be written after this call. -
- - - -


SFC_UPDATE_HEADER_NOW

-

-The header of an audio file is normally written by libsndfile when the file is -closed using sf_close(). -

-

-There are however situations where large files are being generated and it would -be nice to have valid data in the header before the file is complete. -Using this command will update the file header to reflect the amount of data written -to the file so far. -Other programs opening the file for read (before any more data is written) will -then read a valid sound file header. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_UPDATE_HEADER_NOW
-        data     : Not used (should be NULL)
-        datasize : Not used.
-
-

-Example: -

-
-        /* Update the header now. */
-        sf_command (sndfile, SFC_UPDATE_HEADER_NOW, NULL, 0) ;
-
-
-
Return value:
-
0 -
- - - -


SFC_SET_UPDATE_HEADER_AUTO

-

-Similar to SFC_UPDATE_HEADER_NOW but updates the header at the end of every call -to the sf_write* functions. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_UPDATE_HEADER_NOW
-        data     : Not used (should be NULL)
-        datasize : SF_TRUE or SF_FALSE
-
-

-Example: -

-
-        /* Turn on auto header update. */
-        sf_command (sndfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) ;
-
-        /* Turn off auto header update. */
-        sf_command (sndfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_FALSE) ;
-
-
-
Return value:
-
TRUE if auto update header is now on; FALSE otherwise. -
- - - -


SFC_FILE_TRUNCATE

-

-Truncate a file open for write or for read/write. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_FILE_TRUNCATE
-        data     : A pointer to an sf_count_t.
-        datasize : sizeof (sf_count_t)
-
- -

-Truncate the file to the number of frames specified by the sf_count_t pointed -to by data. -After this command, both the read and the write pointer will be -at the new end of the file. -This command will fail (returning non-zero) if the requested truncate position -is beyond the end of the file. -

-

-Example: -

-
-        /* Truncate the file to a length of 20 frames. */
-        sf_count_t  frames = 20 ;
-        sf_command (sndfile, SFC_FILE_TRUNCATE, &frames, sizeof (frames)) ;
-
-
-
Return value:
-
Zero on sucess, non-zero otherwise. -
- - - -


SFC_SET_RAW_START_OFFSET

-

-Change the data start offset for files opened up as SF_FORMAT_RAW. -

-

-Parameters: -

-        sndfile  : A valid SNDFILE* pointer
-        cmd      : SFC_SET_RAW_START_OFFSET
-        data     : A pointer to an sf_count_t.
-        datasize : sizeof (sf_count_t)
-
- -

-For a file opened as format SF_FORMAT_RAW, set the data offset to the value -given by data. -

-

-Example: -

-
-        /* Reset the data offset to 5 bytes from the start of the file. */
-        sf_count_t  offset = 5 ;
-        sf_command (sndfile, SFC_SET_RAW_START_OFFSET, &offset, sizeof (offset)) ;
-
-
-
Return value:
-
Zero on sucess, non-zero otherwise. -
- - - -
-

- The libsndfile home page is here : - - http://www.mega-nerd.com/libsndfile/. -
-Version : 1.0.24 -

- - - diff --git a/lib-src/libsndfile/doc/donate.html b/lib-src/libsndfile/doc/donate.html new file mode 100644 index 000000000..c611f47ff --- /dev/null +++ b/lib-src/libsndfile/doc/donate.html @@ -0,0 +1,112 @@ + + + + + + libsndfile : donate. + + + + + + + + + + + +
+ +
+ libsndfile.jpg +
+ +
+ +

+Dear libsndfile user, +

+ +

+This library was developed on Linux for Linux. I am not a Windows user and +maintaining this library for Windows costs me significant amounts of time above +and beyond the time taken to make it work on Linux and Unix-like systems. +

+ +

+I therefore ask Windows users of libsndfile to donate to ensure that libsndfile's +support for Windows continues. As long as donations continue to flow in at a decent +rate, I will continue to release precompiled Windows binaries in sync with the +Linux/Unix version. If donations are poor, support for windows will fall behind. +

+ + +

+You are free to donate any amount you chose. +As a guideline: +

+ +
    +
  • If you are simply a user of libsndfile that would like to ensure that + the development of libsndfile continues, a donation of $10US would be more + than adequate. +
    • +
  • If you are shareware author that distributes libsndfile with your app and + makes more than $1000 a year from your shareware, a one off donation of $50 + would be appropriate. +
    • +
  • If your company is a commercial software house that distributes one or more + products that ship with libsndfile, a donation of $100 every second or third + year would be appropriate. +
    • +
+ + +

+Donations can be made in Bitcoin to the Bitcoin address + 15hVWemFiH6DLJ22SBYPk9b4fgWtxBEvfQ + +which can be verified by checking the following GPG signature. +

+ +
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+libsndfile Bitcoin address : 15hVWemFiH6DLJ22SBYPk9b4fgWtxBEvfQ
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSK7MUAAoJEEXYQ7zIiotIgXEP/R8hy65tlV7TiPw9bY9BklXS
+/Vl8FU2RhDkBt61ZmxbfDTybyQ5Vce/3wWph15L4RvpoX1OyeintQFmwwuPjOGiq
+eIz0nT9vDorG37Xdo5NZNBu9Tp1Od9MNtxFaAsRWFrDfvKEKljBHrcfM972cYrAp
+DaFd0Ik+bHKom9iQXFB7TFd0w2V4uszVMQDUGqb/vRNeRURZS7ypeMNwc8tZyTKR
+waEGMTa5sxxRjs7MqGRxSovnFT7JV3TNfdkBInUliIR/XvrudFR9J4Fiv+8Dk9P8
+WNjm6uFxvgIqiu1G9bjrwwr+DsBju93ljGNcZoayAKw5vwbX6KTcCbc31k9dP8Hf
+p6YdmPlZVKZmva+P3nLSJBTlxNu24Jm+ha+ZM/svDXTaPFWC8l5FP17kK0Bj8wCq
+N7pDz6RchEn10u+HdhfT1XiUjxj0zNXrr0GGj9apjl0RlT0O49eBttV0oXIdBRLi
+nTEaOWITpCgu7ggw1kWXHIWEncuiaSuJy/iH8PgNepWVj/6PxQRMrTqG4ux2Snk8
+Ua4vO8YHLMZX/XvSUS7eMtgfM7AO6YjJ/ac9bQif9bh6LsYEVVklysMUin6ZRS7Z
+Cms23FnqeQKtJOzdvqSJiV06lK6fP+tYdM4WSYn+AfL4IfYl2v48xXVU8XOOK9BH
+bJPKMDcz1ZvfYtX5mSW1
+=WXGB
+-----END PGP SIGNATURE-----
+
+ +

+Thanks and regards, +
+Erik de Castro Lopo +
+Main libsndfile author and maintainer +

+ + + + + + + + diff --git a/lib-src/libsndfile/doc/index.html b/lib-src/libsndfile/doc/index.html index 367750cea..1513e34b1 100644 --- a/lib-src/libsndfile/doc/index.html +++ b/lib-src/libsndfile/doc/index.html @@ -6,7 +6,7 @@ libsndfile - + @@ -68,7 +68,6 @@
  • Every platform supported by Debian GNU/Linux including x86_64-linux-gnu, i486-linux-gnu, powerpc-linux-gnu, sparc-linux-gnu, alpha-linux-gnu, mips-linux-gnu and armel-linux-gnu.
    • -
  • arm-linux-androideab (Android phones OS)
  • powerpc-apple-darwin7.0 (Mac OS X 10.3)
  • sparc-sun-solaris2.8 (using gcc)
  • mips-sgi-irix5.3 (using gcc)
    • @@ -163,7 +162,7 @@ Signed 24 bit PCM R/WR/WR/WR/W - R/W R/WR/W + R/W R/W   R/W      R/WR/WR/W @@ -293,7 +292,7 @@ and I have decided that I will not be adding support for MPEG Layer 3 (commonly known as MP3) due to the patent issues surrounding this file format. See - + the FAQ for more.

    @@ -367,6 +366,14 @@ and
  • Version 1.0.22 (October 04 2010) Bunch of minor bug fixes.
  • Version 1.0.23 (October 10 2010) Minor bug fixes.
  • Version 1.0.24 (March 23 2011) Minor bug fixes. +
  • Version 1.0.25 (July 13 2011) Fix for Secunia Advisory SA45125. Minor bug fixes and + improvements. +
  • Version 1.0.26 (November 22 2015) Fix for CVE-2014-9496, CVE-2014-9756 and CVE-2015-7805. + Add ALAC/CAF support. Minor bug fixes and improvements. +
  • Version 1.0.27 (June 19 2016) Fix a seek regression in 1.0.26. Add metadata read/write + for CAF and RF64. FIx PAF endian-ness issue. +
  • Version 1.0.28 (April 2 2017) Fix buffer overruns in FLAC and ID3 handling code. Reduce default + header memory requirements. Fix detection of Large File Support for 32 bit systems. @@ -428,22 +435,28 @@ and

    -

    -The Win32 installer was compiled for Windows XP but should also work on Windows -2000, Vista and Windows 7. + The GPG signature can be validated at + Keybase.IO. +

    +

    +The Win32 installer should work on Windows Vista or later.

    diff --git a/lib-src/libsndfile/doc/libsndfile.css.in b/lib-src/libsndfile/doc/libsndfile.css.in index 90690805e..40fca0f14 100644 --- a/lib-src/libsndfile/doc/libsndfile.css.in +++ b/lib-src/libsndfile/doc/libsndfile.css.in @@ -83,6 +83,8 @@ h4 { pre { font-family : courier, monospace ; font-size : medium ; + margin-left : 6% ; + margin-right : 6% ; } a:link { color : #9090FF ; } a:visited { color : #5050FF ; } diff --git a/lib-src/libsndfile/doc/linux_games_programming.txt b/lib-src/libsndfile/doc/linux_games_programming.txt new file mode 100644 index 000000000..747f59db2 --- /dev/null +++ b/lib-src/libsndfile/doc/linux_games_programming.txt @@ -0,0 +1,434 @@ +# Here are some some emails I exchanged with a guy trying to use +# libsndfile version 1 with code from the book "Linux Games Programming" +# by John Hall. The email addresses have been changed to foil the spam +# bots. + +Date: Tue, 20 Jul 2004 22:49:21 +0100 +From: Paul +To: erikd@fake-domain-name.com +Subject: Can you help with a problem? +Date: Tue, 20 Jul 2004 22:49:21 +0100 + +Hi, + +I'm trying to get the source examples in the "Programming Linux Games" +(NoStarch, Loki Software + John R. Hall) which use sndfile.h/libsndfile. + +While I can guess some of the newer versions of function calls and +enumerations, there are some which I cannot guess. + +Would you be able to translate them to the current version of +enumeration and function calls so that I can update the source? + +These are the three currently failing me: + + sf_open_read(filename, SF_INFO *sfinfo) (guess: sf_open(filename,SFM_READ, &sfinfo)) + SF_FORMAT_PCM (guess: either SF_FORMAT_PCM_U8 or _RAW) + SF_INFO.pcmbitwidth (guess: no idea!) + +There are probably more. I'm happy to send you the source files for +sound calls, scan the pages or anything else. Failing that, is there +somewhere with the changes listed so I can try and fix the code for myself? + +Thanks + +TTFN + +Paul + +================================================================================ + +Date: Wed, 21 Jul 2004 17:38:08 +1000 +From: Erik de Castro Lopo +To: Paul +Subject: Re: Can you help with a problem? + +On Tue, 20 Jul 2004 22:49:21 +0100 +Paul wrote: + +> Hi, +> +> I'm trying to get the source examples in the "Programming Linux Games" +> (NoStarch, Loki Software + John R. Hall) which use sndfile.h/libsndfile. +> +> While I can guess some of the newer versions of function calls and +> enumerations, there are some which I cannot guess. +> +> Would you be able to translate them to the current version of +> enumeration and function calls so that I can update the source? +> +> These are the three currently failing me: +> +> sf_open_read(filename, SF_INFO *sfinfo) (guess: sf_open(filename, +> SFM_READ, &sfinfo)) + +yes. + +> SF_FORMAT_PCM (guess: either SF_FORMAT_PCM_U8 or _RAW) + +Actually this list: + + SF_FORMAT_PCM_U8 + SF_FORMAT_PCM_S8 + SF_FORMAT_PCM_16 + SF_FORMAT_PCM_24 + SF_FORMAT_PCM_32 + +> SF_INFO.pcmbitwidth (guess: no idea!) + +WIth the above change, pcmbitwidth becomes redundant. + +> There are probably more. I'm happy to send you the source files for +> sound calls, scan the pages or anything else. Failing that, is there +> somewhere with the changes listed so I can try and fix the code for +> myself? + +Version 1.0.0 came out some time ago, but I think this: + + http://www.mega-nerd.com/libsndfile/version-1.html + +lists most of the changes. You should also look at the API docs: + + http://www.mega-nerd.com/libsndfile/api.html + +HTH, +Erik +-- ++-----------------------------------------------------------+ + Erik de Castro Lopo nospam@fake-domain-name.com ++-----------------------------------------------------------+ +"There is no reason why anyone would want a computer in their home" +Ken Olson, DEC, 1977 + +================================================================================ + +From: PFJ +To: Erik de Castro Lopo +Subject: Re: Can you help with a problem? +Date: Wed, 21 Jul 2004 09:07:39 +0100 + + +Hi Erik, + +Thanks for getting back to me. + +> > sf_open_read(filename, SF_INFO *sfinfo) (guess: sf_open(filename, SFM_READ, &sfinfo)) +> +> yes. + +Yay! + +> > SF_FORMAT_PCM (guess: either SF_FORMAT_PCM_U8 or _RAW) +> +> Actually this list: +> +> SF_FORMAT_PCM_U8 +> SF_FORMAT_PCM_S8 +> SF_FORMAT_PCM_16 +> SF_FORMAT_PCM_24 +> SF_FORMAT_PCM_32 + +I know, but the source code explicitly has SF_FORMAT_PCM which given the +code afterwards would equate to one of the above, but given that PCM +files can have a varied bitwidth the author probably wanted to cover all +bases. + +> Version 1.0.0 came out some time ago, but I think this: +> +> http://www.mega-nerd.com/libsndfile/version-1.html +> +> lists most of the changes. You should also look at the API docs: +> +> http://www.mega-nerd.com/libsndfile/api.html + +I'll download them and see what I can gleen. + +Thanks again for getting back to me + +TTFN + +Paul + +================================================================================ + +Date: Wed, 21 Jul 2004 18:20:29 +1000 +From: Erik de Castro Lopo +To: PFJ +Subject: Re: Can you help with a problem? + +On Wed, 21 Jul 2004 09:07:39 +0100 +PFJ wrote: + +> I know, but the source code explicitly has SF_FORMAT_PCM which given the +> code afterwards would equate to one of the above, but given that PCM +> files can have a varied bitwidth the author probably wanted to cover all +> bases. + +But surely the existing code does something like: + + sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM; + sfinfo.pcmbitwidth = 16; + +which can be directly translated to: + + sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16; + +and the same for pcmbitwitdhs of 24 and 32. For pcmbitwidth of 8 +you need to know that WAV files use SF_FORMAT_PCM_U8 and AIFF +files use SF_FORMAT_PCM_S8. Thats all there is to it. + +Erik +-- ++-----------------------------------------------------------+ + Erik de Castro Lopo nospam@fake-domain-name.com ++-----------------------------------------------------------+ +"Python addresses true pseudocode's two major failings: that it +isn't standardized, and it isn't executable." +- Grant R. Griffin in comp.dsp + +================================================================================ + +Subject: Re: Can you help with a problem? +From: PFJ +To: Erik de Castro Lopo +Date: Wed, 21 Jul 2004 09:50:55 +0100 + +Hi Erik, + +> > I know, but the source code explicitly has SF_FORMAT_PCM which given the +> > code afterwards would equate to one of the above, but given that PCM +> > files can have a varied bitwidth the author probably wanted to cover all +> > bases. +> +> But surely the existing code does something like: +> +> sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM; +> sfinfo.pcmbitwidth = 16; + +If only! + +The actual code is this + +int LoadSoundFile(char *filename, sound_p sound) +{ + SNDFILE *file; + SF_INFO file_info; + short *buffer_short = NULL; + u_int8_t *buffer_8 = NULL; + int16_t *buffer_16 = NULL; + unsigned int i; + + /* Open the file and retrieve sample information. */ + file = sf_open_read(filename, &file_info); + // I've sorted this one already - PFJ + + /* Make sure the format is acceptable. */ + if ((file_info.format & 0x0F) != SF_FORMAT_PCM) { + printf("'%s' is not a PCM-based audio file.\n", filename); + sf_close(file); + return -1; + } + + if ((file_info.pcmbitwidth == 8) && (file_info.channels == 1)) { + sound->format = AL_FORMAT_MONO8; + } else if ((file_info.pcmbitwidth == 8) && (file_info.channels == 2)) { + sound->format = AL_FORMAT_STEREO8; + } else if ((file_info.pcmbitwidth == 16) && (file_info.channels == 1)) { + sound->format = AL_FORMAT_MONO16; + } else if ((file_info.pcmbitwidth == 16) && (file_info.channels == 2)) { + sound->format = AL_FORMAT_STEREO16; + } else { + printf("Unknown sample format in %s.\n", filename); + sf_close(file); + return -1; + } + + /* Allocate buffers. */ + buffer_short = (short *)malloc(file_info.samples * file_info.channels * sizeof (short)); + + buffer_8 = (u_int8_t *)malloc(file_info.samples * file_info.channels * file_info.pcmbitwidth / 8); + + buffer_16 = (int16_t *)buffer_8; + + if (buffer_short == NULL || buffer_8 == NULL) { + printf("Unable to allocate enough memory for '%s'.\n", filename); + goto error_cleanup; + } + + /* Read the entire sound file. */ + if (sf_readf_short(file,buffer_short,file_info.samples) == (size_t)-1) { + printf("Error while reading samples from '%s'.\n", filename); + goto error_cleanup; + } + + + + /* Fill in the sound data structure. */ + sound->freq = file_info.samplerate; + sound->size = file_info.samples * file_info.channels * file_info.pcmbitwidth / 8; + + /* Give our sound data to OpenAL. */ + alGenBuffers(1, &sound->name); + if (alGetError() != AL_NO_ERROR) { + printf("Error creating an AL buffer name for %s.\n", filename); + goto error_cleanup; + } + + alBufferData(sound->name, sound->format, buffer_8, sound->size,sound->freq); + if (alGetError() != AL_NO_ERROR) { + printf("Error sending buffer data to OpenAL for %s.\n", filename); + goto error_cleanup; + } + + /* Close the file and return success. */ + sf_close(file); + free(buffer_short); + free(buffer_8); + + return 0; + + error_cleanup: + if (file != NULL) fclose(file); + free(buffer_short); + free(buffer_8); + return -1; +} + +As you can see, the PCM material in the listing will not currently +compile and for the other sndfile material, it probably won't either. + +Any help would be appreciated. + +TTFN + +Paul + +================================================================================ + +From: Erik de Castro Lopo +To: PFJ +Subject: Re: Can you help with a problem? +Date: Wed, 21 Jul 2004 19:36:46 +1000 + +On Wed, 21 Jul 2004 09:50:55 +0100 +PFJ wrote: + +> Hi Erik, +> +> > > I know, but the source code explicitly has SF_FORMAT_PCM which given the +> > > code afterwards would equate to one of the above, but given that PCM +> > > files can have a varied bitwidth the author probably wanted to cover all +> > > bases. +> > +> > But surely the existing code does something like: +> > +> > sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM; +> > sfinfo.pcmbitwidth = 16; +> +> If only! + +No, really. + +Drop this completely: + +> /* Make sure the format is acceptable. */ +> if ((file_info.format & 0x0F) != SF_FORMAT_PCM) { +> printf("'%s' is not a PCM-based audio file.\n", filename); +> sf_close(file); +> return -1; +> } + +Replace this block: + +> if ((file_info.pcmbitwidth == 8) && (file_info.channels == 1)) { +> sound->format = AL_FORMAT_MONO8; +> } else if ((file_info.pcmbitwidth == 8) && (file_info.channels == 2)) { +> sound->format = AL_FORMAT_STEREO8; +> } else if ((file_info.pcmbitwidth == 16) && (file_info.channels == 1)) { +> sound->format = AL_FORMAT_MONO16; +> } else if ((file_info.pcmbitwidth == 16) && (file_info.channels == 2)) { +> sound->format = AL_FORMAT_STEREO16; +> } else { +> printf("Unknown sample format in %s.\n", filename); +> sf_close(file); +> return -1; +> } + +with: + + int pcmbitwidth = 0; + + if (file_info.format & SF_FORMAT_SUBMASK != SF_FORMAT_PCM_16) + { printf("'%s' is not a PCM-based audio file.\n", filename); + sf_close(file); + return -1; + } + + if (file_info.channels < 1 || file_info.channels > 2) + { printf("'%s' bad channel count.\n", filename); + sf_close(file); + return -1; + } + + switch (file_info.format & SF_FORMAT_SUBMASK + file_info.channels << 16) + { case (SF_FORMAT_PCM_U8 + 1 << 16): + sound->format = AL_FORMAT_MONO8; + pcmbitwidth = 8; + break; + case (SF_FORMAT_PCM_U8 + 2 << 16): + sound->format = AL_FORMAT_STEREO8; + pcmbitwidth = 8; + break; + case (SF_FORMAT_PCM_16 + 1 << 16): + sound->format = AL_FORMAT_MONO16; + pcmbitwidth = 16; + break; + case (SF_FORMAT_PCM_16 + 2 << 16): + sound->format = AL_FORMAT_STEREO16; + pcmbitwidth = 16; + break; + default: + printf("Unknown sample format in %s.\n", filename); + sf_close(file); + return -1; + } + +> /* Allocate buffers. */ +> buffer_short = (short *)malloc(file_info.samples * +> file_info.channels * +> sizeof (short)); +> +> buffer_8 = (u_int8_t *)malloc(file_info.samples * +> file_info.channels * +> file_info.pcmbitwidth / 8); + +Use pcmbitwidth as calculated above. + +> buffer_16 = (int16_t *)buffer_8; +> +> if (buffer_short == NULL || buffer_8 == NULL) { +> printf("Unable to allocate enough memory for '%s'.\n", filename); +> goto error_cleanup; +> } +> +> /* Read the entire sound file. */ +> if (sf_readf_short(file,buffer_short,file_info.samples) == (size_t)- 1) { + +Replace "(size_t) - 1" with " < 0". + +> As you can see, the PCM material in the listing will not currently +> compile and for the other sndfile material, it probably won't either. + +None of the changes above should have been very difficult to figure +out. + +Erik +-- ++-----------------------------------------------------------+ + Erik de Castro Lopo nospam@fake-domain-name.com ++-----------------------------------------------------------+ +Microsoft is finally bringing all of its Windows operating system families +under one roof. It will combine all of the features of CE, stability and +support of ME and the speed of NT. +It will be called Windows CEMENT... + diff --git a/lib-src/libsndfile/doc/octave.html b/lib-src/libsndfile/doc/octave.html index 525b7aec9..b696e6b81 100644 --- a/lib-src/libsndfile/doc/octave.html +++ b/lib-src/libsndfile/doc/octave.html @@ -15,21 +15,21 @@

    libsndfile and GNU Octave

    - GNU Octave is a high-level interactive - language for numerical computations. + GNU Octave is a high-level interactive + language for numerical computations. There are currently two development streams, a stable 2.0.X series and a development 2.1.X series. Octave reads and writes data in binary formats that were originally developed - for + for MATLAB. Version 2.0.X of Octave uses binary data files compatible with MATLAB version 4.2 while Octave 2.1.X uses binary data files compatible - with MATLAB version 5.0 as well as being able to read the older MATLAB 4.2 + with MATLAB version 5.0 as well as being able to read the older MATLAB 4.2 format.

    - From version 1.0.1 of libsndfile onwards, libsndfile has the ability of reading - and writing a small subset of the binary data files used by both versions + From version 1.0.1 of libsndfile onwards, libsndfile has the ability of reading + and writing a small subset of the binary data files used by both versions of GNU Octave. This gives people using GNU Octave for audio based work an easy method of moving audio data between GNU Octave and other programs which use libsndfile. @@ -37,22 +37,22 @@

    For instance it is now possible to do the following:

    - +
      -
    • Load a WAV file into a sound file editor such as +
    • Load a WAV file into a sound file editor such as Sweep.
    • Save it as a MAT4 file.
    • Load the data into Octave for manipulation. -
    • Save the modified data. +
    • Save the modified data.
    • Reload it in Sweep.

    Another example would be using the MAT4 or MAT5 file formats as a format which - can be easily loaded into Octave for viewing/analyzing as well as a format + can be easily loaded into Octave for viewing/analyzing as well as a format which can be played with command line players such as the one included with libsndfile.

    - +

    Details

    Octave, like most programming languages, uses variables to store data, and @@ -70,7 +70,7 @@ 

             octave:1 > samplerate = 44100 ;
         octave:2 > wavedata = sin ((0:1023)*2*pi/1024) ;
-        octave:3 > save sine.mat samplerate wavedata 
+        octave:3 > save sine.mat samplerate wavedata

    @@ -84,7 +84,7 @@

    In addition, libsndfile contains a command line program which which is able to play the correct types of Octave files. - Using this command line player sndfile-play and a third Octave script + Using this command line player sndfile-play and a third Octave script file allows Octave data to be played from within Octave on any of the platforms which sndfile-play supports (at the moment: Linux, MacOS X, Solaris and Win32). @@ -100,8 +100,8 @@

    - There are some other Octave scripts for audio to be found - here. + There are some other Octave scripts for audio to be found + here.


    @@ -109,7 +109,7 @@

    - The libsndfile home page is here : + The libsndfile home page is here : http://www.mega-nerd.com/libsndfile/.

    diff --git a/lib-src/libsndfile/doc/pkgconfig.html b/lib-src/libsndfile/doc/pkgconfig.html deleted file mode 100644 index c89193d1e..000000000 --- a/lib-src/libsndfile/doc/pkgconfig.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - libsndfile : pkg-config - - - - - - - - -
    -

    libsndfile and pkg-config

    - -

    - From version 1.0.0 libsndfile has had the ability to read and write files of - greater than 2 Gig in size on most OSes even if sizeof (long) == 4. - OSes which support this feature include Linux (2.4 kernel, glibc6) on x86, PPC and - probably others, Win32, MacOS X, *BSD, Solaris and probably others. - OSes on 64 bit processors where the default compile environment is LP64 (longs and - pointers are 64 bit ie Linux on DEC/Compaq/HP Alpha processors) automatically - support large file access. -

    -

    - Other OSes including Linux on 32 bit processors, 32 bit Solaris and others require - special compiler flags to add large file support. - This applies to both the compilation of the library itself and the compilation of - programs which link to the library. -

    -

    - Note : People using Win32, MacOS (both OS X and pre-OS X) or *BSD can disregard the - rest of this document as it does not apply to either of these OSes. -

    -

    - The pkg-config program makes finding the correct compiler flag values and - library location far easier. - During the installation of libsndfile, a file named sndfile.pc is installed - in the directory ${libdir}/pkgconfig (ie if libsndfile is installed in - /usr/local/lib, sndfile.pc will be installed in - /usr/local/lib/pkgconfig/). -

    -

    - In order for pkg-config to find sndfile.pc it may be necessary to point the - environment variable PKG_CONFIG_PATH in the right direction. -

    - 
    -        export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-
    - -

    - Then, to compile a C file into an object file, the command would be: -

    - 
    -        gcc `pkg-config --cflags sndfile` -c somefile.c
-
    -

    - and to link a number of objects into an executable that links against libsndfile, - the command would be: -

    - 
    -        gcc `pkg-config --libs sndfile` obj1.o obj2.o -o program
-
    - -

    - Obviously all this can be rolled into a Makefile for easier maintenance. -

    - - diff --git a/lib-src/libsndfile/doc/print.css b/lib-src/libsndfile/doc/print.css new file mode 100644 index 000000000..deb5b13da --- /dev/null +++ b/lib-src/libsndfile/doc/print.css @@ -0,0 +1,14 @@ +body { + background:white; + color:black; +} + +h1{ + background:white; + color:black; +} + +h2 { + background:white; + color:#666; +} diff --git a/lib-src/libsndfile/examples/Makefile.am b/lib-src/libsndfile/examples/Makefile.am deleted file mode 100644 index 3704b1dce..000000000 --- a/lib-src/libsndfile/examples/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## Process this file with automake to produce Makefile.in - -noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle sndfile-to-text - -AM_CPPFLAGS = -I$(top_srcdir)/src - -sndfile_to_text_SOURCES = sndfile-to-text.c -sndfile_to_text_LDADD = $(top_builddir)/src/libsndfile.la - -make_sine_SOURCES = make_sine.c -make_sine_LDADD = $(top_builddir)/src/libsndfile.la - -sfprocess_SOURCES = sfprocess.c -sfprocess_LDADD = $(top_builddir)/src/libsndfile.la - -list_formats_SOURCES = list_formats.c -list_formats_LDADD = $(top_builddir)/src/libsndfile.la - -generate_SOURCES = generate.c -generate_LDADD = $(top_builddir)/src/libsndfile.la - -sndfilehandle_SOURCES = sndfilehandle.cc -sndfilehandle_LDADD = $(top_builddir)/src/libsndfile.la - diff --git a/lib-src/libsndfile/examples/Makefile.in b/lib-src/libsndfile/examples/Makefile.in deleted file mode 100644 index 89a85614a..000000000 --- a/lib-src/libsndfile/examples/Makefile.in +++ /dev/null @@ -1,733 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -noinst_PROGRAMS = make_sine$(EXEEXT) sfprocess$(EXEEXT) \ - list_formats$(EXEEXT) generate$(EXEEXT) sndfilehandle$(EXEEXT) \ - sndfile-to-text$(EXEEXT) -subdir = examples -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/Cfg/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_generate_OBJECTS = generate.$(OBJEXT) -generate_OBJECTS = $(am_generate_OBJECTS) -generate_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_list_formats_OBJECTS = list_formats.$(OBJEXT) -list_formats_OBJECTS = $(am_list_formats_OBJECTS) -list_formats_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_make_sine_OBJECTS = make_sine.$(OBJEXT) -make_sine_OBJECTS = $(am_make_sine_OBJECTS) -make_sine_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sfprocess_OBJECTS = sfprocess.$(OBJEXT) -sfprocess_OBJECTS = $(am_sfprocess_OBJECTS) -sfprocess_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfile_to_text_OBJECTS = sndfile-to-text.$(OBJEXT) -sndfile_to_text_OBJECTS = $(am_sndfile_to_text_OBJECTS) -sndfile_to_text_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfilehandle_OBJECTS = sndfilehandle.$(OBJEXT) -sndfilehandle_OBJECTS = $(am_sndfilehandle_OBJECTS) -sndfilehandle_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -depcomp = $(SHELL) $(top_srcdir)/Cfg/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_@AM_V@) -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = -SOURCES = $(generate_SOURCES) $(list_formats_SOURCES) \ - $(make_sine_SOURCES) $(sfprocess_SOURCES) \ - $(sndfile_to_text_SOURCES) $(sndfilehandle_SOURCES) -DIST_SOURCES = $(generate_SOURCES) $(list_formats_SOURCES) \ - $(make_sine_SOURCES) $(sfprocess_SOURCES) \ - $(sndfile_to_text_SOURCES) $(sndfilehandle_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/src -sndfile_to_text_SOURCES = sndfile-to-text.c -sndfile_to_text_LDADD = $(top_builddir)/src/libsndfile.la -make_sine_SOURCES = make_sine.c -make_sine_LDADD = $(top_builddir)/src/libsndfile.la -sfprocess_SOURCES = sfprocess.c -sfprocess_LDADD = $(top_builddir)/src/libsndfile.la -list_formats_SOURCES = list_formats.c -list_formats_LDADD = $(top_builddir)/src/libsndfile.la -generate_SOURCES = generate.c -generate_LDADD = $(top_builddir)/src/libsndfile.la -sndfilehandle_SOURCES = sndfilehandle.cc -sndfilehandle_LDADD = $(top_builddir)/src/libsndfile.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .cc .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -generate$(EXEEXT): $(generate_OBJECTS) $(generate_DEPENDENCIES) $(EXTRA_generate_DEPENDENCIES) - @rm -f generate$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(generate_OBJECTS) $(generate_LDADD) $(LIBS) - -list_formats$(EXEEXT): $(list_formats_OBJECTS) $(list_formats_DEPENDENCIES) $(EXTRA_list_formats_DEPENDENCIES) - @rm -f list_formats$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(list_formats_OBJECTS) $(list_formats_LDADD) $(LIBS) - -make_sine$(EXEEXT): $(make_sine_OBJECTS) $(make_sine_DEPENDENCIES) $(EXTRA_make_sine_DEPENDENCIES) - @rm -f make_sine$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(make_sine_OBJECTS) $(make_sine_LDADD) $(LIBS) - -sfprocess$(EXEEXT): $(sfprocess_OBJECTS) $(sfprocess_DEPENDENCIES) $(EXTRA_sfprocess_DEPENDENCIES) - @rm -f sfprocess$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sfprocess_OBJECTS) $(sfprocess_LDADD) $(LIBS) - -sndfile-to-text$(EXEEXT): $(sndfile_to_text_OBJECTS) $(sndfile_to_text_DEPENDENCIES) $(EXTRA_sndfile_to_text_DEPENDENCIES) - @rm -f sndfile-to-text$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_to_text_OBJECTS) $(sndfile_to_text_LDADD) $(LIBS) - -sndfilehandle$(EXEEXT): $(sndfilehandle_OBJECTS) $(sndfilehandle_DEPENDENCIES) $(EXTRA_sndfilehandle_DEPENDENCIES) - @rm -f sndfilehandle$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(sndfilehandle_OBJECTS) $(sndfilehandle_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_formats.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make_sine.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfprocess.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-to-text.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfilehandle.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -.cc.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - -.cc.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/examples/generate.c b/lib-src/libsndfile/examples/generate.c index 8a9233297..dade7d90d 100644 --- a/lib-src/libsndfile/examples/generate.c +++ b/lib-src/libsndfile/examples/generate.c @@ -30,8 +30,6 @@ ** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "sfconfig.h" - #include #include #include @@ -98,6 +96,8 @@ encode_file (const char *infilename, const char *outfilename, int filetype) k = 16 - strlen (outfilename) ; PUT_DOTS (k) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; + if (! (infile = sf_open (infilename, SFM_READ, &sfinfo))) { printf ("Error : could not open file : %s\n", infilename) ; puts (sf_strerror (NULL)) ; diff --git a/lib-src/libsndfile/examples/generate.cs b/lib-src/libsndfile/examples/generate.cs new file mode 100644 index 000000000..1817856fa --- /dev/null +++ b/lib-src/libsndfile/examples/generate.cs @@ -0,0 +1,250 @@ +/* (c) 2004 James Robson, http://www.arbingersys.com +** +** 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-1307, USA. +** +** **************************** +** +** How to use: +** - libsndfile.dll must have already been compiled and be in this +** application's search path +** +** - You must edit this file to point to the file you want to convert. Set +** the following line of code (found in the Main() function further below) +** to the name of a .WAV file that exists on your system. +** 186: string sfn = "input.wav"; +** +** - From a command prompt type +** csc generate.cs +** +** - Run the resulting executable 'generate.exe' +** +** +** Note: You will obviously need the csc compiler and the .NET runtime. I think +** these are freely available for download from Microsoft's website +** (part of the .NET SDK?). +*/ + + +using System; +using System.Runtime.InteropServices; +using sf_count_t = System.Int64; //alias; see SF_INFO struct + +#if PLATFORM_64 +using size_t = System.UInt64; +#else +using size_t = System.UInt32; +#endif + + +class lsndf_example { + + +//sound file formats + public enum lsndf_frmts { + SF_FORMAT_WAV = 0x010000, /* Microsoft WAV format (little endian). */ + SF_FORMAT_AIFF = 0x020000, /* Apple/SGI AIFF format (big endian). */ + SF_FORMAT_AU = 0x030000, /* Sun/NeXT AU format (big endian). */ + SF_FORMAT_RAW = 0x040000, /* RAW PCM data. */ + SF_FORMAT_PAF = 0x050000, /* Ensoniq PARIS file format. */ + SF_FORMAT_SVX = 0x060000, /* Amiga IFF / SVX8 / SV16 format. */ + SF_FORMAT_NIST = 0x070000, /* Sphere NIST format. */ + SF_FORMAT_VOC = 0x080000, /* VOC files. */ + SF_FORMAT_IRCAM = 0x0A0000, /* Berkeley/IRCAM/CARL */ + SF_FORMAT_W64 = 0x0B0000, /* Sonic Foundry's 64 bit RIFF/WAV */ + SF_FORMAT_MAT4 = 0x0C0000, /* Matlab (tm) V4.2 / GNU Octave 2.0 */ + SF_FORMAT_MAT5 = 0x0D0000, /* Matlab (tm) V5.0 / GNU Octave 2.1 */ + SF_FORMAT_PVF = 0x0E0000, /* Portable Voice Format */ + SF_FORMAT_XI = 0x0F0000, /* Fasttracker 2 Extended Instrument */ + SF_FORMAT_HTK = 0x100000, /* HMM Tool Kit format */ + SF_FORMAT_SDS = 0x110000, /* Midi Sample Dump Standard */ + + /* Subtypes from here on. */ + + SF_FORMAT_PCM_S8 = 0x0001, /* Signed 8 bit data */ + SF_FORMAT_PCM_16 = 0x0002, /* Signed 16 bit data */ + SF_FORMAT_PCM_24 = 0x0003, /* Signed 24 bit data */ + SF_FORMAT_PCM_32 = 0x0004, /* Signed 32 bit data */ + + SF_FORMAT_PCM_U8 = 0x0005, /* Unsigned 8 bit data (WAV and RAW only) */ + + SF_FORMAT_FLOAT = 0x0006, /* 32 bit float data */ + SF_FORMAT_DOUBLE = 0x0007, /* 64 bit float data */ + + SF_FORMAT_ULAW = 0x0010, /* U-Law encoded. */ + SF_FORMAT_ALAW = 0x0011, /* A-Law encoded. */ + SF_FORMAT_IMA_ADPCM = 0x0012, /* IMA ADPCM. */ + SF_FORMAT_MS_ADPCM = 0x0013, /* Microsoft ADPCM. */ + + SF_FORMAT_GSM610 = 0x0020, /* GSM 6.10 encoding. */ + SF_FORMAT_VOX_ADPCM = 0x0021, /* OKI / Dialogix ADPCM */ + + SF_FORMAT_G721_32 = 0x0030, /* 32kbs G721 ADPCM encoding. */ + SF_FORMAT_G723_24 = 0x0031, /* 24kbs G723 ADPCM encoding. */ + SF_FORMAT_G723_40 = 0x0032, /* 40kbs G723 ADPCM encoding. */ + + SF_FORMAT_DWVW_12 = 0x0040, /* 12 bit Delta Width Variable Word encoding. */ + SF_FORMAT_DWVW_16 = 0x0041, /* 16 bit Delta Width Variable Word encoding. */ + SF_FORMAT_DWVW_24 = 0x0042, /* 24 bit Delta Width Variable Word encoding. */ + SF_FORMAT_DWVW_N = 0x0043, /* N bit Delta Width Variable Word encoding. */ + + SF_FORMAT_DPCM_8 = 0x0050, /* 8 bit differential PCM (XI only) */ + SF_FORMAT_DPCM_16 = 0x0051, /* 16 bit differential PCM (XI only) */ + + + /* Endian-ness options. */ + + SF_ENDIAN_FILE = 0x00000000, /* Default file endian-ness. */ + SF_ENDIAN_LITTLE = 0x10000000, /* Force little endian-ness. */ + SF_ENDIAN_BIG = 0x20000000, /* Force big endian-ness. */ + SF_ENDIAN_CPU = 0x30000000, /* Force CPU endian-ness. */ + + SF_FORMAT_SUBMASK = 0x0000FFFF, + SF_FORMAT_TYPEMASK = 0x0FFF0000, + SF_FORMAT_ENDMASK = 0x30000000 + } + + +//modes and other + public enum lsndf_tf + { /* True and false */ + SF_FALSE = 0, + SF_TRUE = 1, + + /* Modes for opening files. */ + SFM_READ = 0x10, + SFM_WRITE = 0x20, + SFM_RDWR = 0x30 + } + + +//important SF_INFO structure + [StructLayout(LayoutKind.Sequential)] + public struct SF_INFO + { + public sf_count_t frames ; // Used to be called samples. Changed to avoid confusion. + public int samplerate ; + public int channels ; + public int format ; + public int sections ; + public int seekable ; + }; + + +//function declarations +//Note: Not all functions have been prototyped here. Only the ones necessary to +// make this application work. The below code should give some clues as to +// how to add the rest since they have a lot of parameter and return type +// similarities. + [DllImport("libsndfile.dll")] + public static extern IntPtr sf_open ([MarshalAs(UnmanagedType.LPStr)] string path, int mode, ref SF_INFO sfinfo); + + [DllImport("libsndfile.dll")] + static extern int sf_error (IntPtr sndfile); + + [DllImport("libsndfile.dll")] + static extern IntPtr sf_strerror (IntPtr sndfile); + + [DllImport("libsndfile.dll")] + static extern int sf_format_check (ref SF_INFO info); + + [DllImport("libsndfile.dll")] + static extern sf_count_t sf_read_float (IntPtr sndfile, float[] ptr, sf_count_t items); + + [DllImport("libsndfile.dll")] + static extern sf_count_t sf_write_float (IntPtr sndfile, float[] ptr, sf_count_t items); + + [DllImport("libsndfile.dll")] + static extern int sf_close (IntPtr sndfile); + + + public const sf_count_t BUFFER_LEN = 4096; + + +//program entry + static void Main( ) { + + +//declarations + SF_INFO sfinfo = new SF_INFO(); + float[] buffer = new float[BUFFER_LEN]; + sf_count_t rcnt; + +//set the input file + string sfn = "input.wav"; //set to a file on YOUR system + //string sfn = "noexist.wav"; //test with non-existent file + +//set the output file + string ofn = "output.wav"; + +//read in sound file to convert + IntPtr infile = sf_open (sfn, (int)lsndf_tf.SFM_READ, ref sfinfo); + +//exit if error was thrown + if ( (int)infile == 0 ) { + Console.WriteLine("Error opening " + sfn); + Console.WriteLine("Error #" + sf_error(infile)); + return; + } + +//set the file type for the output file +//uncomment one and only one of the statements below to change the output +//file encoding. + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_PCM_U8); + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_PCM_16); + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_MS_ADPCM); + sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_IMA_ADPCM); + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_GSM610); + /* Soundforge W64. */ + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_PCM_U8); + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_PCM_16); + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_MS_ADPCM); + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_IMA_ADPCM); + //sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_GSM610); + + +//check that SF_INFO is valid + if ( sf_format_check(ref sfinfo) == 0 ) { + Console.WriteLine("sf_format_check failed. Invalid encoding"); + return; + } + +//open output file + IntPtr outfile = sf_open (ofn, (int)lsndf_tf.SFM_WRITE, ref sfinfo); + +//exit if error was thrown + if ( (int)outfile == 0 ) { + Console.WriteLine("Error opening " + ofn); + Console.WriteLine("Error #" + sf_error(outfile)); + return; + } + +//infile -> outfile + Console.Write(sfn + " -> " + ofn); + while ( (rcnt = sf_read_float (infile, buffer, BUFFER_LEN)) > 0) { + Console.Write("."); + sf_write_float (outfile, buffer, BUFFER_LEN); + } + Console.WriteLine("done."); + +//close up shop + sf_close(infile); + sf_close(outfile); + + + } //main() + + +} //class lsndf_example {} + diff --git a/lib-src/libsndfile/examples/list_formats.c b/lib-src/libsndfile/examples/list_formats.c index 6d462f079..348c81b07 100644 --- a/lib-src/libsndfile/examples/list_formats.c +++ b/lib-src/libsndfile/examples/list_formats.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2014 Erik de Castro Lopo ** ** All rights reserved. ** @@ -41,17 +41,10 @@ int main (void) { SF_FORMAT_INFO info ; SF_INFO sfinfo ; - char buffer [128] ; int format, major_count, subtype_count, m, s ; memset (&sfinfo, 0, sizeof (sfinfo)) ; - buffer [0] = 0 ; - sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer)) ; - if (strlen (buffer) < 1) - { printf ("Line %d: could not retrieve lib version.\n", __LINE__) ; - exit (1) ; - } ; - printf ("Version : %s\n\n", buffer) ; + printf ("Version : %s\n\n", sf_version_string ()) ; sf_command (NULL, SFC_GET_FORMAT_MAJOR_COUNT, &major_count, sizeof (int)) ; sf_command (NULL, SFC_GET_FORMAT_SUBTYPE_COUNT, &subtype_count, sizeof (int)) ; diff --git a/lib-src/libsndfile/examples/make_sine.c b/lib-src/libsndfile/examples/make_sine.c index ec8a83027..76f35b0bc 100644 --- a/lib-src/libsndfile/examples/make_sine.c +++ b/lib-src/libsndfile/examples/make_sine.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2012 Erik de Castro Lopo ** ** All rights reserved. ** @@ -55,8 +55,8 @@ main (void) int *buffer ; if (! (buffer = malloc (2 * SAMPLE_COUNT * sizeof (int)))) - { printf ("Malloc failed.\n") ; - exit (0) ; + { printf ("Error : Malloc failed.\n") ; + return 1 ; } ; memset (&sfinfo, 0, sizeof (sfinfo)) ; @@ -68,6 +68,7 @@ main (void) if (! (file = sf_open ("sine.wav", SFM_WRITE, &sfinfo))) { printf ("Error : Not able to open output file.\n") ; + free (buffer) ; return 1 ; } ; @@ -82,8 +83,10 @@ main (void) } ; } else - { printf ("makesine can only generate mono or stereo files.\n") ; - exit (1) ; + { printf ("Error : make_sine can only generate mono or stereo files.\n") ; + sf_close (file) ; + free (buffer) ; + return 1 ; } ; if (sf_write_int (file, buffer, sfinfo.channels * SAMPLE_COUNT) != @@ -91,6 +94,7 @@ main (void) puts (sf_strerror (file)) ; sf_close (file) ; - return 0 ; + free (buffer) ; + return 0 ; } /* main */ diff --git a/lib-src/libsndfile/examples/sfprocess.c b/lib-src/libsndfile/examples/sfprocess.c index 5c7db2884..1c141a498 100644 --- a/lib-src/libsndfile/examples/sfprocess.c +++ b/lib-src/libsndfile/examples/sfprocess.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2013 Erik de Castro Lopo ** ** All rights reserved. ** @@ -7,15 +7,15 @@ ** modification, are permitted provided that the following conditions are ** met: ** -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the author nor the names of any contributors may be used -** to endorse or promote products derived from this software without -** specific prior written permission. +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the author nor the names of any contributors may be used +** to endorse or promote products derived from this software without +** specific prior written permission. ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -31,12 +31,13 @@ */ #include +#include /* Include this header file to use functions from libsndfile. */ #include -/* This will be the length of the buffer used to hold.frames while -** we process them. +/* This will be the length of the buffer used to hold.frames while +** we process them. */ #define BUFFER_LEN 1024 @@ -49,31 +50,35 @@ static void process_data (double *data, int count, int channels) ; int main (void) -{ /* This is a buffer of double precision floating point values - ** which will hold our data while we process it. - */ - static double data [BUFFER_LEN] ; +{ /* This is a buffer of double precision floating point values + ** which will hold our data while we process it. + */ + static double data [BUFFER_LEN] ; - /* A SNDFILE is very much like a FILE in the Standard C library. The - ** sf_open function return an SNDFILE* pointer when they sucessfully + /* A SNDFILE is very much like a FILE in the Standard C library. The + ** sf_open function return an SNDFILE* pointer when they sucessfully ** open the specified file. - */ - SNDFILE *infile, *outfile ; + */ + SNDFILE *infile, *outfile ; - /* A pointer to an SF_INFO stutct is passed to sf_open. - ** On read, the library fills this struct with information about the file. - ** On write, the struct must be filled in before calling sf_open. - */ - SF_INFO sfinfo ; - int readcount ; - const char *infilename = "input.wav" ; - const char *outfilename = "output.wav" ; + /* A pointer to an SF_INFO struct is passed to sf_open. + ** On read, the library fills this struct with information about the file. + ** On write, the struct must be filled in before calling sf_open. + */ + SF_INFO sfinfo ; + int readcount ; + const char *infilename = "input.wav" ; + const char *outfilename = "output.wav" ; - /* Here's where we open the input file. We pass sf_open the file name and - ** a pointer to an SF_INFO struct. - ** On successful open, sf_open returns a SNDFILE* pointer which is used - ** for all subsequent operations on that file. - ** If an error occurs during sf_open, the function returns a NULL pointer. + /* The SF_INFO struct must be initialized before using it. + */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + /* Here's where we open the input file. We pass sf_open the file name and + ** a pointer to an SF_INFO struct. + ** On successful open, sf_open returns a SNDFILE* pointer which is used + ** for all subsequent operations on that file. + ** If an error occurs during sf_open, the function returns a NULL pointer. ** ** If you are trying to open a raw headerless file you will need to set the ** format and channels fields of sfinfo before calling sf_open(). For @@ -82,56 +87,56 @@ main (void) ** ** sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16 ; ** sfinfo.channels = 2 ; - */ - if (! (infile = sf_open (infilename, SFM_READ, &sfinfo))) - { /* Open failed so print an error message. */ - printf ("Not able to open input file %s.\n", infilename) ; - /* Print the error message from libsndfile. */ - puts (sf_strerror (NULL)) ; - return 1 ; - } ; + */ + if (! (infile = sf_open (infilename, SFM_READ, &sfinfo))) + { /* Open failed so print an error message. */ + printf ("Not able to open input file %s.\n", infilename) ; + /* Print the error message from libsndfile. */ + puts (sf_strerror (NULL)) ; + return 1 ; + } ; - if (sfinfo.channels > MAX_CHANNELS) - { printf ("Not able to process more than %d channels\n", MAX_CHANNELS) ; - return 1 ; - } ; - /* Open the output file. */ - if (! (outfile = sf_open (outfilename, SFM_WRITE, &sfinfo))) - { printf ("Not able to open output file %s.\n", outfilename) ; - puts (sf_strerror (NULL)) ; - return 1 ; - } ; + if (sfinfo.channels > MAX_CHANNELS) + { printf ("Not able to process more than %d channels\n", MAX_CHANNELS) ; + return 1 ; + } ; + /* Open the output file. */ + if (! (outfile = sf_open (outfilename, SFM_WRITE, &sfinfo))) + { printf ("Not able to open output file %s.\n", outfilename) ; + puts (sf_strerror (NULL)) ; + return 1 ; + } ; - /* While there are.frames in the input file, read them, process - ** them and write them to the output file. - */ - while ((readcount = sf_read_double (infile, data, BUFFER_LEN))) - { process_data (data, readcount, sfinfo.channels) ; - sf_write_double (outfile, data, readcount) ; - } ; + /* While there are.frames in the input file, read them, process + ** them and write them to the output file. + */ + while ((readcount = sf_read_double (infile, data, BUFFER_LEN))) + { process_data (data, readcount, sfinfo.channels) ; + sf_write_double (outfile, data, readcount) ; + } ; - /* Close input and output files. */ - sf_close (infile) ; - sf_close (outfile) ; + /* Close input and output files. */ + sf_close (infile) ; + sf_close (outfile) ; - return 0 ; + return 0 ; } /* main */ static void process_data (double *data, int count, int channels) { double channel_gain [MAX_CHANNELS] = { 0.5, 0.8, 0.1, 0.4, 0.4, 0.9 } ; - int k, chan ; + int k, chan ; - /* Process the data here. - ** If the soundfile contains more then 1 channel you need to take care of - ** the data interleaving youself. - ** Current we just apply a channel dependant gain. - */ + /* Process the data here. + ** If the soundfile contains more then 1 channel you need to take care of + ** the data interleaving youself. + ** Current we just apply a channel dependant gain. + */ - for (chan = 0 ; chan < channels ; chan ++) - for (k = chan ; k < count ; k+= channels) - data [k] *= channel_gain [chan] ; + for (chan = 0 ; chan < channels ; chan ++) + for (k = chan ; k < count ; k+= channels) + data [k] *= channel_gain [chan] ; - return ; + return ; } /* process_data */ diff --git a/lib-src/libsndfile/examples/sndfile-loopify.c b/lib-src/libsndfile/examples/sndfile-loopify.c new file mode 100644 index 000000000..b0aded4ab --- /dev/null +++ b/lib-src/libsndfile/examples/sndfile-loopify.c @@ -0,0 +1,180 @@ +/* +** Copyright (C) 1999-2015 Erik de Castro Lopo +** +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the author nor the names of any contributors may be used +** to endorse or promote products derived from this software without +** specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +** PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +** OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +** WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +** OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +/* +** A quick/rough hack to add SF_INSTRUMENT data to a file. It compiles, but +** no guarantees beyond that. Happy to receive patches to fix/improve it. +** +** Code for this was stolen from programs/sndfile-convert.c and related code. +*/ + +#include +#include +#include +#include + +#include + +#define BUFFER_LEN (1 << 14) + + +typedef struct +{ char *infilename, *outfilename ; + SF_INFO infileinfo, outfileinfo ; +} OptionData ; + +const char * program_name (const char * argv0) ; +static void sfe_copy_data_int (SNDFILE *outfile, SNDFILE *infile, int channels) ; +static void add_instrument_data (SNDFILE *outfile, const SF_INFO * in_info) ; + +static void +usage_exit (const char *progname) +{ + printf ("\nUsage : %s \n", progname) ; + puts ("") ; + exit (1) ; +} /* usage_exit */ + +int +main (int argc, char * argv []) +{ const char *progname, *infilename, *outfilename ; + SNDFILE *infile = NULL, *outfile = NULL ; + SF_INFO in_sfinfo, out_sfinfo ; + + progname = program_name (argv [0]) ; + + if (argc < 3 || argc > 5) + usage_exit (progname) ; + + infilename = argv [argc-2] ; + outfilename = argv [argc-1] ; + + if (strcmp (infilename, outfilename) == 0) + { printf ("Error : Input and output filenames are the same.\n\n") ; + usage_exit (progname) ; + } ; + + if (strlen (infilename) > 1 && infilename [0] == '-') + { printf ("Error : Input filename (%s) looks like an option.\n\n", infilename) ; + usage_exit (progname) ; + } ; + + if (outfilename [0] == '-') + { printf ("Error : Output filename (%s) looks like an option.\n\n", outfilename) ; + usage_exit (progname) ; + } ; + + memset (&in_sfinfo, 0, sizeof (in_sfinfo)) ; + + if ((infile = sf_open (infilename, SFM_READ, &in_sfinfo)) == NULL) + { printf ("Not able to open input file %s.\n", infilename) ; + puts (sf_strerror (NULL)) ; + return 1 ; + } ; + + memcpy (&out_sfinfo, &in_sfinfo, sizeof (out_sfinfo)) ; + /* Open the output file. */ + if ((outfile = sf_open (outfilename, SFM_WRITE, &out_sfinfo)) == NULL) + { printf ("Not able to open output file %s : %s\n", outfilename, sf_strerror (NULL)) ; + return 1 ; + } ; + + /* Add the loop data */ + add_instrument_data (outfile, &in_sfinfo) ; + + /* Copy the audio data */ + sfe_copy_data_int (outfile, infile, in_sfinfo.channels) ; + + sf_close (infile) ; + sf_close (outfile) ; + + return 0 ; +} /* main */ + +const char * +program_name (const char * argv0) +{ const char * tmp ; + + tmp = strrchr (argv0, '/') ; + argv0 = tmp ? tmp + 1 : argv0 ; + + /* Remove leading libtool name mangling. */ + if (strstr (argv0, "lt-") == argv0) + return argv0 + 3 ; + + return argv0 ; +} /* program_name */ + +static void +sfe_copy_data_int (SNDFILE *outfile, SNDFILE *infile, int channels) +{ static int data [BUFFER_LEN] ; + int frames, readcount ; + + frames = BUFFER_LEN / channels ; + readcount = frames ; + + while (readcount > 0) + { readcount = sf_readf_int (infile, data, frames) ; + sf_writef_int (outfile, data, readcount) ; + } ; + + return ; +} /* sfe_copy_data_int */ + +static void +add_instrument_data (SNDFILE *file, const SF_INFO *info) +{ SF_INSTRUMENT instr ; + + memset (&instr, 0, sizeof (instr)) ; + + instr.gain = 1 ; + instr.basenote = 0 ; + instr.detune = 0 ; + instr.velocity_lo = 0 ; + instr.velocity_hi = 0 ; + instr.key_lo = 0 ; + instr.key_hi = 0 ; + instr.loop_count = 1 ; + + instr.loops [0].mode = SF_LOOP_FORWARD ; + instr.loops [0].start = 0 ; + instr.loops [0].end = info->frames ; + instr.loops [0].count = 0 ; + + if (sf_command (file, SFC_SET_INSTRUMENT, &instr, sizeof (instr)) == SF_FALSE) + { printf ("\n\nLine %d : sf_command (SFC_SET_INSTRUMENT) failed.\n\n", __LINE__) ; + exit (1) ; + } ; + + return ; +} /* add_instrument_data */ + diff --git a/lib-src/libsndfile/examples/sndfile-to-text.c b/lib-src/libsndfile/examples/sndfile-to-text.c index 7a7a21919..d5d0ec977 100644 --- a/lib-src/libsndfile/examples/sndfile-to-text.c +++ b/lib-src/libsndfile/examples/sndfile-to-text.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo ** ** All rights reserved. ** @@ -34,14 +34,25 @@ #include #include #include +#include #include -#define BLOCK_SIZE 512 +#define BLOCK_SIZE 4096 + +#ifdef DBL_DECIMAL_DIG + #define OP_DBL_Digs (DBL_DECIMAL_DIG) +#else + #ifdef DECIMAL_DIG + #define OP_DBL_Digs (DECIMAL_DIG) + #else + #define OP_DBL_Digs (DBL_DIG + 3) + #endif +#endif static void print_usage (char *progname) -{ printf ("\nUsage : %s \n", progname) ; +{ printf ("\nUsage : %s [--full-precision] \n", progname) ; puts ("\n" " Where the output file will contain a line for each frame\n" " and a column for each channel.\n" @@ -50,14 +61,20 @@ print_usage (char *progname) } /* print_usage */ static void -convert_to_text (SNDFILE * infile, FILE * outfile, int channels) -{ float buf [channels * BLOCK_SIZE] ; +convert_to_text (SNDFILE * infile, FILE * outfile, int channels, int full_precision) +{ float buf [BLOCK_SIZE] ; + sf_count_t frames ; int k, m, readcount ; - while ((readcount = sf_readf_float (infile, buf, BLOCK_SIZE)) > 0) + frames = BLOCK_SIZE / channels ; + + while ((readcount = sf_readf_float (infile, buf, frames)) > 0) { for (k = 0 ; k < readcount ; k++) { for (m = 0 ; m < channels ; m++) - fprintf (outfile, " % 12.10f", buf [k * channels + m]) ; + if (full_precision) + fprintf (outfile, " %.*e", OP_DBL_Digs - 1, buf [k * channels + m]) ; + else + fprintf (outfile, " % 12.10f", buf [k * channels + m]) ; fprintf (outfile, "\n") ; } ; } ; @@ -68,16 +85,27 @@ convert_to_text (SNDFILE * infile, FILE * outfile, int channels) int main (int argc, char * argv []) { char *progname, *infilename, *outfilename ; - SNDFILE *infile = NULL ; + SNDFILE *infile = NULL ; FILE *outfile = NULL ; - SF_INFO sfinfo ; + SF_INFO sfinfo ; + int full_precision = 0 ; progname = strrchr (argv [0], '/') ; progname = progname ? progname + 1 : argv [0] ; - if (argc != 3) - { print_usage (progname) ; - return 1 ; + switch (argc) + { case 4 : + if (!strcmp ("--full-precision", argv [3])) + { print_usage (progname) ; + return 1 ; + } ; + full_precision = 1 ; + argv++ ; + case 3 : + break ; + default: + print_usage (progname) ; + return 1 ; } ; infilename = argv [1] ; @@ -101,6 +129,8 @@ main (int argc, char * argv []) return 1 ; } ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; + if ((infile = sf_open (infilename, SFM_READ, &sfinfo)) == NULL) { printf ("Not able to open input file %s.\n", infilename) ; puts (sf_strerror (NULL)) ; @@ -116,7 +146,7 @@ main (int argc, char * argv []) fprintf (outfile, "# Converted from file %s.\n", infilename) ; fprintf (outfile, "# Channels %d, Sample rate %d\n", sfinfo.channels, sfinfo.samplerate) ; - convert_to_text (infile, outfile, sfinfo.channels) ; + convert_to_text (infile, outfile, sfinfo.channels, full_precision) ; sf_close (infile) ; fclose (outfile) ; diff --git a/lib-src/libsndfile/id3.patch b/lib-src/libsndfile/id3.patch deleted file mode 100644 index 22b19ac4e..000000000 --- a/lib-src/libsndfile/id3.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 41da64d9270b2fa10c93ce74dea014fe8f0bd303 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Sat, 5 Nov 2011 09:49:14 +1100 -Subject: [PATCH] src/id3.c : Fix a stack overflow when parsing a file with multiple ID3 headers. - ---- - ChangeLog | 8 ++++++++ - src/id3.c | 11 ++++++++--- - 2 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 380aa4c..3fe35fc 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,11 @@ -+2011-11-05 Erik de Castro Lopo -+ -+ * src/id3.c -+ Fix a stack overflow that can occur when parsing a file with multiple -+ ID3 headers which would cause libsndfile to go into an infinite recursion -+ until it blew the stack. Thanks to Anders Svensson for supplying an example -+ file. -+ - 2011-10-30 Erik de Castro Lopo - - * src/double64.c src/float32.c src/common.h -diff --git a/src/id3.c b/src/id3.c -index a1a189e..2fd0a0b 100644 ---- a/src/id3.c -+++ b/src/id3.c -@@ -40,11 +40,16 @@ id3_skip (SF_PRIVATE * psf) - offset = (offset << 7) | (buf [8] & 0x7f) ; - offset = (offset << 7) | (buf [9] & 0x7f) ; - -- psf_binheader_readf (psf, "j", make_size_t (offset)) ; -- - psf_log_printf (psf, "ID3 length : %d\n--------------------\n", offset) ; - -- psf->fileoffset = 10 + offset ; -+ /* Never want to jump backwards in a file. */ -+ if (offset < 0) -+ return 0 ; -+ -+ /* Calculate new file offset and position ourselves there. */ -+ psf->fileoffset += offset + 10 ; -+ psf_binheader_readf (psf, "p", psf->fileoffset) ; -+ - return 1 ; - } ; - --- -1.7.4.1 - diff --git a/lib-src/libsndfile/libsndfile-ppc-crash-on-some-id3-mp3s.patch b/lib-src/libsndfile/libsndfile-ppc-crash-on-some-id3-mp3s.patch deleted file mode 100644 index fba530292..000000000 --- a/lib-src/libsndfile/libsndfile-ppc-crash-on-some-id3-mp3s.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: libsndfile/src/id3.c -=================================================================== ---- libsndfile/src/id3.c (revision 11748) -+++ libsndfile/src/id3.c (working copy) -@@ -32,7 +32,7 @@ - { unsigned char buf [10] ; - - memset (buf, 0, sizeof (buf)) ; -- psf_binheader_readf (psf, "pb", 0, buf, 10) ; -+ psf_binheader_readf (psf, "pb", (size_t)0, buf, 10) ; - - if (buf [0] == 'I' && buf [1] == 'D' && buf [2] == '3') - { int offset = buf [6] & 0x7f ; -@@ -48,7 +48,7 @@ - - /* Calculate new file offset and position ourselves there. */ - psf->fileoffset += offset + 10 ; -- psf_binheader_readf (psf, "p", psf->fileoffset) ; -+ psf_binheader_readf (psf, "p", (size_t)psf->fileoffset) ; - - return 1 ; - } ; diff --git a/lib-src/libsndfile/libsndfile-srcdir.patch b/lib-src/libsndfile/libsndfile-srcdir.patch deleted file mode 100644 index 878b482c6..000000000 --- a/lib-src/libsndfile/libsndfile-srcdir.patch +++ /dev/null @@ -1,81 +0,0 @@ -Index: lib-src/libsndfile/Makefile.am -=================================================================== ---- lib-src/libsndfile/Makefile.am (revision 13510) -+++ lib-src/libsndfile/Makefile.am (working copy) -@@ -8,7 +8,7 @@ - octave_dir = Octave - endif - --SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs -+SUBDIRS = M4 man doc Win32 src #$(octave_dir) examples regtest tests programs - DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs - - EXTRA_DIST = libsndfile.spec.in sndfile.pc.in -Index: lib-src/libsndfile/Makefile.in -=================================================================== ---- lib-src/libsndfile/Makefile.in (revision 13510) -+++ lib-src/libsndfile/Makefile.in (working copy) -@@ -412,7 +412,7 @@ - ACLOCAL_AMFLAGS = -I M4 - DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror - @BUILD_OCTAVE_MOD_TRUE@octave_dir = Octave --SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs -+SUBDIRS = M4 man doc Win32 src #$(octave_dir) examples regtest tests programs - DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs - EXTRA_DIST = libsndfile.spec.in sndfile.pc.in - CLEANFILES = *~ -Index: lib-src/libsndfile/configure -=================================================================== ---- lib-src/libsndfile/configure (revision 13510) -+++ lib-src/libsndfile/configure (working copy) -@@ -18986,11 +18986,10 @@ - $as_echo "$as_me: WARNING: ******************************************************************" >&2;} - fi - --if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Touching files in directory tests/." >&5 --$as_echo "$as_me: WARNING: Touching files in directory tests/." >&2;} -- touch tests/*.c tests/*.h -- fi -+#if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then -+# AC_MSG_WARN([[Touching files in directory tests/.]]) -+# touch tests/*.c tests/*.h -+# fi - - #==================================================================================== - # Settings for the HTML documentation. -@@ -22427,5 +22426,5 @@ - echo - fi - --(cd src && make genfiles) --(cd tests && make genfiles) -+#(cd src && make genfiles) -+#(cd tests && make genfiles) -Index: lib-src/libsndfile/configure.ac -=================================================================== ---- lib-src/libsndfile/configure.ac (revision 13510) -+++ lib-src/libsndfile/configure.ac (working copy) -@@ -457,10 +457,10 @@ - AC_MSG_WARN([[******************************************************************]]) - fi - --if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then -- AC_MSG_WARN([[Touching files in directory tests/.]]) -- touch tests/*.c tests/*.h -- fi -+#if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then -+# AC_MSG_WARN([[Touching files in directory tests/.]]) -+# touch tests/*.c tests/*.h -+# fi - - #==================================================================================== - # Settings for the HTML documentation. -@@ -691,5 +691,5 @@ - echo - fi - --(cd src && make genfiles) --(cd tests && make genfiles) -+#(cd src && make genfiles) -+#(cd tests && make genfiles) diff --git a/lib-src/libsndfile/libsndfile.spec.in b/lib-src/libsndfile/libsndfile.spec.in index ad47a5f3f..d4427289a 100644 --- a/lib-src/libsndfile/libsndfile.spec.in +++ b/lib-src/libsndfile/libsndfile.spec.in @@ -10,7 +10,7 @@ Release: %{release} Copyright: LGPL Group: Libraries/Sound Source: http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz -URL: http://www.mega-nerd.com/libsndfile/ +Url: http://www.mega-nerd.com/libsndfile/ BuildRoot: /var/tmp/%{name}-%{version} %description diff --git a/lib-src/libsndfile/m4/ax_add_fortify_source.m4 b/lib-src/libsndfile/m4/ax_add_fortify_source.m4 new file mode 100644 index 000000000..d443814be --- /dev/null +++ b/lib-src/libsndfile/m4/ax_add_fortify_source.m4 @@ -0,0 +1,53 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ADD_FORTIFY_SOURCE +# +# DESCRIPTION +# +# Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro +# redefinition warnings. Some distributions (such as Gentoo Linux) enable +# _FORTIFY_SOURCE globally in their compilers, leading to unnecessary +# warnings in the form of +# +# :0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] +# : note: this is the location of the previous definition +# +# which is a problem if -Werror is enabled. This macro checks whether +# _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2 +# to CPPFLAGS. +# +# LICENSE +# +# Copyright (c) 2017 David Seifert +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[ + AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS]) + AC_LINK_IFELSE([ + AC_LANG_SOURCE( + [[ + int main() { + #ifndef _FORTIFY_SOURCE + return 0; + #else + this_is_an_error; + #endif + } + ]] + )], [ + AC_MSG_RESULT([yes]) + CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + ], [ + AC_MSG_RESULT([no]) + ]) +]) diff --git a/lib-src/libsndfile/m4/ax_append_compile_flags.m4 b/lib-src/libsndfile/m4/ax_append_compile_flags.m4 new file mode 100644 index 000000000..5b6f1af51 --- /dev/null +++ b/lib-src/libsndfile/m4/ax_append_compile_flags.m4 @@ -0,0 +1,67 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the compiler works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. During the check the flag is always added to the +# current language's flags. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and +# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with +# AX_APPEND_LINK_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans +# +# 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 3 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, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AC_DEFUN([AX_APPEND_COMPILE_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4]) +done +])dnl AX_APPEND_COMPILE_FLAGS diff --git a/lib-src/libsndfile/m4/ax_append_flag.m4 b/lib-src/libsndfile/m4/ax_append_flag.m4 new file mode 100644 index 000000000..e8c5312af --- /dev/null +++ b/lib-src/libsndfile/m4/ax_append_flag.m4 @@ -0,0 +1,71 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_append_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) +# +# DESCRIPTION +# +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space +# added in between. +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly +# FLAG. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# 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 3 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, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AC_DEFUN([AX_APPEND_FLAG], +[dnl +AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) +AS_VAR_SET_IF(FLAGS,[ + AS_CASE([" AS_VAR_GET(FLAGS) "], + [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], + [ + AS_VAR_APPEND(FLAGS,[" $1"]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) + ], + [ + AS_VAR_SET(FLAGS,[$1]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) +AS_VAR_POPDEF([FLAGS])dnl +])dnl AX_APPEND_FLAG diff --git a/lib-src/libsndfile/m4/ax_append_link_flags.m4 b/lib-src/libsndfile/m4/ax_append_link_flags.m4 new file mode 100644 index 000000000..6f7f17456 --- /dev/null +++ b/lib-src/libsndfile/m4/ax_append_link_flags.m4 @@ -0,0 +1,65 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the linker works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is +# used. During the check the flag is always added to the linker's flags. +# +# If EXTRA-FLAGS is defined, it is added to the linker's default flags +# when the check is done. The check is thus made with the flags: "LDFLAGS +# EXTRA-FLAGS FLAG". This can for example be used to force the linker to +# issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG. +# Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans +# +# 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 3 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, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AC_DEFUN([AX_APPEND_LINK_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4]) +done +])dnl AX_APPEND_LINK_FLAGS diff --git a/lib-src/libsndfile/m4/ax_check_compile_flag.m4 b/lib-src/libsndfile/m4/ax_check_compile_flag.m4 new file mode 100644 index 000000000..dcabb92a1 --- /dev/null +++ b/lib-src/libsndfile/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# 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 3 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, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff --git a/lib-src/libsndfile/m4/ax_check_link_flag.m4 b/lib-src/libsndfile/m4/ax_check_link_flag.m4 new file mode 100644 index 000000000..819409a20 --- /dev/null +++ b/lib-src/libsndfile/m4/ax_check_link_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the linker or gives an error. +# (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the linker's default flags +# when the check is done. The check is thus made with the flags: "LDFLAGS +# EXTRA-FLAGS FLAG". This can for example be used to force the linker to +# issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_LINK_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# 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 3 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, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_CHECK_LINK_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl +AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS $4 $1" + AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + LDFLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_LINK_FLAGS diff --git a/lib-src/libsndfile/m4/ax_compiler_vendor.m4 b/lib-src/libsndfile/m4/ax_compiler_vendor.m4 new file mode 100644 index 000000000..4ca808955 --- /dev/null +++ b/lib-src/libsndfile/m4/ax_compiler_vendor.m4 @@ -0,0 +1,87 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_VENDOR +# +# DESCRIPTION +# +# Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun, +# hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft, +# watcom, etc. The vendor is returned in the cache variable +# $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2008 Matteo Frigo +# +# 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 3 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, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 16 + +AC_DEFUN([AX_COMPILER_VENDOR], +[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + dnl Please add if possible support to ax_compiler_version.m4 + [# note: don't check for gcc first since some other compilers define __GNUC__ + vendors="intel: __ICC,__ECC,__INTEL_COMPILER + ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__ + pathscale: __PATHCC__,__PATHSCALE__ + clang: __clang__ + cray: _CRAYC + fujitsu: __FUJITSU + gnu: __GNUC__ + sun: __SUNPRO_C,__SUNPRO_CC + hp: __HP_cc,__HP_aCC + dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER + borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ + comeau: __COMO__ + kai: __KCC + lcc: __LCC__ + sgi: __sgi,sgi + microsoft: _MSC_VER + metrowerks: __MWERKS__ + watcom: __WATCOMC__ + portland: __PGI + tcc: __TINYC__ + unknown: UNKNOWN" + for ventest in $vendors; do + case $ventest in + *:) vendor=$ventest; continue ;; + *) vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;; + esac + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ + #if !($vencpp) + thisisanerror; + #endif + ])], [break]) + done + ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1` + ]) +]) diff --git a/lib-src/libsndfile/m4/ax_compiler_version.m4 b/lib-src/libsndfile/m4/ax_compiler_version.m4 new file mode 100644 index 000000000..8a8e28a98 --- /dev/null +++ b/lib-src/libsndfile/m4/ax_compiler_version.m4 @@ -0,0 +1,492 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_VERSION +# +# DESCRIPTION +# +# This macro retrieves the compiler version and returns it in the cache +# variable $ax_cv_c_compiler_version for C and $ax_cv_cxx_compiler_version +# for C++. +# +# Version is returned as epoch:major.minor.patchversion +# +# Epoch is used in order to have an increasing version number in case of +# marketing change. +# +# Epoch use: * borland compiler use chronologically 0turboc for turboc +# era, +# +# 1borlanc BORLANDC++ before 5, 2cppbuilder for cppbuilder era, +# 3borlancpp for return of BORLANDC++ (after version 5.5), +# 4cppbuilder for cppbuilder with year version, +# and 5xe for XE era. +# +# An empty string is returned otherwise. +# +# LICENSE +# +# Copyright (c) 2014 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +# for intel +AC_DEFUN([_AX_COMPILER_VERSION_INTEL], + [ dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__INTEL_COMPILER/100],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__INTEL_COMPILER%100)/10],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [(__INTEL_COMPILER%10)],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for IBM +AC_DEFUN([_AX_COMPILER_VERSION_IBM], + [ dnl + dnl check between z/OS C/C++ and XL C/C++ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([], + [ + #if defined(__COMPILER_VER__) + choke me; + #endif + ])], + [ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__xlC__/100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__xlC__%100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__xlC_ver__/0x100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, + [__xlC_ver__%0x100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler build version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" + ], + [ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__xlC__%1000],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__xlC__/10000)%10],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__xlC__/100000)%10],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) +]) + +# for pathscale +AC_DEFUN([_AX_COMPILER_VERSION_PATHSCALE],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __PATHCC__,, + AC_MSG_FAILURE([[[$0]] unknown pathscale major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __PATHCC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown pathscale minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__PATHCC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown pathscale patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for clang +AC_DEFUN([_AX_COMPILER_VERSION_CLANG],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __clang_major__,, + AC_MSG_FAILURE([[[$0]] unknown clang major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __clang_minor__,, + AC_MSG_FAILURE([[[$0]] unknown clang minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__clang_patchlevel__],,0) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for crayc +AC_DEFUN([_AX_COMPILER_VERSION_CRAY],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + _RELEASE,, + AC_MSG_FAILURE([[[$0]] unknown crayc release])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _RELEASE_MINOR,, + AC_MSG_FAILURE([[[$0]] unknown crayc minor])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# for fujitsu +AC_DEFUN([_AX_COMPILER_VERSION_FUJITSU],[ + AC_COMPUTE_INT(ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, + __FCC_VERSION,, + AC_MSG_FAILURE([[[$0]]unknown fujitsu release])) + ]) + +# for GNU +AC_DEFUN([_AX_COMPILER_VERSION_GNU],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __GNUC__,, + AC_MSG_FAILURE([[[$0]] unknown gcc major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __GNUC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown gcc minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__GNUC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown gcc patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# For sun +AC_DEFUN([_AX_COMPILER_VERSION_SUN],[ + m4_define([_AX_COMPILER_VERSION_SUN_NUMBER], + [ + #if defined(__SUNPRO_CC) + __SUNPRO_CC + #else + __SUNPRO_C + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59, + !!(_AX_COMPILER_VERSION_SUN_NUMBER < 0x1000),, + AC_MSG_FAILURE([[[$0]] unknown sun release version])) + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59" = X1], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x10) % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100),, + AC_MSG_FAILURE([[[$0]] unknown sun major version])) + ], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100) % 0x100,, + AC_MSG_FAILURE([[[$0]] unknown sun minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x1000),, + AC_MSG_FAILURE([[[$0]] unknown sun major version])) + ]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" +]) + +AC_DEFUN([_AX_COMPILER_VERSION_HP],[ + m4_define([_AX_COMPILER_VERSION_HP_NUMBER], + [ + #if defined(__HP_cc) + __HP_cc + #else + __HP_aCC + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121, + !!(_AX_COMPILER_VERSION_HP_NUMBER <= 1),, + AC_MSG_FAILURE([[[$0]] unknown hp release version])) + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121" = X1], + [dnl By default output last version with this behavior. + dnl it is so old + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="01.21.00" + ], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + (_AX_COMPILER_VERSION_HP_NUMBER % 100),, + AC_MSG_FAILURE([[[$0]] unknown hp release version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + ((_AX_COMPILER_VERSION_HP_NUMBER / 100)%100),, + AC_MSG_FAILURE([[[$0]] unknown hp minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + ((_AX_COMPILER_VERSION_HP_NUMBER / 10000)%100),, + AC_MSG_FAILURE([[[$0]] unknown hp major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) +]) + +AC_DEFUN([_AX_COMPILER_VERSION_DEC],[dnl + m4_define([_AX_COMPILER_VERSION_DEC_NUMBER], + [ + #if defined(__DECC_VER) + __DECC_VER + #else + __DECCXX_VER + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + (_AX_COMPILER_VERSION_DEC_NUMBER % 10000),, + AC_MSG_FAILURE([[[$0]] unknown dec release version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + ((_AX_COMPILER_VERSION_DEC_NUMBER / 100000UL)%100),, + AC_MSG_FAILURE([[[$0]] unknown dec minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + ((_AX_COMPILER_VERSION_DEC_NUMBER / 10000000UL)%100),, + AC_MSG_FAILURE([[[$0]] unknown dec major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# borland +AC_DEFUN([_AX_COMPILER_VERSION_BORLAND],[dnl + m4_define([_AX_COMPILER_VERSION_TURBOC_NUMBER], + [ + #if defined(__TURBOC__) + __TURBOC__ + #else + choke me + #endif + ]) + m4_define([_AX_COMPILER_VERSION_BORLANDC_NUMBER], + [ + #if defined(__BORLANDC__) + __BORLANDC__ + #else + __CODEGEARC__ + #endif + ]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM(, + _AX_COMPILER_VERSION_TURBOC_NUMBER)], + [dnl TURBOC + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw, + _AX_COMPILER_VERSION_TURBOC_NUMBER,, + AC_MSG_FAILURE([[[$0]] unknown turboc version])) + AS_IF( + [test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -lt 661 || test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -gt 1023], + [dnl compute normal version + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _AX_COMPILER_VERSION_TURBOC_NUMBER % 0x100,, + AC_MSG_FAILURE([[[$0]] unknown turboc minor version])) + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_TURBOC_NUMBER/0x100)%0x100,, + AC_MSG_FAILURE([[[$0]] unknown turboc major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"], + [dnl special version + AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw], + [661],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.00"], + [662],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.01"], + [663],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:2.00"], + [ + AC_MSG_WARN([[[$0]] unknown turboc version between 0x295 and 0x400 please report bug]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="" + ]) + ]) + ], + # borlandc + [ + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw, + _AX_COMPILER_VERSION_BORLANDC_NUMBER,, + AC_MSG_FAILURE([[[$0]] unknown borlandc version])) + AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw], + dnl BORLANDC++ before 5.5 + [512] ,[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:2.00"], + [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], + [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], + [1040],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.1"], + [1106],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:4.0"], + [1280],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.0"], + [1312],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.02"], + dnl C++ Builder era + [1328],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:3.0"], + [1344],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:4.0"], + dnl BORLANDC++ after 5.5 + [1360],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.5"], + [1361],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.51"], + [1378],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.6.4"], + dnl C++ Builder with year number + [1392],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2006"], + [1424],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2007"], + [1555],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2009"], + [1569],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2010"], + dnl XE version + [1584],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe"], + [1600],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:2"], + [1616],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:3"], + [1632],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:4"], + [ + AC_MSG_WARN([[[$0]] Unknown borlandc compiler version $_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw please report bug]) + ]) + ]) + ]) + +# COMO +AC_DEFUN([_AX_COMPILER_VERSION_COMEAU], + [ dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__COMO_VERSION__%100],, + AC_MSG_FAILURE([[[$0]] unknown comeau compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__COMO_VERSION__/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown comeau compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# KAI +AC_DEFUN([_AX_COMPILER_VERSION_KAI],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__KCC_VERSION%100],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__KCC_VERSION/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__KCC_VERSION/1000)%10],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +dnl LCC +dnl LCC does not output version... + +# SGI +AC_DEFUN([_AX_COMPILER_VERSION_SGI],[ + m4_define([_AX_COMPILER_VERSION_SGI_NUMBER], + [ + #if defined(_COMPILER_VERSION) + _COMPILER_VERSION + #else + _SGI_COMPILER_VERSION + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [_AX_COMPILER_VERSION_SGI_NUMBER%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(_AX_COMPILER_VERSION_SGI_NUMBER/10)%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(_AX_COMPILER_VERSION_SGI_NUMBER/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# microsoft +AC_DEFUN([_AX_COMPILER_VERSION_MICROSOFT],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _MSC_VER%100,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_MSC_VER/100)%100,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler major version])) + dnl could be overridden + _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0 + _ax_[]_AC_LANG_ABBREV[]_compiler_version_build=0 + # special case for version 6 + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X12"], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%1000,, + _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0)]) + # for version 7 + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X13"], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%1000,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) + ]) + # for version > 8 + AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 14], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%10000,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) + ]) + AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 15], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, + _MSC_BUILD,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler build version])) + ]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" + ]) + +# for metrowerks +AC_DEFUN([_AX_COMPILER_VERSION_METROWERKS],[dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + __MWERKS__%0x100,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (__MWERKS__/0x100)%0x10,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (__MWERKS__/0x1000)%0x10,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for watcom +AC_DEFUN([_AX_COMPILER_VERSION_WATCOM],[dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __WATCOMC__%100,, + AC_MSG_FAILURE([[[$0]] unknown watcom compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (__WATCOMC__/100)%100,, + AC_MSG_FAILURE([[[$0]] unknown watcom compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# for PGI +AC_DEFUN([_AX_COMPILER_VERSION_PORTLAND],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __PGIC__,, + AC_MSG_FAILURE([[[$0]] unknown pgi major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __PGIC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown pgi minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__PGIC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown pgi patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# tcc +AC_DEFUN([_AX_COMPILER_VERSION_TCC],[ + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=[`tcc -v | $SED 's/^[ ]*tcc[ ]\+version[ ]\+\([0-9.]\+\).*/\1/g'`] + ]) +# main entry point +AC_DEFUN([AX_COMPILER_VERSION],[dnl + AC_REQUIRE([AX_COMPILER_VENDOR]) + AC_REQUIRE([AC_PROG_SED]) + AC_CACHE_CHECK([for _AC_LANG compiler version], + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, + [ dnl + AS_CASE([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor], + [intel],[_AX_COMPILER_VERSION_INTEL], + [ibm],[_AX_COMPILER_VERSION_IBM], + [pathscale],[_AX_COMPILER_VERSION_PATHSCALE], + [clang],[_AX_COMPILER_VERSION_CLANG], + [cray],[_AX_COMPILER_VERSION_CRAY], + [fujitsu],[_AX_COMPILER_VERSION_FUJITSU], + [gnu],[_AX_COMPILER_VERSION_GNU], + [sun],[_AX_COMPILER_VERSION_SUN], + [hp],[_AX_COMPILER_VERSION_HP], + [dec],[_AX_COMPILER_VERSION_DEC], + [borland],[_AX_COMPILER_VERSION_BORLAND], + [comeau],[_AX_COMPILER_VERSION_COMEAU], + [kai],[_AX_COMPILER_VERSION_KAI], + [sgi],[_AX_COMPILER_VERSION_SGI], + [microsoft],[_AX_COMPILER_VERSION_MICROSOFT], + [metrowerks],[_AX_COMPILER_VERSION_METROWERKS], + [watcom],[_AX_COMPILER_VERSION_WATCOM], + [portland],[_AX_COMPILER_VERSION_PORTLAND], + [tcc],[_AX_COMPILER_VERSION_TCC], + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""]) + ]) +]) diff --git a/lib-src/libsndfile/m4/ax_recursive_eval.m4 b/lib-src/libsndfile/m4/ax_recursive_eval.m4 new file mode 100644 index 000000000..0625aca22 --- /dev/null +++ b/lib-src/libsndfile/m4/ax_recursive_eval.m4 @@ -0,0 +1,56 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_recursive_eval.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_RECURSIVE_EVAL(VALUE, RESULT) +# +# DESCRIPTION +# +# Interpolate the VALUE in loop until it doesn't change, and set the +# result to $RESULT. WARNING: It's easy to get an infinite loop with some +# unsane input. +# +# LICENSE +# +# Copyright (c) 2008 Alexandre Duret-Lutz +# +# 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, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 1 + +AC_DEFUN([AX_RECURSIVE_EVAL], +[_lcl_receval="$1" +$2=`(test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" + _lcl_receval_old='' + while test "[$]_lcl_receval_old" != "[$]_lcl_receval"; do + _lcl_receval_old="[$]_lcl_receval" + eval _lcl_receval="\"[$]_lcl_receval\"" + done + echo "[$]_lcl_receval")`]) diff --git a/lib-src/libsndfile/m4/ax_require_defined.m4 b/lib-src/libsndfile/m4/ax_require_defined.m4 new file mode 100644 index 000000000..17c3eab7d --- /dev/null +++ b/lib-src/libsndfile/m4/ax_require_defined.m4 @@ -0,0 +1,37 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED diff --git a/lib-src/libsndfile/M4/clip_mode.m4 b/lib-src/libsndfile/m4/clip_mode.m4 similarity index 100% rename from lib-src/libsndfile/M4/clip_mode.m4 rename to lib-src/libsndfile/m4/clip_mode.m4 diff --git a/lib-src/libsndfile/M4/extra_pkg.m4 b/lib-src/libsndfile/m4/extra_pkg.m4 similarity index 87% rename from lib-src/libsndfile/M4/extra_pkg.m4 rename to lib-src/libsndfile/m4/extra_pkg.m4 index a92d090d6..afe474e22 100644 --- a/lib-src/libsndfile/M4/extra_pkg.m4 +++ b/lib-src/libsndfile/m4/extra_pkg.m4 @@ -1,5 +1,6 @@ # extra_pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# +# +# Copyright (c) 2008-2012 Erik de Castro Lopo # Copyright (c) 2004 Scott James Remnant . # # This program is free software; you can redistribute it and/or modify @@ -40,6 +41,25 @@ AC_MSG_CHECKING([for $2 ]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) +pkg_link_saved_CFLAGS=$CFLAGS +pkg_link_saved_LIBS=$LIBS + +eval "pkg_CFLAGS=\${pkg_cv_[]$1[]_CFLAGS}" +eval "pkg_LIBS=\${pkg_cv_[]$1[]_LIBS}" + +CFLAGS="$CFLAGS $pkg_CFLAGS" +LIBS="$LIBS $pkg_LIBS" + +AC_TRY_LINK([], puts ("");, pkg_link=yes, pkg_link=no) + +CFLAGS=$pkg_link_saved_CFLAGS +LIBS=$pkg_link_saved_LIBS + +if test $pkg_link = no ; then + $as_echo_n "link failed ... " + pkg_failed=yes + fi + m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) @@ -48,7 +68,7 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs diff --git a/lib-src/libsndfile/M4/flexible_array.m4 b/lib-src/libsndfile/m4/flexible_array.m4 similarity index 100% rename from lib-src/libsndfile/M4/flexible_array.m4 rename to lib-src/libsndfile/m4/flexible_array.m4 diff --git a/lib-src/libsndfile/M4/mkoctfile_version.m4 b/lib-src/libsndfile/m4/mkoctfile_version.m4 similarity index 100% rename from lib-src/libsndfile/M4/mkoctfile_version.m4 rename to lib-src/libsndfile/m4/mkoctfile_version.m4 diff --git a/lib-src/libsndfile/M4/octave.m4 b/lib-src/libsndfile/m4/octave.m4 similarity index 98% rename from lib-src/libsndfile/M4/octave.m4 rename to lib-src/libsndfile/m4/octave.m4 index 216306fea..88d5a5b9b 100644 --- a/lib-src/libsndfile/M4/octave.m4 +++ b/lib-src/libsndfile/m4/octave.m4 @@ -18,10 +18,10 @@ dnl Find the version of Octave. dnl @version 1.0 Aug 23 2007 dnl @author Erik de Castro Lopo dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright +dnl Permission to use, copy, modify, distribute, and sell this file for any +dnl purpose is hereby granted without fee, provided that the above copyright dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is +dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl @@ -52,10 +52,10 @@ dnl Find the version of Octave. dnl @version 1.0 Aug 23 2007 dnl @author Erik de Castro Lopo dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright +dnl Permission to use, copy, modify, distribute, and sell this file for any +dnl purpose is hereby granted without fee, provided that the above copyright dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is +dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl @@ -119,7 +119,7 @@ if test "x$prog_concat" = "xyesyesyes" ; then 2.*) AC_MSG_WARN([Octave version 2.X is not supported.]) ;; - 3.0.*) + 3.*) OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir | sed 's%^/usr%${prefix}%'` OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir | sed 's%^/usr%${prefix}%'` diff --git a/lib-src/libsndfile/m4/stack_protect.m4 b/lib-src/libsndfile/m4/stack_protect.m4 new file mode 100644 index 000000000..bf27e6e74 --- /dev/null +++ b/lib-src/libsndfile/m4/stack_protect.m4 @@ -0,0 +1,73 @@ +dnl Copyright (C) 2013 Xiph.org Foundation +dnl +dnl Redistribution and use in source and binary forms, with or without +dnl modification, are permitted provided that the following conditions +dnl are met: +dnl +dnl - Redistributions of source code must retain the above copyright +dnl notice, this list of conditions and the following disclaimer. +dnl +dnl - Redistributions in binary form must reproduce the above copyright +dnl notice, this list of conditions and the following disclaimer in the +dnl documentation and/or other materials provided with the distribution. +dnl +dnl - Neither the name of the Xiph.org Foundation nor the names of its +dnl contributors may be used to endorse or promote products derived from +dnl this software without specific prior written permission. +dnl +dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +dnl ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR +dnl CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +dnl EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +dnl PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +dnl PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +dnl LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +dnl NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +dnl SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +dnl Want to know of GCC stack protector works, botfor the C and for the C++ +dnl compiler. +dnl +dnl Just checking if the compiler accepts the required CFLAGSs is not enough +dnl because we have seen at least one instance where this check was +dnl in-sufficient. +dnl +dnl Instead, try to compile and link a test program with the stack protector +dnl flags. If that works, we use it. + +AC_DEFUN([XIPH_GCC_STACK_PROTECTOR], +[AC_LANG_ASSERT(C) + AC_MSG_CHECKING([if $CC supports stack smash protection]) + xiph_stack_check_old_cflags="$CFLAGS" + SSP_FLAGS="-fstack-protector --param ssp-buffer-size=4" + CFLAGS=$SSP_FLAGS + AC_TRY_LINK([ + #include + ], + [puts("Hello, World!"); return 0;], + AC_MSG_RESULT([yes]) + CFLAGS="$xiph_stack_check_old_cflags $SSP_FLAGS", + AC_MSG_RESULT([no]) + CFLAGS="$xiph_stack_check_old_cflags" + ) +])# XIPH_GCC_STACK_PROTECTOR + +AC_DEFUN([XIPH_GXX_STACK_PROTECTOR], +[AC_LANG_PUSH([C++]) + AC_MSG_CHECKING([if $CXX supports stack smash protection]) + xiph_stack_check_old_cflags="$CFLAGS" + SSP_FLAGS="-fstack-protector --param ssp-buffer-size=4" + CFLAGS=$SSP_FLAGS + AC_TRY_LINK([ + #include + ], + [puts("Hello, World!"); return 0;], + AC_MSG_RESULT([yes]) + CFLAGS="$xiph_stack_check_old_cflags $SSP_FLAGS", + AC_MSG_RESULT([no]) + CFLAGS="$xiph_stack_check_old_cflags" + ) + AC_LANG_POP([C++]) +])# XIPH_GXX_STACK_PROTECTOR diff --git a/lib-src/libsndfile/maintainer-mode.patch b/lib-src/libsndfile/maintainer-mode.patch deleted file mode 100644 index 0df24bc2f..000000000 --- a/lib-src/libsndfile/maintainer-mode.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.ac.orig 2011-03-23 04:01:02.000000000 -0500 -+++ configure.ac 2011-04-02 00:50:13.000000000 -0500 -@@ -18,6 +18,10 @@ - AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) - AM_SILENT_RULES([yes]) - -+dnl Audacity policy: don't enable automatic rebuild of configure et al if -+dnl sources change -+AM_MAINTAINER_MODE([disable]) -+ - dnl Add parameters for aclocal - AC_SUBST(ACLOCAL_AMFLAGS, "-I M4") - diff --git a/lib-src/libsndfile/make_lite.py b/lib-src/libsndfile/make_lite.py new file mode 100644 index 000000000..eee69fc82 --- /dev/null +++ b/lib-src/libsndfile/make_lite.py @@ -0,0 +1,491 @@ +#!/usr/bin/python + +import commands, os, re, string, sys, time + +def count_enclosed_functions (source): + func_count = 0 + open_brace = 0 + close_brace = 0 + for ch in source: + if ch == '{': + open_brace += 1 + elif ch == '}': + close_brace += 1 + if open_brace == close_brace: + func_count += 1 + if open_brace < close_brace: + print "count_enclosed_functions : open_brace < close_brace" + return -1 + return func_count + +def find_function_prototype (source, proto_name): + proto_re = "(^[a-zA-Z_ \t]+\s+%s[^a-zA-Z0-9_]\s*\([^\)]+\)\s+;\n)" % (proto_name) + proto_result = re.search (proto_re, source, re.MULTILINE | re.DOTALL) + if not proto_result: + return None + proto_text = proto_result.groups ()[0] + return proto_text + +def find_function_definition (source, func_name): + func_re = "(\n[a-zA-Z_ \t]+\n%s[^a-zA-Z0-9_].* /\* %s \*/\n)" % (func_name, func_name) + func_result = re.search (func_re, source, re.MULTILINE | re.DOTALL) + if not func_result: + sys.exit (1) + return None + func_text = func_result.groups ()[0] + + # Now to check that we only have one enclosing function. + func_count = count_enclosed_functions (func_text) + if func_count != 1: + return None + return func_text + +def find_include (source, inc_name): + inc_re = "(^#include\s+[\<\"]%s[\"\>]\s*)" % inc_name + inc_result = re.search (inc_re, source, re.MULTILINE | re.DOTALL) + if not inc_result: + return None + inc_text = inc_result.groups ()[0] + return inc_text + +def find_assign_statement (source, var_name): + var_re = "(^\s+%s\s*=[^;]+;)" % var_name + var_result = re.search (var_re, source, re.MULTILINE | re.DOTALL) + if not var_result: + return None + assign_text = var_result.groups ()[0] + return assign_text + +#-------------------------------------------------------------------------------- + +def remove_include (source, inc_name): + inc_text = find_include (source, inc_name) + if not inc_text: + print "remove_include : include '%s' not found. Exiting." % inc_name + sys.exit (1) + + source = string.replace (source, inc_text, "") + return source + +def remove_assign (source, assign_name): + assign_text = find_assign (source, inc_name) + if not inc_text: + print "remove_include : include '%s' not found. Exiting." % inc_name + sys.exit (1) + + source = string.replace (source, inc_text, "") + return source + +def remove_prototype (source, proto_name): + proto_text = find_function_prototype (source, proto_name) + if not proto_text: + print "remove_prototype : prototype '%s' not found. Exiting." % proto_name + sys.exit (1) + + source = string.replace (source, proto_text, "") + return source + +def remove_function (source, func_name): + func_text = find_function_definition (source, func_name) + if not func_text: + print "remove_function : function '%s' not found. Exiting." % func_name + sys.exit (1) + + source = string.replace (source, func_text, "/* Function %s() removed here. */\n" % func_name) + return source + +def remove_all_assignments (source, var): + count = 0 + while 1: + assign_text = find_assign_statement (source, var) + if not assign_text: + if count != 0: + break + print "remove_all_assignments : variable '%s' not found. Exiting." % var + sys.exit (1) + + source = string.replace (source, assign_text, "") + count += 1 + return source + + + +#---------------------------------------------------------------- + +def remove_funcs_and_protos_from_file (filename, func_list): + source_code = open (filename, 'r').read () + + for func in func_list: + source_code = remove_prototype (source_code, func) ; + source_code = remove_function (source_code, func) ; + open (filename, 'w').write (source_code) + +def remove_funcs_from_file (filename, func_list): + source_code = open (filename, 'r').read () + + for func in func_list: + source_code = remove_function (source_code, func) ; + open (filename, 'w').write (source_code) + +def remove_protos_from_file (filename, func_list): + source_code = open (filename, 'r').read () + + for func in func_list: + source_code = remove_prototype (source_code, func) ; + open (filename, 'w').write (source_code) + +def remove_includes_from_file (filename, inc_list): + source_code = open (filename, 'r').read () + + for inc in inc_list: + source_code = remove_include (source_code, inc) ; + open (filename, 'w').write (source_code) + +def remove_all_assignments_from_file (filename, var_list): + source_code = open (filename, 'r').read () + + for var in var_list: + source_code = remove_all_assignments (source_code, var) ; + open (filename, 'w').write (source_code) + +def remove_comment_start_end (filename, start_comment, end_comment): + source_code = open (filename, 'r').read () + + while 1: + start_index = string.find (source_code, start_comment) + end_index = string.find (source_code, end_comment) + if start_index < 0 or end_index < start_index: + break + end_index += len (end_comment) + source_code = source_code [:start_index-1] + source_code [end_index:] ; + + open (filename, 'w').write (source_code) + +def remove_strings_from_file (filename, str_list): + file_text = open (filename, 'r').read () + for current_str in str_list: + file_text = string.replace (file_text, current_str, '') + open (filename, 'w').write (file_text) + +def string_replace_in_file (filename, from_str, to_str): + file_text = open (filename, 'r').read () + file_text = string.replace (file_text, from_str, to_str) + open (filename, 'w').write (file_text) + +def remove_regex_from_file (filename, regex_list): + file_text = open (filename, 'r').read () + for regex in regex_list: + file_text = re.sub (regex, '', file_text, re.MULTILINE | re.DOTALL) + open (filename, 'w').write (file_text) + +#========================================================================== + +def find_configure_version (filename): + # AM_INIT_AUTOMAKE(libsndfile,0.0.21pre6) + file = open (filename) + while 1: + line = file.readline () + if re.search ("AC_INIT", line): + x = re.sub ("[^\(]+\(", "", line) + x = re.sub ("\).*\n", "", x) + x = string.split (x, ",") + package = x [0] + version = x [1] + break + file.close () + # version = re.escape (version) + return package, version + +def fix_configure_ac_file (filename): + data = open (filename, 'r').read () + data = string.replace (data, "AM_INIT_AUTOMAKE(libsndfile,", "AM_INIT_AUTOMAKE(libsndfile_lite,", 1) + + file = open (filename, 'w') + file.write (data) + file.close () + + +def make_dist_file (package, version): + print "Making dist file." + tar_gz_file = "%s-%s.tar.gz" % (package, version) + if os.path.exists (tar_gz_file): + return + if os.system ("make dist"): + sys.exit (1) + return + +def delete_files (file_list): + for file_name in file_list: + os.remove (file_name) + +#======================================================================= + +source_dir = os.getcwd () + +conf_package, conf_version = find_configure_version ('configure.ac') + +package_version = "%s-%s" % (conf_package, conf_version) +lite_version = "%s_lite-%s" % (conf_package, conf_version) + +os.system ("rm -rf %s%s.tar.gz" % (source_dir, package_version)) + +os.system ("make dist") + +make_dist_file (conf_package, conf_version) + +os.chdir ("/tmp") + +print "Uncompressing .tar.gz file." +os.system ("rm -rf %s" % package_version) +if os.system ("tar zxf %s/%s.tar.gz" % (source_dir, package_version)): + sys.exit (1) + + +print "Renaming to libsndfile_lite." +os.system ("rm -rf %s" % lite_version) +os.rename (package_version, lite_version) + +print "Changing into libsndfile_lite directory." +os.chdir (lite_version) + +print "Removing un-neeed directories." +delete_dirs = [ 'src/G72x' ] + +for dir_name in delete_dirs: + os.system ("rm -rf %s" % dir_name) + +print "Removing un-needed files." +delete_files ([ 'src/ircam.c', 'src/nist.c', + 'src/ima_adpcm.c', 'src/ms_adpcm.c', 'src/au_g72x.c', + 'src/mat4.c', 'src/mat5.c', 'src/dwvw.c', 'src/paf.c', + 'src/ogg.c', 'src/pvf.c', 'src/xi.c', 'src/htk.c', + 'src/sd2.c', 'src/rx2.c', 'src/txw.c', 'src/wve.c', + 'src/dwd.c', 'src/svx.c', 'src/voc.c', 'src/vox_adpcm.c', + 'src/sds.c' + ]) + + +print "Hacking 'configure.ac' and 'src/Makefile.am'." +remove_strings_from_file ('configure.ac', [ 'src/G72x/Makefile' ]) +remove_strings_from_file ('src/Makefile.am', [ 'G72x/libg72x.la', 'G72x', + 'ircam.c', 'nist.c', 'ima_adpcm.c', 'ms_adpcm.c', 'au_g72x.c', 'mat4.c', + 'mat5.c', 'dwvw.c', 'paf.c', 'ogg.c', 'pvf.c', 'xi.c', 'htk.c', + 'sd2.c', 'rx2.c', 'txw.c', 'wve.c', 'dwd.c', 'svx.c', 'voc.c', + 'vox_adpcm.c', 'sds.c' + ]) + +#---------------------------------------------------------------------------- + +print "Hacking header files." + +remove_protos_from_file ('src/common.h', [ 'xi_open', 'sd2_open', 'ogg_open', + 'dwvw_init', 'paf_open', 'svx_open', 'nist_open', 'rx2_open', 'mat4_open', + 'voc_open', 'txw_open', 'dwd_open', 'htk_open', 'wve_open', 'mat5_open', + 'pvf_open', 'ircam_open', 'sds_open', + 'float32_init', 'double64_init', 'aiff_ima_init', 'vox_adpcm_init', + 'wav_w64_ima_init', 'wav_w64_msadpcm_init' + ]) + +remove_protos_from_file ('src/au.h', + [ 'au_g72x_reader_init', 'au_g72x_writer_init' ]) + +remove_protos_from_file ('src/wav_w64.h', [ 'msadpcm_write_adapt_coeffs' ]) + +#---------------------------------------------------------------------------- + +print "Hacking case statements." + +remove_comment_start_end ('src/sndfile.c', '/* Lite remove start */' , '/* Lite remove end */') +remove_comment_start_end ('src/aiff.c', '/* Lite remove start */' , '/* Lite remove end */') +remove_comment_start_end ('src/au.c', '/* Lite remove start */' , '/* Lite remove end */') +remove_comment_start_end ('src/raw.c', '/* Lite remove start */' , '/* Lite remove end */') +remove_comment_start_end ('src/w64.c', '/* Lite remove start */' , '/* Lite remove end */') +remove_comment_start_end ('src/wav.c', '/* Lite remove start */' , '/* Lite remove end */') +remove_comment_start_end ('src/double64.c', '/* Lite remove start */' , '/* Lite remove end */') +remove_comment_start_end ('src/float32.c', '/* Lite remove start */' , '/* Lite remove end */') + + +#---------------------------------------------------------------------------- + +print "Hacking src/pcm.c." +remove_funcs_from_file ('src/pcm.c', [ + 'f2sc_array', 'f2sc_clip_array', 'f2uc_array', 'f2uc_clip_array', + 'f2bes_array', 'f2bes_clip_array', 'f2les_array', 'f2les_clip_array', + 'f2let_array', 'f2let_clip_array', 'f2bet_array', 'f2bet_clip_array', + 'f2bei_array', 'f2bei_clip_array', 'f2lei_array', 'f2lei_clip_array', + 'd2sc_array', 'd2sc_clip_array', 'd2uc_array', 'd2uc_clip_array', + 'd2bes_array', 'd2bes_clip_array', 'd2les_array', 'd2les_clip_array', + 'd2let_array', 'd2let_clip_array', 'd2bet_array', 'd2bet_clip_array', + 'd2bei_array', 'd2bei_clip_array', 'd2lei_array', 'd2lei_clip_array', + ]) + +remove_funcs_and_protos_from_file ('src/pcm.c', [ + 'pcm_read_sc2f', 'pcm_read_uc2f', 'pcm_read_les2f', 'pcm_read_bes2f', + 'pcm_read_let2f', 'pcm_read_bet2f', 'pcm_read_lei2f', 'pcm_read_bei2f', + 'pcm_read_sc2d', 'pcm_read_uc2d', 'pcm_read_les2d', 'pcm_read_bes2d', + 'pcm_read_let2d', 'pcm_read_bet2d', 'pcm_read_lei2d', 'pcm_read_bei2d', + 'pcm_write_f2sc', 'pcm_write_f2uc', 'pcm_write_f2bes', 'pcm_write_f2les', + 'pcm_write_f2bet', 'pcm_write_f2let', 'pcm_write_f2bei', 'pcm_write_f2lei', + 'pcm_write_d2sc', 'pcm_write_d2uc', 'pcm_write_d2bes', 'pcm_write_d2les', + 'pcm_write_d2bet', 'pcm_write_d2let', 'pcm_write_d2bei', 'pcm_write_d2lei', + + 'sc2f_array', 'uc2f_array', 'bes2f_array', 'les2f_array', + 'bet2f_array', 'let2f_array', 'bei2f_array', 'lei2f_array', + 'sc2d_array', 'uc2d_array', 'bes2d_array', 'les2d_array', + 'bet2d_array', 'let2d_array', 'bei2d_array', 'lei2d_array' + ]) + +remove_includes_from_file ('src/pcm.c', [ 'float_cast.h' ]) +remove_all_assignments_from_file ('src/pcm.c', [ + 'psf-\>write_float', 'psf\-\>write_double', + 'psf-\>read_float', 'psf\-\>read_double' ]) + +#---------------------------------------------------------------------------- +print "Hacking src/ulaw.c." +remove_funcs_and_protos_from_file ('src/ulaw.c', [ + 'ulaw_read_ulaw2f', 'ulaw_read_ulaw2d', + 'ulaw_write_f2ulaw', 'ulaw_write_d2ulaw', + 'ulaw2f_array', 'ulaw2d_array', 'f2ulaw_array', 'd2ulaw_array' + ]) + +remove_includes_from_file ('src/ulaw.c', [ 'float_cast.h' ]) +remove_all_assignments_from_file ('src/ulaw.c', [ + 'psf-\>write_float', 'psf\-\>write_double', + 'psf-\>read_float', 'psf\-\>read_double' ]) + +#---------------------------------------------------------------------------- + +print "Hacking src/alaw.c." +remove_funcs_and_protos_from_file ('src/alaw.c', [ + 'alaw_read_alaw2f', 'alaw_read_alaw2d', + 'alaw_write_f2alaw', 'alaw_write_d2alaw', + 'alaw2f_array', 'alaw2d_array', 'f2alaw_array', 'd2alaw_array' + ]) + +remove_includes_from_file ('src/alaw.c', [ 'float_cast.h' ]) +remove_all_assignments_from_file ('src/alaw.c', [ + 'psf-\>write_float', 'psf\-\>write_double', + 'psf-\>read_float', 'psf\-\>read_double' ]) + +#---------------------------------------------------------------------------- + +print "Hacking src/gsm610.c." +remove_funcs_and_protos_from_file ('src/gsm610.c', [ + 'gsm610_read_f', 'gsm610_read_d', 'gsm610_write_f', 'gsm610_write_d' + ]) + +remove_includes_from_file ('src/gsm610.c', [ 'float_cast.h' ]) +remove_all_assignments_from_file ('src/gsm610.c', [ + 'psf-\>write_float', 'psf\-\>write_double', + 'psf-\>read_float', 'psf\-\>read_double' ]) + +#---------------------------------------------------------------------------- + +print "Hacking src/float32.c." + +# string_replace_in_file ('src/float32.c', '"float_cast.h"', '') +remove_funcs_from_file ('src/float32.c', [ 'float32_init' ]) + +remove_funcs_and_protos_from_file ('src/float32.c', [ + 'host_read_f2s', 'host_read_f2i', 'host_read_f', 'host_read_f2d', + 'host_write_s2f', 'host_write_i2f', 'host_write_f', 'host_write_d2f', + 'f2s_array', 'f2i_array', 'f2d_array', 's2f_array', 'i2f_array', 'd2f_array', + 'float32_peak_update', + 'replace_read_f2s', 'replace_read_f2i', 'replace_read_f', 'replace_read_f2d', + 'replace_write_s2f', 'replace_write_i2f', 'replace_write_f', 'replace_write_d2f', + 'bf2f_array', 'f2bf_array', + 'float32_get_capability', + ]) + +#---------------------------------------------------------------------------- + +print "Hacking src/double64.c." +remove_funcs_from_file ('src/double64.c', [ 'double64_init' ]) + +remove_funcs_and_protos_from_file ('src/double64.c', [ + 'host_read_d2s', 'host_read_d2i', 'host_read_d2f', 'host_read_d', + 'host_write_s2d', 'host_write_i2d', 'host_write_f2d', 'host_write_d', + 'd2s_array', 'd2i_array', 'd2f_array', + 's2d_array', 'i2d_array', 'f2d_array', + 'double64_peak_update', 'double64_get_capability', + 'replace_read_d2s', 'replace_read_d2i', 'replace_read_d2f', 'replace_read_d', + 'replace_write_s2d', 'replace_write_i2d', 'replace_write_f2d', 'replace_write_d', + 'd2bd_read', 'bd2d_write' + ]) + +#---------------------------------------------------------------------------- + +print "Hacking test programs." +delete_files ([ 'tests/dwvw_test.c', 'tests/floating_point_test.c', + 'tests/dft_cmp.c', 'tests/peak_chunk_test.c', + 'tests/scale_clip_test.tpl', 'tests/scale_clip_test.def' + ]) + +remove_comment_start_end ('tests/write_read_test.def', '/* Lite remove start */', '/* Lite remove end */') +remove_comment_start_end ('tests/write_read_test.tpl', '/* Lite remove start */', '/* Lite remove end */') + +remove_comment_start_end ('tests/Makefile.am', '# Lite remove start', '# Lite remove end') + +remove_strings_from_file ('tests/Makefile.am', [ + 'scale_clip_test.tpl', 'scale_clip_test.def', + '\n\t./dwvw_test', + '\n\t./floating_point_test', '\n\t./scale_clip_test', + '\n\t./peak_chunk_test aiff', '\n\t./peak_chunk_test wav', + '\n\t./command_test norm', '\n\t./command_test peak', + '\n\t./lossy_comp_test wav_ima', '\n\t./lossy_comp_test wav_msadpcm', + '\n\t./lossy_comp_test au_g721', '\n\t./lossy_comp_test au_g723', + '\n\t./lossy_comp_test vox_adpcm', + '\n\t./lossy_comp_test w64_ima', '\n\t./lossy_comp_test w64_msadpcm', + 'peak_chunk_test', 'dwvw_test', 'floating_point_test', 'scale_clip_test', + + 'paf-tests', 'svx-tests', 'nist-tests', 'ircam-tests', 'voc-tests', + 'mat4-tests', 'mat5-tests', 'pvf-tests', 'xi-tests', 'htk-tests', + 'sds-tests' + ]) + +remove_comment_start_end ('tests/pcm_test.c', '/* Lite remove start */', '/* Lite remove end */') +remove_funcs_and_protos_from_file ('tests/pcm_test.c', [ + 'pcm_test_float', 'pcm_test_double' + ]) + +remove_comment_start_end ('tests/lossy_comp_test.c', '/* Lite remove start */', '/* Lite remove end */') +remove_funcs_and_protos_from_file ('tests/lossy_comp_test.c', [ + 'lcomp_test_float', 'lcomp_test_double', 'sdlcomp_test_float', 'sdlcomp_test_double', + 'smoothed_diff_float', 'smoothed_diff_double' + ]) + +remove_comment_start_end ('tests/multi_file_test.c', '/* Lite remove start */', '/* Lite remove end */') + +remove_strings_from_file ('tests/stdio_test.c', [ + '"paf",', '"svx",', '"nist",', '"ircam",', '"voc",', '"mat4",', '"mat5",', '"pvf",' + ]) + +remove_comment_start_end ('tests/pipe_test.c', '/* Lite remove start */', '/* Lite remove end */') + +#---------------------------------------------------------------------------- + +print "Fixing configure.ac file." +fix_configure_ac_file ('configure.ac') + +print "Building and testing source." + # Try --disable-shared --disable-gcc-opt +if os.system ("./reconfigure.mk && ./configure --disable-shared --disable-gcc-opt && make check"): + os.system ('PS1="FIX > " bash --norc') + sys.exit (1) + +print "Making distcheck" +if os.system ("make distcheck"): + os.system ('PS1="FIX > " bash --norc') + sys.exit (1) + +print "Copying tarball" +if os.system ("cp %s.tar.gz %s" % (lite_version, source_dir)): + print "??? %s.tar.gz ???" % lite_version + os.system ('PS1="FIX > " bash --norc') + sys.exit (1) + +os.chdir (source_dir) + +os.system ("rm -rf /tmp/%s" % lite_version) + +print "Done." diff --git a/lib-src/libsndfile/man/Makefile.am b/lib-src/libsndfile/man/Makefile.am deleted file mode 100644 index 3f5d9efdc..000000000 --- a/lib-src/libsndfile/man/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to produce Makefile.in - -man_MANS = sndfile-info.1 sndfile-play.1 sndfile-convert.1 sndfile-cmp.1 \ - sndfile-metadata-get.1 sndfile-metadata-set.1 sndfile-concat.1 \ - sndfile-interleave.1 sndfile-deinterleave.1 - -EXTRA_DIST = sndfile-info.1 sndfile-play.1 sndfile-convert.1 sndfile-cmp.1 \ - sndfile-metadata-get.1 sndfile-concat.1 sndfile-interleave.1 - -# Same manpage for both programs. -sndfile-metadata-set.1 : sndfile-metadata-get.1 - $(LN_S) $(srcdir)/sndfile-metadata-get.1 $@ - -sndfile-deinterleave.1 : sndfile-interleave.1 - $(LN_S) $(srcdir)/sndfile-interleave.1 $@ diff --git a/lib-src/libsndfile/man/Makefile.in b/lib-src/libsndfile/man/Makefile.in deleted file mode 100644 index 9f5e7473c..000000000 --- a/lib-src/libsndfile/man/Makefile.in +++ /dev/null @@ -1,582 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = man -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" -NROFF = nroff -MANS = $(man_MANS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -man_MANS = sndfile-info.1 sndfile-play.1 sndfile-convert.1 sndfile-cmp.1 \ - sndfile-metadata-get.1 sndfile-metadata-set.1 sndfile-concat.1 \ - sndfile-interleave.1 sndfile-deinterleave.1 - -EXTRA_DIST = sndfile-info.1 sndfile-play.1 sndfile-convert.1 sndfile-cmp.1 \ - sndfile-metadata-get.1 sndfile-concat.1 sndfile-interleave.1 - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-man1: $(man_MANS) - @$(NORMAL_INSTALL) - @list1=''; \ - list2='$(man_MANS)'; \ - test -n "$(man1dir)" \ - && test -n "`echo $$list1$$list2`" \ - || exit 0; \ - echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ - { for i in $$list1; do echo "$$i"; done; \ - if test -n "$$list2"; then \ - for i in $$list2; do echo "$$i"; done \ - | sed -n '/\.1[a-z]*$$/p'; \ - fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ - fi; \ - done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ - done; } - -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list=''; test -n "$(man1dir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(MANS) -installdirs: - for dir in "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-man - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: install-man1 - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-man - -uninstall-man: uninstall-man1 - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-man \ - uninstall-man1 - - -# Same manpage for both programs. -sndfile-metadata-set.1 : sndfile-metadata-get.1 - $(LN_S) $(srcdir)/sndfile-metadata-get.1 $@ - -sndfile-deinterleave.1 : sndfile-interleave.1 - $(LN_S) $(srcdir)/sndfile-interleave.1 $@ - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/man/sndfile-cmp.1 b/lib-src/libsndfile/man/sndfile-cmp.1 index 30870bdfc..d346e2c45 100644 --- a/lib-src/libsndfile/man/sndfile-cmp.1 +++ b/lib-src/libsndfile/man/sndfile-cmp.1 @@ -1,16 +1,29 @@ -.TH SNDFILE-CMP 1 "October 5, 2009" -.SH NAME -sndfile-cmp \- compares two audio files -.SH SYNOPSIS -.B sndfile-cmp -.RI "file1 file2" -.SH DESCRIPTION -sndfile-cmp compares the audio data of two sound files. In particular most -differences in the audio file header, particularly metadata like string info, -are completely ignored. - -sndfile-cmp does its work using libsndfile -(http://www.mega-nerd.com/libsndfile/). -.SH AUTHOR -This manual page was written by Erik de Castro Lopo . - +.Dd November 2, 2014 +.Dt SNDFILE-CMP 1 +.Os +.Sh NAME +.Nm sndfile-cmp +.Nd compare two audio files +.Sh SYNOPSIS +.Nm sndfile-cmp +.Ar file1 +.Ar file2 +.Sh DESCRIPTION +.Nm +compares the audio data of two sound files. +For two files to compare as being the same, their channel counts, sample rate, +audio data lengths and actual audio data must match. +Other differences such as string metadata like song title, artist etc and their +presence or absence are ignored. +.Sh EXIT STATUS +.Bl -tag -width 1n -compact +.It 0 +The audio data is the same. +.It 1 +The audio data differs. +.El +.Sh SEE ALSO +.Lk http://www.mega-nerd.com/libsndfile +.Sh AUTHORS +.An Conrad Parker Aq Mt conrad@metadecks.org +.An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com diff --git a/lib-src/libsndfile/man/sndfile-concat.1 b/lib-src/libsndfile/man/sndfile-concat.1 index 1d95765f6..21104011a 100644 --- a/lib-src/libsndfile/man/sndfile-concat.1 +++ b/lib-src/libsndfile/man/sndfile-concat.1 @@ -1,16 +1,28 @@ -.TH SNDFILE-CONCAT 1 "December 9, 2009" -.SH NAME -sndfile-concat \- concatenates two or more audio files -.SH SYNOPSIS -.B sndfile-concat -.RI "infile1 infile2 .... outfile" -.SH DESCRIPTION -sndfile-concat generates a new output file by concatenating two or more input -files. The format of the output file is the same as the format of the input -file. - -sndfile-concat does its work using libsndfile -(http://www.mega-nerd.com/libsndfile/). -.SH AUTHOR -This manual page was written by Erik de Castro Lopo . - +.Dd November 2, 2014 +.Dt SNDFILE-CONCAT 1 +.Os +.Sh NAME +.Nm sndfile-concat +.Nd concatenate audio data from two or more audio files +.Sh SYNOPSIS +.Nm sndfile-concat +.Ar infile1 +.Ar infile2 +.Ar ... +.Ar outfile +.Sh DESCRIPTION +.Nm +generates a new output file by concatenating the audio data +of two or more input files. The encoding of the output file +is the encoding used in +.Ar infile1 . +Audio data from the subsequent files are converted to this encoding. +The only restriction is that the files must have +the same number of channels. +The output file is overwritten if it already exists. +.Sh EXIT STATUS +.Ex -std +.Sh SEE ALSO +.Lk http://www.mega-nerd.com/libsndfile/ +.Sh AUTHORS +.An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com diff --git a/lib-src/libsndfile/man/sndfile-convert.1 b/lib-src/libsndfile/man/sndfile-convert.1 index 583c9562c..d34edcdeb 100644 --- a/lib-src/libsndfile/man/sndfile-convert.1 +++ b/lib-src/libsndfile/man/sndfile-convert.1 @@ -1,22 +1,160 @@ -.TH SNDFILE-CONVERT 1 "October 09, 2002" -.SH NAME -sndfile-convert \- convert a sound files from one format to another -.SH SYNOPSIS -.B sndfile-convert -.RI "[encoding] input_file output_file" -.LP -.B sndfile-convert -.RI --help -.SH DESCRIPTION -sndfile-convert converts sound files from one format to another using -libsndfile (http://www.mega-nerd.com/libsndfile/) to read and write -the data. -.LP -The format of the output file is determined by the filename extension -of the output file. -.LP -The optional encoding parameter allows setting of the data encoding for -the output file. Run "sndfile\-convert \-\-help" for more information. -.SH AUTHOR -This manual page was written by Erik de Castro Lopo . - +.Dd November 2, 2014 +.Dt SNDFILE-CONVERT 1 +.Os +.Sh NAME +.Nm sndfile-convert +.Nd convert sound files from one format to another +.Sh SYNOPSIS +.Nm sndfile-convert +.Op Fl override-sample-rate Ns = Ns Ar rate +.Op Fl endian Ns = Ns Cm little | big | cpu +.Op Fl normalize +.Op Ar encoding +.Ar input +.Ar output +.Sh DESCRIPTION +.Nm +converts sound files from one audio format to another. +The output file is overwritten it it already exists. +.Ss Formats +The format of the output file is determined by the filename extension. +The following file formats are currently recognized: +.Pp +.Bl -tag -compact -width ircam +.It wav +WAV (Microsoft) +.It aif +AIFF (Apple/SGI) +.It au +AU (Sun/NeXT) +.It snd +AU (Sun/NeXT) +.It raw +RAW (header-less) +.It gsm +RAW (header-less) +.It vox +RAW (header-less) +.It paf +PAF (Ensoniq PARIS, big-endian) +.It fap +PAF (Ensoniq PARIS, little-endian) +.It svx +IFF (Amiga IFF/SVX8/SV16) +.It nist +SPHERE (NIST SPeech HEader Resources) +.It sph +SPHERE (NIST SPeech HEader Resources) +.It voc +VOC (Creative Labs) +.It ircam +SF (Berkeley/IRCAM/CARL) +.It sf +SF (Berkeley/IRCAM/CARL) +.It w64 +W64 (SoundFoundry WAVE 64) +.It mat +MAT4 (GNU Octave 2.0 / Matlab 4.2) +.It mat4 +MAT4 (GNU Octave 2.0 / Matlab 4.2) +.It mat5 +MAT5 (GNU Octave 2.1 / Matlab 5.0) +.It pvf +PVF (Portable Voice Format) +.It xi +XI (FastTracker 2) +.It htk +HTK (HMM Tool Kit) +.It sds +SDS (Midi Sample Dump Standard) +.It avr +AVR (Audio Visual Research) +.It wavex +WAVEX (MS WAVE with WAVEFORMATEX) +.It sd2 +SD2 (Sound Designer II) +.It flac +FLAC (FLAC Lossless Audio Codec) +.It caf +CAF (Apple Core Audio File) +.It wve +WVE (Psion Series 3) +.It prc +WVE (Psion Series 3) +.It ogg +OGG (OGG Container format) +.It oga +OGG (OGG Container format) +.It mpc +MPC (Akai MPC 2k) +.It rf64 +RF64 (RIFF 64) +.El +.Ss Options +The following options are recoginzed: +.Pp +.Bl -tag -compact -width "override-sample-rate=XXXXX" +.It Fl override-sample-rate Ns = Ns Ar rate +Make the input use sample rate of +.Ar rate +Hz. +.It Fl endian Ns = Ns Cm little +Make the output file use little endian data. +.It Fl endian Ns = Ns Cm big +Make the output file use big endian data. +.It Fl endian Ns = Ns Cm cpu +Make the output file use CPU endianness. +.It Fl normalize +Normalize the audio data in the output file. +.El +.Ss Encodings +The optional +.Ar encoding +parameter allows setting of the data encoding for the output file. +The following encodings are currently supported: +.Pp +.Bl -tag -compact -width ima-adpcmXX +.It Fl pcms8 +signed 8 bit pcm +.It Fl pcmu8 +unsigned 8 bit pcm +.It Fl pcm16 +16 bit pcm +.It Fl pcm24 +24 bit pcm +.It Fl pcm32 +32 bit pcm +.It Fl float32 +32 bit floating point +.It Fl ulaw +ULAW +.It Fl alaw +ALAW +.It Fl ima-adpcm +IMA ADPCM (WAV only) +.It Fl ms-adpcm +MS ADPCM (WAV only) +.It Fl gsm610 +GSM6.10 (WAV only) +.It Fl dwvw12 +12 bit DWVW (AIFF only) +.It Fl dwvw16 +16 bit DWVW (AIFF only) +.It Fl dwvw24 +24 bit DWVW (AIFF only) +.It Fl vorbis +Vorbis (OGG only) +.El +.Pp +If no encoding is specified for the output file, +.Nm +will try to use the encoding of the input file. +This will not always work as most container formats +(e.g. WAV, AIFF etc) only support a small subset of encodings +(e.g. 16 bit PCM, a-law, Vorbis etc). +.Sh EXIT STATUS +.Ex -std +.Sh SEE ALSO +.Lk http://www.mega-nerd.com/libsndfile/ +.Sh AUTHORS +.An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com . diff --git a/lib-src/libsndfile/man/sndfile-info.1 b/lib-src/libsndfile/man/sndfile-info.1 index b66875852..68c6a1eea 100644 --- a/lib-src/libsndfile/man/sndfile-info.1 +++ b/lib-src/libsndfile/man/sndfile-info.1 @@ -1,16 +1,34 @@ -.TH SNDFILE-INFO 1 "July 28, 2002" -.SH NAME -sndfile-info \- display information about a sound file -.SH SYNOPSIS -.B sndfile-info -.RI file -.SH DESCRIPTION -sndfile-info will display basic information about a sound file such as -its format, its sample rate, and the number of channels. This information -is obtained using libsndfile (http://www.mega-nerd.com/libsndfile/). -.SH AUTHOR -This manual page was originally written by Joshua Haberman -, for the Debian GNU/Linux system (but may be used by -others). Further additions have been made by Erik de Castro Lopo -. - +.Dd November 2, 2014 +.Dt SNDFILE-INFO 1 +.Os +.Sh NAME +.Nm sndfile-info +.Nd display information about sound files +.Sh SYNOPSIS +.Nm sndfile-info +.Op Fl -broadcast +.Op Fl -cart +.Op Fl -channel-map +.Op Fl -instrument +.Ar +.Sh DESCRIPTION +.Nm +displays basic information about sound files +such as format, number of channels, samplerate, and length. +The following options are recognized: +.Pp +.Bl -tag -compact -width channelmapXXXX +.It Fl -broadcast +Display broadcast (BWF) info. +.It Fl -cart +Display the cart chunk of a WAV (or related) file. +.It Fl -channel-map +Display channel map. +.It Fl -instrument +Display instrument info: +a base note, gain, velocity, key, and loop points. +.El +.Sh SEE ALSO +.Lk http://www.mega-nerd.com/libsndfile/ +.Sh AUTHORS +.An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com . diff --git a/lib-src/libsndfile/man/sndfile-interleave.1 b/lib-src/libsndfile/man/sndfile-interleave.1 index 26ca34520..31723a104 100644 --- a/lib-src/libsndfile/man/sndfile-interleave.1 +++ b/lib-src/libsndfile/man/sndfile-interleave.1 @@ -1,23 +1,62 @@ -.TH SNDFILE-INTERLEAVE 1 "December 14, 2009" -.SH NAME -sndfile-interleave \- convert multiple single channel files into a multi-channel file -.br -sndfile-deinterleave \- split a multi-channel into multiple single channel files -.SH SYNOPSIS -.B sndfile-interleave -.RI " ... -o " -.br -.B sndfile-deinterleave -.RI "filename" - -.SH DESCRIPTION -sndfile-interleave and sndfile-deinterleave use libsndfile -(http://www.mega-nerd.com/libsndfile/) to convert back and forth between multiple -single channel files and a single multi-channel sound file. - -Run "sndfile\-interleave \-\-help" or "sndfile\-deinterleave \-\-help" for -more information - -.SH AUTHOR -This manual page was written by Erik de Castro Lopo . - +.Dd November 2, 2014 +.Dt SNDFILE-INTERLEAVE 1 +.Os +.Sh NAME +.Nm sndfile-interleave , +.Nm sndfile-deinterleave +.Nd convert mono files into a multi-channel file and vice versa +.Sh SYNOPSIS +.Nm sndfile-interleave +.Ar input1 +.Ar input2 +.Ar ... +.Fl o Ar output +.Nm sndfile-deinterleave +.Ar file +.Sh DESCRIPTION +.Nm sndfile-interleave +creates a multi-channel file taking audio data +from two or more mono files as individual channels. +The format of the output file is determined by its filename suffix. +The audio parameters of the output file will be made so that +the format can accommodate each of the mono inputs; +for example, the samplerate will be the maximal samplerate +occurring in the inputs. +The output file will be overwritten if it already exists. +.Pp +.Nm sndfile-deinterleave +creates two or more mono files from a multi-channel audio file, +containing data from the individual channels. The names of the +resulting mono files are of the form +.Dq name_XY.suf +where +.Em name +and +.Em suf +are the basename and suffix of the original file. +If any file of such name already exists, it will be overwritten. +Apart from the number of channels, +the audio format of the resulting mono files +is the same as that of the original file. +.Sh EXIT STATUS +.Ex -std +.Sh EXAMPLES +Merge a mono OGG file and a mono FLAC file into a stereo WAV file: +.Bd -literal -offset indent +$ sndfile-interleave left.ogg right.flac -o stereo.wav +.Ed +.Pp +Split a multi-channel into individual mono files: +.Bd -literal -offset indent +$ sndfile-deinterleave multi.wav +Input file : multi +Output files : + multi_00.wav + multi_01.wav + multi_02.wav + multi_03.wav +.Ed +.Sh SEE ALSO +.Lk http://www.mega-nerd.com/libsndfile/ +.Sh AUTHORS +.An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com diff --git a/lib-src/libsndfile/man/sndfile-metadata-get.1 b/lib-src/libsndfile/man/sndfile-metadata-get.1 index b97560ea3..90aac3a6b 100644 --- a/lib-src/libsndfile/man/sndfile-metadata-get.1 +++ b/lib-src/libsndfile/man/sndfile-metadata-get.1 @@ -1,26 +1,116 @@ -.TH SNDFILE-METADATA-GET 1 "October 6, 2009" -.SH NAME -sndfile-metadata-get \- retrieve metadata from a sound file -.br -sndfile-metadata-set \- set metadata in a sound file -.SH SYNOPSIS -.B sndfile-metadata-get -.RI "[options] file" -.br -.B sndfile-metadata-set -.RI "[options] file" -.br -.B sndfile-metadata-set -.RI "[options] input-file output-file" - -.SH DESCRIPTION -sndfile-metadata-get and sndfile-metadata-set use libsndfile -(http://www.mega-nerd.com/libsndfile/) to retrieve metadata from or set metadata -in a sound file. - -Run "sndfile\-metadata\-get \-\-help" or "sndfile\-metadata\-set \-\-help" for -more information - -.SH AUTHOR -This manual page was written by Erik de Castro Lopo . - +.Dd November 2, 2014 +.Dt SNDFILE-METADATA-GET 1 +.Os +.Sh NAME +.Nm sndfile-metadata-get , +.Nm sndfile-metadata-set +.Nd get or set metadata in a sound file +.Sh SYNOPSIS +.Nm sndfile-metadata-get +.Op Ar options +.Ar file +.Nm sndfile-metadata-set +.Op Ar options +.Ar file +.Nm sndfile-metadata-set +.Op Ar options +.Ar input +.Ar output +.Sh DESCRIPTION +.Nm sndfile-metadata-get +displays bext and string metadata stored in an audio file. +The following options specify what to print. +.Pp +.Bl -tag -width bext-descriptionXXXX -compact +.It Fl -all +all metadata +.It Fl -bext-description +description +.It Fl -bext-originator +originator info +.It Fl -bext-orig-ref +originator reference +.It Fl -bext-umid +Unique Material Identifier +.It Fl -bext-orig-date +origination date +.It Fl -bext-orig-time +origination time +.It Fl -bext-coding-hist +coding history +.It Fl -str-title +title +.It Fl -str-copyright +copyright +.It Fl -str-artist +artist +.It Fl -str-comment +comment +.It Fl -str-date +creation date +.It Fl -str-album +album +.It Fl -str-license +license +.El +.Pp +.Nm sndfile-metadata-set +sets bext and string metadata in an audio file if the format supports it. +If the file does not contain a BEXT chunk to be modified, +the second synopsis must be used, where another output file +capable of storing the metadata is created. +This file is overwritten if it already exists. +The following options take an argument specifying the metadata: +.Pp +.Bl -tag -width bext-coding-histXXXXXXX -compact +.It Fl -bext-description +description +.It Fl -bext-originator +originator +.It Fl -bext-orig-ref +originator reference +.It Fl -bext-umid +Unique Material Identifier +.It Fl -bext-orig-date +origination date +.It Fl -bext-orig-time +origination time +.It Fl -bext-coding-hist +coding history +.It Fl -bext-time-raf +time reference +.It Fl -str-comment +comment +.It Fl -str-title +title +.It Fl -str-copyright +copyright +.It Fl -str-artist +artist +.It Fl -str-date +date +.It Fl -str-album +album +.It Fl -str-license +license +.El +.Pp +The following options take no argument: +.Pp +.Bl -tag -width bext-coding-histXXXXXXX -compact +.It Fl -bext-auto-time-date +Set the BEXT time and date to current. +.It Fl -bext-auto-time +Set the BEXT time to current. +.It Fl -bext-auto-date +Set the BEXT date to current. +.It Fl -str-auto-date +Set the string date to current. +.El +.Sh EXIT STATUS +.Ex -std +.Sh SEE ALSO +.Lk http://www.mega-nerd.com/libsndfile/ +.Lk http://tech.ebu.ch/docs/tech/tech3285.pdf +.Sh AUTHORS +.An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com diff --git a/lib-src/libsndfile/man/sndfile-play.1 b/lib-src/libsndfile/man/sndfile-play.1 index 0196461c1..1d161b34a 100644 --- a/lib-src/libsndfile/man/sndfile-play.1 +++ b/lib-src/libsndfile/man/sndfile-play.1 @@ -1,36 +1,34 @@ -.de EX -.ne 5 -.if n .sp 1 -.if t .sp .5 -.nf -.in +.5i -.. -.de EE -.fi -.in -.5i -.if n .sp 1 -.if t .sp .5 -.. -.TH SNDFILE-PLAY 1 "July 28, 2002" -.SH NAME -sndfile-play \- play a sound file -.SH SYNOPSIS -.B sndfile-play -.RI file -.SH DESCRIPTION -sndfile-play plays the specified sound file using : -.EX -ALSA on Linux -/dev/dsp on systems supporting OSS (including Linux) -/dev/audio on Sun Solaris -CoreAudio on Apple MacOSX -waveOut on Microsoft Win32 -.EE -sndfile-play uses libsndfile (http://www.mega-nerd.com/libsndfile/) -to read the file. -.SH AUTHOR -This manual page was originally written by Joshua Haberman -, for the Debian GNU/Linux system (but may be used by -others). Further additions have been made by Erik de Castro Lopo -. - +.Dd November 2, 2014 +.Dt SNDFILE-PLAY 1 +.Os +.Sh NAME +.Nm sndfile-play +.Nd play a sound file +.Sh SYNOPSIS +.Nm sndfile-play +.Ar +.Sh DESCRIPTION +.Nm +plays one or more sound files on various operating systems using standard audio +output APIs. The following table summarizes which audio API is used where: +.Pp +.Bl -tag -width MacOSX10XXX -compact +.It Linux +ALSA or OSS +.It OpenBSD +sndio +.It FreeBSD +/dev/dsp (OSS) +.It Solaris +/dev/audio +.It MacOSX 10.6 +CoreAudio +.It MacOSX 10.7 +AudioToolbox +.It Win32 +waveOut +.El +.Sh SEE ALSO +.Lk http://www.mega-nerd.com/libsndfile/ +.Sh AUTHORS +.An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com diff --git a/lib-src/libsndfile/man/sndfile-salvage.1 b/lib-src/libsndfile/man/sndfile-salvage.1 new file mode 100644 index 000000000..87e040835 --- /dev/null +++ b/lib-src/libsndfile/man/sndfile-salvage.1 @@ -0,0 +1,25 @@ +.Dd November 2, 2014 +.Dt SNDFILE-SALVAGE 1 +.Os +.Sh NAME +.Nm sndfile-salvage +.Nd salvage audio data from WAV files longer than 4G +.Sh SYNOPSIS +.Nm sndfile-salvage +.Ar toolong.wav +.Ar fixed64.wav +.Sh DESCRIPTION +Audio files using the WAV file container are inherently limited to 4G of data +size fields in the WAV header being stored as unsigned 32bit integers. +Many applications have trouble with these WAV files +that are more the 4G in size. +.Nm +rewrites the WAV file into a W64 file with the same audio content. +This file is overwritten if it already exists. +.Sh EXIT STATUS +.Ex -std +.Sh SEE ALSO +.Lk http://www.mega-nerd.com/libsndfile/ +.\".Lk http://en.wikipedia.org/wiki/RF64 +.Sh AUTHORS +.An Erik de Castro Lopo Aq Mt erikd@mega-nerd.com diff --git a/lib-src/libsndfile/programs/Makefile.am b/lib-src/libsndfile/programs/Makefile.am deleted file mode 100644 index 066b61d51..000000000 --- a/lib-src/libsndfile/programs/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to produce Makefile.in - -bin_PROGRAMS = sndfile-info sndfile-play sndfile-convert sndfile-cmp \ - sndfile-metadata-set sndfile-metadata-get sndfile-interleave \ - sndfile-deinterleave sndfile-concat sndfile-salvage - -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ - -AM_CPPFLAGS = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS) - -CLEANFILES = *~ - -# This is the BeOS version of sndfile-play. It needs to be compiled with the C++ -# compiler. -EXTRA_DIST = sndfile-play-beos.cpp test-sndfile-metadata-set.py - -sndfile_info_SOURCES = sndfile-info.c common.c common.h -sndfile_info_LDADD = $(top_builddir)/src/libsndfile.la - -sndfile_play_SOURCES = sndfile-play.c common.c common.h -sndfile_play_LDADD = $(top_builddir)/src/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS) $(SNDIO_LIBS) - -sndfile_convert_SOURCES = sndfile-convert.c common.c common.h -sndfile_convert_LDADD = $(top_builddir)/src/libsndfile.la - -sndfile_cmp_SOURCES = sndfile-cmp.c common.c common.h -sndfile_cmp_LDADD = $(top_builddir)/src/libsndfile.la - -sndfile_metadata_set_SOURCES = sndfile-metadata-set.c common.c common.h -sndfile_metadata_set_LDADD = $(top_builddir)/src/libsndfile.la - -sndfile_metadata_get_SOURCES = sndfile-metadata-get.c common.c common.h -sndfile_metadata_get_LDADD = $(top_builddir)/src/libsndfile.la - -sndfile_interleave_SOURCES = sndfile-interleave.c common.c common.h -sndfile_interleave_LDADD = $(top_builddir)/src/libsndfile.la - -sndfile_deinterleave_SOURCES = sndfile-deinterleave.c common.c common.h -sndfile_deinterleave_LDADD = $(top_builddir)/src/libsndfile.la - -sndfile_concat_SOURCES = sndfile-concat.c common.c common.h -sndfile_concat_LDADD = $(top_builddir)/src/libsndfile.la - -sndfile_salvage_SOURCES = sndfile-salvage.c common.c common.h -sndfile_salvage_LDADD = $(top_builddir)/src/libsndfile.la - diff --git a/lib-src/libsndfile/programs/Makefile.in b/lib-src/libsndfile/programs/Makefile.in deleted file mode 100644 index 49855f050..000000000 --- a/lib-src/libsndfile/programs/Makefile.in +++ /dev/null @@ -1,801 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -bin_PROGRAMS = sndfile-info$(EXEEXT) sndfile-play$(EXEEXT) \ - sndfile-convert$(EXEEXT) sndfile-cmp$(EXEEXT) \ - sndfile-metadata-set$(EXEEXT) sndfile-metadata-get$(EXEEXT) \ - sndfile-interleave$(EXEEXT) sndfile-deinterleave$(EXEEXT) \ - sndfile-concat$(EXEEXT) sndfile-salvage$(EXEEXT) -subdir = programs -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/Cfg/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) -am_sndfile_cmp_OBJECTS = sndfile-cmp.$(OBJEXT) common.$(OBJEXT) -sndfile_cmp_OBJECTS = $(am_sndfile_cmp_OBJECTS) -sndfile_cmp_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_sndfile_concat_OBJECTS = sndfile-concat.$(OBJEXT) common.$(OBJEXT) -sndfile_concat_OBJECTS = $(am_sndfile_concat_OBJECTS) -sndfile_concat_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfile_convert_OBJECTS = sndfile-convert.$(OBJEXT) \ - common.$(OBJEXT) -sndfile_convert_OBJECTS = $(am_sndfile_convert_OBJECTS) -sndfile_convert_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfile_deinterleave_OBJECTS = sndfile-deinterleave.$(OBJEXT) \ - common.$(OBJEXT) -sndfile_deinterleave_OBJECTS = $(am_sndfile_deinterleave_OBJECTS) -sndfile_deinterleave_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfile_info_OBJECTS = sndfile-info.$(OBJEXT) common.$(OBJEXT) -sndfile_info_OBJECTS = $(am_sndfile_info_OBJECTS) -sndfile_info_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfile_interleave_OBJECTS = sndfile-interleave.$(OBJEXT) \ - common.$(OBJEXT) -sndfile_interleave_OBJECTS = $(am_sndfile_interleave_OBJECTS) -sndfile_interleave_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfile_metadata_get_OBJECTS = sndfile-metadata-get.$(OBJEXT) \ - common.$(OBJEXT) -sndfile_metadata_get_OBJECTS = $(am_sndfile_metadata_get_OBJECTS) -sndfile_metadata_get_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfile_metadata_set_OBJECTS = sndfile-metadata-set.$(OBJEXT) \ - common.$(OBJEXT) -sndfile_metadata_set_OBJECTS = $(am_sndfile_metadata_set_OBJECTS) -sndfile_metadata_set_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sndfile_play_OBJECTS = sndfile-play.$(OBJEXT) common.$(OBJEXT) -sndfile_play_OBJECTS = $(am_sndfile_play_OBJECTS) -am__DEPENDENCIES_1 = -sndfile_play_DEPENDENCIES = $(top_builddir)/src/libsndfile.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_sndfile_salvage_OBJECTS = sndfile-salvage.$(OBJEXT) \ - common.$(OBJEXT) -sndfile_salvage_OBJECTS = $(am_sndfile_salvage_OBJECTS) -sndfile_salvage_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -depcomp = $(SHELL) $(top_srcdir)/Cfg/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(sndfile_cmp_SOURCES) $(sndfile_concat_SOURCES) \ - $(sndfile_convert_SOURCES) $(sndfile_deinterleave_SOURCES) \ - $(sndfile_info_SOURCES) $(sndfile_interleave_SOURCES) \ - $(sndfile_metadata_get_SOURCES) \ - $(sndfile_metadata_set_SOURCES) $(sndfile_play_SOURCES) \ - $(sndfile_salvage_SOURCES) -DIST_SOURCES = $(sndfile_cmp_SOURCES) $(sndfile_concat_SOURCES) \ - $(sndfile_convert_SOURCES) $(sndfile_deinterleave_SOURCES) \ - $(sndfile_info_SOURCES) $(sndfile_interleave_SOURCES) \ - $(sndfile_metadata_get_SOURCES) \ - $(sndfile_metadata_set_SOURCES) $(sndfile_play_SOURCES) \ - $(sndfile_salvage_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS) -CLEANFILES = *~ - -# This is the BeOS version of sndfile-play. It needs to be compiled with the C++ -# compiler. -EXTRA_DIST = sndfile-play-beos.cpp test-sndfile-metadata-set.py -sndfile_info_SOURCES = sndfile-info.c common.c common.h -sndfile_info_LDADD = $(top_builddir)/src/libsndfile.la -sndfile_play_SOURCES = sndfile-play.c common.c common.h -sndfile_play_LDADD = $(top_builddir)/src/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS) $(SNDIO_LIBS) -sndfile_convert_SOURCES = sndfile-convert.c common.c common.h -sndfile_convert_LDADD = $(top_builddir)/src/libsndfile.la -sndfile_cmp_SOURCES = sndfile-cmp.c common.c common.h -sndfile_cmp_LDADD = $(top_builddir)/src/libsndfile.la -sndfile_metadata_set_SOURCES = sndfile-metadata-set.c common.c common.h -sndfile_metadata_set_LDADD = $(top_builddir)/src/libsndfile.la -sndfile_metadata_get_SOURCES = sndfile-metadata-get.c common.c common.h -sndfile_metadata_get_LDADD = $(top_builddir)/src/libsndfile.la -sndfile_interleave_SOURCES = sndfile-interleave.c common.c common.h -sndfile_interleave_LDADD = $(top_builddir)/src/libsndfile.la -sndfile_deinterleave_SOURCES = sndfile-deinterleave.c common.c common.h -sndfile_deinterleave_LDADD = $(top_builddir)/src/libsndfile.la -sndfile_concat_SOURCES = sndfile-concat.c common.c common.h -sndfile_concat_LDADD = $(top_builddir)/src/libsndfile.la -sndfile_salvage_SOURCES = sndfile-salvage.c common.c common.h -sndfile_salvage_LDADD = $(top_builddir)/src/libsndfile.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu programs/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu programs/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -sndfile-cmp$(EXEEXT): $(sndfile_cmp_OBJECTS) $(sndfile_cmp_DEPENDENCIES) $(EXTRA_sndfile_cmp_DEPENDENCIES) - @rm -f sndfile-cmp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_cmp_OBJECTS) $(sndfile_cmp_LDADD) $(LIBS) - -sndfile-concat$(EXEEXT): $(sndfile_concat_OBJECTS) $(sndfile_concat_DEPENDENCIES) $(EXTRA_sndfile_concat_DEPENDENCIES) - @rm -f sndfile-concat$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_concat_OBJECTS) $(sndfile_concat_LDADD) $(LIBS) - -sndfile-convert$(EXEEXT): $(sndfile_convert_OBJECTS) $(sndfile_convert_DEPENDENCIES) $(EXTRA_sndfile_convert_DEPENDENCIES) - @rm -f sndfile-convert$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_convert_OBJECTS) $(sndfile_convert_LDADD) $(LIBS) - -sndfile-deinterleave$(EXEEXT): $(sndfile_deinterleave_OBJECTS) $(sndfile_deinterleave_DEPENDENCIES) $(EXTRA_sndfile_deinterleave_DEPENDENCIES) - @rm -f sndfile-deinterleave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_deinterleave_OBJECTS) $(sndfile_deinterleave_LDADD) $(LIBS) - -sndfile-info$(EXEEXT): $(sndfile_info_OBJECTS) $(sndfile_info_DEPENDENCIES) $(EXTRA_sndfile_info_DEPENDENCIES) - @rm -f sndfile-info$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_info_OBJECTS) $(sndfile_info_LDADD) $(LIBS) - -sndfile-interleave$(EXEEXT): $(sndfile_interleave_OBJECTS) $(sndfile_interleave_DEPENDENCIES) $(EXTRA_sndfile_interleave_DEPENDENCIES) - @rm -f sndfile-interleave$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_interleave_OBJECTS) $(sndfile_interleave_LDADD) $(LIBS) - -sndfile-metadata-get$(EXEEXT): $(sndfile_metadata_get_OBJECTS) $(sndfile_metadata_get_DEPENDENCIES) $(EXTRA_sndfile_metadata_get_DEPENDENCIES) - @rm -f sndfile-metadata-get$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_metadata_get_OBJECTS) $(sndfile_metadata_get_LDADD) $(LIBS) - -sndfile-metadata-set$(EXEEXT): $(sndfile_metadata_set_OBJECTS) $(sndfile_metadata_set_DEPENDENCIES) $(EXTRA_sndfile_metadata_set_DEPENDENCIES) - @rm -f sndfile-metadata-set$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_metadata_set_OBJECTS) $(sndfile_metadata_set_LDADD) $(LIBS) - -sndfile-play$(EXEEXT): $(sndfile_play_OBJECTS) $(sndfile_play_DEPENDENCIES) $(EXTRA_sndfile_play_DEPENDENCIES) - @rm -f sndfile-play$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_play_OBJECTS) $(sndfile_play_LDADD) $(LIBS) - -sndfile-salvage$(EXEEXT): $(sndfile_salvage_OBJECTS) $(sndfile_salvage_DEPENDENCIES) $(EXTRA_sndfile_salvage_DEPENDENCIES) - @rm -f sndfile-salvage$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_salvage_OBJECTS) $(sndfile_salvage_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-cmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-concat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-convert.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-deinterleave.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-info.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-interleave.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-metadata-get.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-metadata-set.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-play.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-salvage.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binPROGRAMS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/programs/common.c b/lib-src/libsndfile/programs/common.c index 41b8e6e49..ae597ee21 100644 --- a/lib-src/libsndfile/programs/common.c +++ b/lib-src/libsndfile/programs/common.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2019 Erik de Castro Lopo ** Copyright (C) 2008 George Blood Audio ** ** All rights reserved. @@ -36,26 +36,27 @@ #include #include #include +#include #include #include "common.h" -#define BUFFER_LEN 4096 +#define BUFFER_LEN 4096 -#define MIN(x,y) ((x) < (y) ? (x) : (y)) +#define MIN(x, y) ((x) < (y) ? (x) : (y)) void -sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels) +sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize) { static double data [BUFFER_LEN], max ; - int frames, readcount, k ; + sf_count_t frames, readcount, k ; frames = BUFFER_LEN / channels ; readcount = frames ; sf_command (infile, SFC_CALC_SIGNAL_MAX, &max, sizeof (max)) ; - if (max < 1.0) + if (!normalize && max < 1.0) { while (readcount > 0) { readcount = sf_readf_double (infile, data, frames) ; sf_writef_double (outfile, data, readcount) ; @@ -147,6 +148,18 @@ merge_broadcast_info (SNDFILE * infile, SNDFILE * outfile, int format, const MET REPLACE_IF_NEW (origination_time) ; REPLACE_IF_NEW (umid) ; + /* Special case loudness values */ +#define REPLACE_IF_NEW_INT(x) \ + if (info->x != NULL) \ + { binfo.x = round (atof (info->x) * 100.0) ; \ + } ; + + REPLACE_IF_NEW_INT (loudness_value) ; + REPLACE_IF_NEW_INT (loudness_range) ; + REPLACE_IF_NEW_INT (max_true_peak_level) ; + REPLACE_IF_NEW_INT (max_momentary_loudness) ; + REPLACE_IF_NEW_INT (max_shortterm_loudness) ; + /* Special case for Time Ref. */ if (info->time_ref != NULL) { uint64_t ts = atoll (info->time_ref) ; @@ -252,7 +265,7 @@ sfe_apply_metadata_changes (const char * filenames [2], const METADATA_INFO * in /* If the input file is not the same as the output file, copy the data. */ if ((infileminor == SF_FORMAT_DOUBLE) || (infileminor == SF_FORMAT_FLOAT)) - sfe_copy_data_fp (outfile, infile, sfinfo.channels) ; + sfe_copy_data_fp (outfile, infile, sfinfo.channels, SF_FALSE) ; else sfe_copy_data_int (outfile, infile, sfinfo.channels) ; } ; @@ -282,35 +295,42 @@ typedef struct int format ; } OUTPUT_FORMAT_MAP ; +/* Map a file name extension to a container format. */ static OUTPUT_FORMAT_MAP format_map [] = { - { "aif", 3, SF_FORMAT_AIFF }, { "wav", 0, SF_FORMAT_WAV }, + { "aif", 3, SF_FORMAT_AIFF }, { "au", 0, SF_FORMAT_AU }, - { "caf", 0, SF_FORMAT_CAF }, - { "flac", 0, SF_FORMAT_FLAC }, { "snd", 0, SF_FORMAT_AU }, - { "svx", 0, SF_FORMAT_SVX }, - { "paf", 0, SF_ENDIAN_BIG | SF_FORMAT_PAF }, - { "fap", 0, SF_ENDIAN_LITTLE | SF_FORMAT_PAF }, + { "raw", 0, SF_FORMAT_RAW }, { "gsm", 0, SF_FORMAT_RAW }, + { "vox", 0, SF_FORMAT_RAW }, + { "paf", 0, SF_FORMAT_PAF | SF_ENDIAN_BIG }, + { "fap", 0, SF_FORMAT_PAF | SF_ENDIAN_LITTLE }, + { "svx", 0, SF_FORMAT_SVX }, { "nist", 0, SF_FORMAT_NIST }, - { "htk", 0, SF_FORMAT_HTK }, + { "sph", 0, SF_FORMAT_NIST }, + { "voc", 0, SF_FORMAT_VOC }, { "ircam", 0, SF_FORMAT_IRCAM }, { "sf", 0, SF_FORMAT_IRCAM }, - { "voc", 0, SF_FORMAT_VOC }, { "w64", 0, SF_FORMAT_W64 }, - { "raw", 0, SF_FORMAT_RAW }, + { "mat", 0, SF_FORMAT_MAT4 }, { "mat4", 0, SF_FORMAT_MAT4 }, { "mat5", 0, SF_FORMAT_MAT5 }, - { "mat", 0, SF_FORMAT_MAT4 }, { "pvf", 0, SF_FORMAT_PVF }, - { "sds", 0, SF_FORMAT_SDS }, - { "sd2", 0, SF_FORMAT_SD2 }, - { "vox", 0, SF_FORMAT_RAW }, { "xi", 0, SF_FORMAT_XI }, + { "htk", 0, SF_FORMAT_HTK }, + { "sds", 0, SF_FORMAT_SDS }, + { "avr", 0, SF_FORMAT_AVR }, + { "wavex", 0, SF_FORMAT_WAVEX }, + { "sd2", 0, SF_FORMAT_SD2 }, + { "flac", 0, SF_FORMAT_FLAC }, + { "caf", 0, SF_FORMAT_CAF }, { "wve", 0, SF_FORMAT_WVE }, + { "prc", 0, SF_FORMAT_WVE }, + { "ogg", 0, SF_FORMAT_OGG }, { "oga", 0, SF_FORMAT_OGG }, + { "opus", 0, SF_FORMAT_OGG }, /* Opus data in an Ogg container. */ { "mpc", 0, SF_FORMAT_MPC2K }, { "rf64", 0, SF_FORMAT_RF64 }, } ; /* format_map */ @@ -368,12 +388,95 @@ program_name (const char * argv0) tmp = strrchr (argv0, '/') ; argv0 = tmp ? tmp + 1 : argv0 ; - tmp = strrchr (argv0, '/') ; - argv0 = tmp ? tmp + 1 : argv0 ; - /* Remove leading libtool name mangling. */ if (strstr (argv0, "lt-") == argv0) return argv0 + 3 ; return argv0 ; } /* program_name */ + +const char * +sfe_endian_name (int format) +{ + switch (format & SF_FORMAT_ENDMASK) + { case SF_ENDIAN_FILE : return "file" ; + case SF_ENDIAN_LITTLE : return "little" ; + case SF_ENDIAN_BIG : return "big" ; + case SF_ENDIAN_CPU : return "cpu" ; + default : break ; + } ; + + return "unknown" ; +} /* sfe_endian_name */ + +const char * +sfe_container_name (int format) +{ + switch (format & SF_FORMAT_TYPEMASK) + { case SF_FORMAT_WAV : return "WAV" ; + case SF_FORMAT_AIFF : return "AIFF" ; + case SF_FORMAT_AU : return "AU" ; + case SF_FORMAT_RAW : return "RAW" ; + case SF_FORMAT_PAF : return "PAF" ; + case SF_FORMAT_SVX : return "SVX" ; + case SF_FORMAT_NIST : return "NIST" ; + case SF_FORMAT_VOC : return "VOC" ; + case SF_FORMAT_IRCAM : return "IRCAM" ; + case SF_FORMAT_W64 : return "W64" ; + case SF_FORMAT_MAT4 : return "MAT4" ; + case SF_FORMAT_MAT5 : return "MAT5" ; + case SF_FORMAT_PVF : return "PVF" ; + case SF_FORMAT_XI : return "XI" ; + case SF_FORMAT_HTK : return "HTK" ; + case SF_FORMAT_SDS : return "SDS" ; + case SF_FORMAT_AVR : return "AVR" ; + case SF_FORMAT_WAVEX : return "WAVEX" ; + case SF_FORMAT_SD2 : return "SD2" ; + case SF_FORMAT_FLAC : return "FLAC" ; + case SF_FORMAT_CAF : return "CAF" ; + case SF_FORMAT_WVE : return "WVE" ; + case SF_FORMAT_OGG : return "OGG" ; + case SF_FORMAT_MPC2K : return "MPC2K" ; + case SF_FORMAT_RF64 : return "RF64" ; + default : break ; + } ; + + return "unknown" ; +} /* sfe_container_name */ + +const char * +sfe_codec_name (int format) +{ + switch (format & SF_FORMAT_SUBMASK) + { case SF_FORMAT_PCM_S8 : return "signed 8 bit PCM" ; + case SF_FORMAT_PCM_16 : return "16 bit PCM" ; + case SF_FORMAT_PCM_24 : return "24 bit PCM" ; + case SF_FORMAT_PCM_32 : return "32 bit PCM" ; + case SF_FORMAT_PCM_U8 : return "unsigned 8 bit PCM" ; + case SF_FORMAT_FLOAT : return "32 bit float" ; + case SF_FORMAT_DOUBLE : return "64 bit double" ; + case SF_FORMAT_ULAW : return "u-law" ; + case SF_FORMAT_ALAW : return "a-law" ; + case SF_FORMAT_IMA_ADPCM : return "IMA ADPCM" ; + case SF_FORMAT_MS_ADPCM : return "MS ADPCM" ; + case SF_FORMAT_GSM610 : return "gsm610" ; + case SF_FORMAT_VOX_ADPCM : return "Vox ADPCM" ; + case SF_FORMAT_G721_32 : return "g721 32kbps" ; + case SF_FORMAT_G723_24 : return "g723 24kbps" ; + case SF_FORMAT_G723_40 : return "g723 40kbps" ; + case SF_FORMAT_DWVW_12 : return "12 bit DWVW" ; + case SF_FORMAT_DWVW_16 : return "16 bit DWVW" ; + case SF_FORMAT_DWVW_24 : return "14 bit DWVW" ; + case SF_FORMAT_DWVW_N : return "DWVW" ; + case SF_FORMAT_DPCM_8 : return "8 bit DPCM" ; + case SF_FORMAT_DPCM_16 : return "16 bit DPCM" ; + case SF_FORMAT_VORBIS : return "Vorbis" ; + case SF_FORMAT_ALAC_16 : return "16 bit ALAC" ; + case SF_FORMAT_ALAC_20 : return "20 bit ALAC" ; + case SF_FORMAT_ALAC_24 : return "24 bit ALAC" ; + case SF_FORMAT_ALAC_32 : return "32 bit ALAC" ; + case SF_FORMAT_OPUS : return "Opus" ; + default : break ; + } ; + return "unknown" ; +} /* sfe_codec_name */ diff --git a/lib-src/libsndfile/programs/common.h b/lib-src/libsndfile/programs/common.h index 999690d90..b339590ce 100644 --- a/lib-src/libsndfile/programs/common.h +++ b/lib-src/libsndfile/programs/common.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2013 Erik de Castro Lopo ** ** All rights reserved. ** @@ -32,7 +32,7 @@ #define ARRAY_LEN(x) ((int) (sizeof (x) / sizeof (x [0]))) -#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) typedef struct { const char * title ; @@ -54,6 +54,11 @@ typedef struct const char * origination_date ; const char * origination_time ; const char * umid ; + const char * loudness_value ; + const char * loudness_range ; + const char * max_true_peak_level ; + const char * max_momentary_loudness ; + const char * max_shortterm_loudness ; const char * coding_history ; const char * time_ref ; } METADATA_INFO ; @@ -62,7 +67,7 @@ typedef SF_BROADCAST_INFO_VAR (2048) SF_BROADCAST_INFO_2K ; void sfe_apply_metadata_changes (const char * filenames [2], const METADATA_INFO * info) ; -void sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels) ; +void sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize) ; void sfe_copy_data_int (SNDFILE *outfile, SNDFILE *infile, int channels) ; @@ -71,3 +76,7 @@ int sfe_file_type_of_ext (const char *filename, int format) ; void sfe_dump_format_map (void) ; const char * program_name (const char * argv0) ; + +const char * sfe_endian_name (int format) ; +const char * sfe_container_name (int format) ; +const char * sfe_codec_name (int format) ; diff --git a/lib-src/libsndfile/programs/sndfile-cmp.c b/lib-src/libsndfile/programs/sndfile-cmp.c index f550d13d4..3dd992d1a 100644 --- a/lib-src/libsndfile/programs/sndfile-cmp.c +++ b/lib-src/libsndfile/programs/sndfile-cmp.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo ** Copyright (C) 2008 Conrad Parker ** ** All rights reserved. @@ -50,10 +50,12 @@ static char * filename1 = NULL, * filename2 = NULL ; static int comparison_error (const char * what, sf_count_t frame_offset) -{ char buffer [128] = "" ; +{ char buffer [128] ; if (frame_offset >= 0) snprintf (buffer, sizeof (buffer), " (at frame offset %" PRId64 ")", frame_offset) ; + else + buffer [0] = 0 ; printf ("%s: %s of files %s and %s differ%s.\n", progname, what, filename1, filename2, buffer) ; return 1 ; @@ -97,7 +99,7 @@ compare (void) /* Calculate the framecount that will fit in our data buffers */ items = BUFLEN / sfinfo1.channels ; - while ( (nread1 = sf_readf_double (sf1, buf1, items)) > 0) + while ((nread1 = sf_readf_double (sf1, buf1, items)) > 0) { nread2 = sf_readf_double (sf2, buf2, nread1) ; if (nread2 != nread1) { retval = comparison_error ("PCM data lengths", -1) ; @@ -112,7 +114,7 @@ compare (void) offset += nread1 ; } ; - if ( (nread2 = sf_readf_double (sf2, buf2, nread1)) != 0) + if ((nread2 = sf_readf_double (sf2, buf2, items)) != 0) { retval = comparison_error ("PCM data lengths", -1) ; goto out ; } ; @@ -124,22 +126,13 @@ out : return retval ; } /* compare */ -static void -print_version (void) -{ char buffer [256] ; - - sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer)) ; - printf ("\nVersion : %s\n\n", buffer) ; -} /* print_version */ - static void usage_exit (void) { - print_version () ; - printf ("Usage : %s \n", progname) ; printf (" Compare the PCM data of two sound files.\n\n") ; - exit (0) ; + printf ("Using %s.\n\n", sf_version_string ()) ; + exit (1) ; } /* usage_exit */ int @@ -148,9 +141,7 @@ main (int argc, char *argv []) progname = program_name (argv [0]) ; if (argc != 3) - { usage_exit () ; - return 1 ; - } ; + usage_exit () ; filename1 = argv [argc - 2] ; filename2 = argv [argc - 1] ; @@ -158,7 +149,6 @@ main (int argc, char *argv []) if (strcmp (filename1, filename2) == 0) { printf ("Error : Input filenames are the same.\n\n") ; usage_exit () ; - return 1 ; } ; return compare () ; diff --git a/lib-src/libsndfile/programs/sndfile-concat.c b/lib-src/libsndfile/programs/sndfile-concat.c index cc247823b..3a02a94d0 100644 --- a/lib-src/libsndfile/programs/sndfile-concat.c +++ b/lib-src/libsndfile/programs/sndfile-concat.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2014 Erik de Castro Lopo ** ** All rights reserved. ** @@ -39,7 +39,7 @@ #include "common.h" -#define BUFFER_LEN (1<<16) +#define BUFFER_LEN (1 << 16) static void concat_data_fp (SNDFILE *wfile, SNDFILE *rofile, int channels) ; @@ -61,14 +61,14 @@ usage_exit (const char *progname) " number of channels.\n" ) ; - exit (0) ; + exit (1) ; } /* usage_exit */ int main (int argc, char *argv []) { const char *progname, *outfilename ; - SNDFILE *outfile, **infiles ; - SF_INFO sfinfo_out, sfinfo_in ; + SNDFILE *outfile, **infiles ; + SF_INFO sfinfo_out, sfinfo_in ; void (*func) (SNDFILE*, SNDFILE*, int) ; int k ; @@ -127,6 +127,7 @@ main (int argc, char *argv []) } ; sf_close (outfile) ; + free (infiles) ; return 0 ; } /* main */ diff --git a/lib-src/libsndfile/programs/sndfile-convert.c b/lib-src/libsndfile/programs/sndfile-convert.c index 3c563f6be..4e2b8bbbb 100644 --- a/lib-src/libsndfile/programs/sndfile-convert.c +++ b/lib-src/libsndfile/programs/sndfile-convert.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2019 Erik de Castro Lopo ** ** All rights reserved. ** @@ -54,27 +54,42 @@ usage_exit (const char *progname) puts ("\n" " where [option] may be:\n\n" " -override-sample-rate=X : force sample rate of input to X\n" + " -endian=little : force output file to little endian data\n" + " -endian=big : force output file to big endian data\n" + " -endian=cpu : force output file same endian-ness as the CPU\n" + " -normalize : normalize the data in the output file\n" ) ; puts ( " where [encoding] may be one of the following:\n\n" - " -pcms8 : force the output to signed 8 bit pcm\n" - " -pcmu8 : force the output to unsigned 8 bit pcm\n" - " -pcm16 : force the output to 16 bit pcm\n" - " -pcm24 : force the output to 24 bit pcm\n" - " -pcm32 : force the output to 32 bit pcm\n" - " -float32 : force the output to 32 bit floating point" + " -pcms8 : signed 8 bit pcm\n" + " -pcmu8 : unsigned 8 bit pcm\n" + " -pcm16 : 16 bit pcm\n" + " -pcm24 : 24 bit pcm\n" + " -pcm32 : 32 bit pcm\n" + " -float32 : 32 bit floating point\n" + " -float64 : 64 bit floating point\n" + " -ulaw : ULAW\n" + " -alaw : ALAW\n" + " -alac16 : 16 bit ALAC (CAF only)\n" + " -alac20 : 20 bit ALAC (CAF only)\n" + " -alac24 : 24 bit ALAC (CAF only)\n" + " -alac32 : 32 bit ALAC (CAF only)\n" + " -ima-adpcm : IMA ADPCM (WAV only)\n" + " -ms-adpcm : MS ADPCM (WAV only)\n" + " -gsm610 : GSM6.10 (WAV only)\n" + " -dwvw12 : 12 bit DWVW (AIFF only)\n" + " -dwvw16 : 16 bit DWVW (AIFF only)\n" + " -dwvw24 : 24 bit DWVW (AIFF only)\n" + " -vorbis : Vorbis (OGG only)\n" + " -opus : Opus (OGG only)\n" ) ; + puts ( - " -ulaw : force the output ULAW\n" - " -alaw : force the output ALAW\n" - " -ima-adpcm : force the output to IMA ADPCM (WAV only)\n" - " -ms-adpcm : force the output to MS ADPCM (WAV only)\n" - " -gsm610 : force the GSM6.10 (WAV only)\n" - " -dwvw12 : force the output to 12 bit DWVW (AIFF only)\n" - " -dwvw16 : force the output to 16 bit DWVW (AIFF only)\n" - " -dwvw24 : force the output to 24 bit DWVW (AIFF only)\n" - " -vorbis : force the output to Vorbis (OGG only)\n" + " If no encoding is specified, the program will try to use the encoding\n" + " of the input file in the output file. This will not always work as\n" + " most container formats (eg WAV, AIFF etc) only support a small subset\n" + " of codec formats (eg 16 bit PCM, a-law, Vorbis etc).\n" ) ; puts ( @@ -85,23 +100,49 @@ usage_exit (const char *progname) sfe_dump_format_map () ; puts ("") ; - exit (0) ; + exit (1) ; } /* usage_exit */ +static void +report_format_error_exit (const char * argv0, SF_INFO * sfinfo) +{ int old_format = sfinfo->format ; + int endian = sfinfo->format & SF_FORMAT_ENDMASK ; + int channels = sfinfo->channels ; + + sfinfo->format = old_format & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; + + if (endian && sf_format_check (sfinfo)) + { printf ("Error : output file format does not support %s endian-ness.\n", sfe_endian_name (endian)) ; + exit (1) ; + } ; + + sfinfo->channels = 1 ; + if (sf_format_check (sfinfo)) + { printf ("Error : output file format does not support %d channels.\n", channels) ; + exit (1) ; + } ; + + printf ("\n" + "Error : output file format is invalid.\n" + "The '%s' container does not support '%s' codec data.\n" + "Run '%s --help' for clues.\n\n", + sfe_container_name (sfinfo->format), sfe_codec_name (sfinfo->format), program_name (argv0)) ; + exit (1) ; +} /* report_format_error_exit */ + int main (int argc, char * argv []) { const char *progname, *infilename, *outfilename ; - SNDFILE *infile = NULL, *outfile = NULL ; - SF_INFO sfinfo ; + SNDFILE *infile = NULL, *outfile = NULL ; + SF_INFO sfinfo ; int k, outfilemajor, outfileminor = 0, infileminor ; int override_sample_rate = 0 ; /* assume no sample rate override. */ + int endian = SF_ENDIAN_FILE, normalize = SF_FALSE ; progname = program_name (argv [0]) ; if (argc < 3 || argc > 5) - { usage_exit (progname) ; - return 1 ; - } ; + usage_exit (progname) ; infilename = argv [argc-2] ; outfilename = argv [argc-1] ; @@ -109,19 +150,16 @@ main (int argc, char * argv []) if (strcmp (infilename, outfilename) == 0) { printf ("Error : Input and output filenames are the same.\n\n") ; usage_exit (progname) ; - return 1 ; } ; if (strlen (infilename) > 1 && infilename [0] == '-') { printf ("Error : Input filename (%s) looks like an option.\n\n", infilename) ; usage_exit (progname) ; - return 1 ; } ; if (outfilename [0] == '-') { printf ("Error : Output filename (%s) looks like an option.\n\n", outfilename) ; usage_exit (progname) ; - return 1 ; } ; for (k = 1 ; k < argc - 2 ; k++) @@ -149,6 +187,10 @@ main (int argc, char * argv []) { outfileminor = SF_FORMAT_FLOAT ; continue ; } ; + if (! strcmp (argv [k], "-float64")) + { outfileminor = SF_FORMAT_DOUBLE ; + continue ; + } ; if (! strcmp (argv [k], "-ulaw")) { outfileminor = SF_FORMAT_ULAW ; continue ; @@ -157,6 +199,22 @@ main (int argc, char * argv []) { outfileminor = SF_FORMAT_ALAW ; continue ; } ; + if (! strcmp (argv [k], "-alac16")) + { outfileminor = SF_FORMAT_ALAC_16 ; + continue ; + } ; + if (! strcmp (argv [k], "-alac20")) + { outfileminor = SF_FORMAT_ALAC_20 ; + continue ; + } ; + if (! strcmp (argv [k], "-alac24")) + { outfileminor = SF_FORMAT_ALAC_24 ; + continue ; + } ; + if (! strcmp (argv [k], "-alac32")) + { outfileminor = SF_FORMAT_ALAC_32 ; + continue ; + } ; if (! strcmp (argv [k], "-ima-adpcm")) { outfileminor = SF_FORMAT_IMA_ADPCM ; continue ; @@ -185,6 +243,10 @@ main (int argc, char * argv []) { outfileminor = SF_FORMAT_VORBIS ; continue ; } ; + if (! strcmp (argv [k], "-opus")) + { outfileminor = SF_FORMAT_OPUS ; + continue ; + } ; if (strstr (argv [k], "-override-sample-rate=") == argv [k]) { const char *ptr ; @@ -194,6 +256,31 @@ main (int argc, char * argv []) continue ; } ; + if (! strcmp (argv [k], "-endian=little")) + { endian = SF_ENDIAN_LITTLE ; + continue ; + } ; + + if (! strcmp (argv [k], "-endian=big")) + { endian = SF_ENDIAN_BIG ; + continue ; + } ; + + if (! strcmp (argv [k], "-endian=cpu")) + { endian = SF_ENDIAN_CPU ; + continue ; + } ; + + if (! strcmp (argv [k], "-endian=file")) + { endian = SF_ENDIAN_FILE ; + continue ; + } ; + + if (! strcmp (argv [k], "-normalize")) + { normalize = SF_TRUE ; + continue ; + } ; + printf ("Error : Not able to decode argunment '%s'.\n", argv [k]) ; exit (1) ; } ; @@ -227,6 +314,8 @@ main (int argc, char * argv []) else sfinfo.format = outfilemajor | (sfinfo.format & SF_FORMAT_SUBMASK) ; + sfinfo.format |= endian ; + if ((sfinfo.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_XI) switch (sfinfo.format & SF_FORMAT_SUBMASK) { case SF_FORMAT_PCM_16 : @@ -240,8 +329,16 @@ main (int argc, char * argv []) } ; if (sf_format_check (&sfinfo) == 0) - { printf ("Error : output file format is invalid (0x%08X).\n", sfinfo.format) ; - return 1 ; + { sf_close (infile) ; + report_format_error_exit (argv [0], &sfinfo) ; + } ; + + if ((sfinfo.format & SF_FORMAT_SUBMASK) == SF_FORMAT_GSM610 && sfinfo.samplerate != 8000) + { printf ( + "WARNING: GSM 6.10 data format only supports 8kHz sample rate. The converted\n" + "ouput file will contain the input data converted to the GSM 6.10 data format\n" + "but not re-sampled.\n" + ) ; } ; /* Open the output file. */ @@ -253,10 +350,12 @@ main (int argc, char * argv []) /* Copy the metadata */ copy_metadata (outfile, infile, sfinfo.channels) ; - if ((outfileminor == SF_FORMAT_DOUBLE) || (outfileminor == SF_FORMAT_FLOAT) + if (normalize + || (outfileminor == SF_FORMAT_DOUBLE) || (outfileminor == SF_FORMAT_FLOAT) || (infileminor == SF_FORMAT_DOUBLE) || (infileminor == SF_FORMAT_FLOAT) + || (infileminor == SF_FORMAT_OPUS) || (outfileminor == SF_FORMAT_OPUS) || (infileminor == SF_FORMAT_VORBIS) || (outfileminor == SF_FORMAT_VORBIS)) - sfe_copy_data_fp (outfile, infile, sfinfo.channels) ; + sfe_copy_data_fp (outfile, infile, sfinfo.channels, normalize) ; else sfe_copy_data_int (outfile, infile, sfinfo.channels) ; @@ -269,17 +368,19 @@ main (int argc, char * argv []) static void copy_metadata (SNDFILE *outfile, SNDFILE *infile, int channels) { SF_INSTRUMENT inst ; + SF_CUES cues ; SF_BROADCAST_INFO_2K binfo ; const char *str ; - int k, err = 0, chanmap [256] ; + int k, chanmap [256] ; for (k = SF_STR_FIRST ; k <= SF_STR_LAST ; k++) { str = sf_get_string (infile, k) ; if (str != NULL) - err = sf_set_string (outfile, k, str) ; + sf_set_string (outfile, k, str) ; } ; memset (&inst, 0, sizeof (inst)) ; + memset (&cues, 0, sizeof (cues)) ; memset (&binfo, 0, sizeof (binfo)) ; if (channels < ARRAY_LEN (chanmap)) @@ -289,6 +390,9 @@ copy_metadata (SNDFILE *outfile, SNDFILE *infile, int channels) sf_command (outfile, SFC_SET_CHANNEL_MAP_INFO, chanmap, size) ; } ; + if (sf_command (infile, SFC_GET_CUE, &cues, sizeof (cues)) == SF_TRUE) + sf_command (outfile, SFC_SET_CUE, &cues, sizeof (cues)) ; + if (sf_command (infile, SFC_GET_INSTRUMENT, &inst, sizeof (inst)) == SF_TRUE) sf_command (outfile, SFC_SET_INSTRUMENT, &inst, sizeof (inst)) ; diff --git a/lib-src/libsndfile/programs/sndfile-deinterleave.c b/lib-src/libsndfile/programs/sndfile-deinterleave.c index df80b0422..616761e4f 100644 --- a/lib-src/libsndfile/programs/sndfile-deinterleave.c +++ b/lib-src/libsndfile/programs/sndfile-deinterleave.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2009-2011 Erik de Castro Lopo +** Copyright (C) 2009-2017 Erik de Castro Lopo ** ** All rights reserved. ** @@ -89,10 +89,21 @@ main (int argc, char **argv) exit (1) ; } ; + if (sfinfo.channels > MAX_CHANNELS) + { printf ("\nError : Input file '%s' has too many (%d) channels. Limit is %d.\n", + argv [1], sfinfo.channels, MAX_CHANNELS) ; + exit (1) ; + } ; + + state.channels = sfinfo.channels ; sfinfo.channels = 1 ; - snprintf (pathname, sizeof (pathname), "%s", argv [1]) ; + if (snprintf (pathname, sizeof (pathname), "%s", argv [1]) > (int) sizeof (pathname)) + { printf ("\nError : Length of provided filename '%s' exceeds MAX_PATH (%d).\n", argv [1], (int) sizeof (pathname)) ; + exit (1) ; + } ; + if ((cptr = strrchr (pathname, '.')) == NULL) ext [0] = 0 ; else @@ -105,8 +116,13 @@ main (int argc, char **argv) for (ch = 0 ; ch < state.channels ; ch++) { char filename [520] ; + size_t count ; - snprintf (filename, sizeof (filename), "%s_%02d%s", pathname, ch, ext) ; + count = snprintf (filename, sizeof (filename), "%s_%02d%s", pathname, ch, ext) ; + + if (count >= sizeof (filename)) + { printf ("File name truncated to %s\n", filename) ; + } ; if ((state.outfile [ch] = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL) { printf ("Not able to open output file '%s'\n%s\n", filename, sf_strerror (NULL)) ; @@ -154,7 +170,7 @@ usage_exit (void) "a_00.wav, a_01.wav and so on.\n" ) ; printf ("Using %s.\n\n", sf_version_string ()) ; - exit (0) ; + exit (1) ; } /* usage_exit */ static void diff --git a/lib-src/libsndfile/programs/sndfile-info.c b/lib-src/libsndfile/programs/sndfile-info.c index 5663044f0..e0e488210 100644 --- a/lib-src/libsndfile/programs/sndfile-info.c +++ b/lib-src/libsndfile/programs/sndfile-info.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2019 Erik de Castro Lopo ** ** All rights reserved. ** @@ -47,13 +47,13 @@ #include #endif -static void print_version (void) ; static void usage_exit (const char *progname) ; static void info_dump (const char *filename) ; static int instrument_dump (const char *filename) ; static int broadcast_dump (const char *filename) ; static int chanmap_dump (const char *filename) ; +static int cart_dump (const char *filename) ; static void total_dump (void) ; static double total_seconds = 0.0 ; @@ -62,14 +62,10 @@ int main (int argc, char *argv []) { int k ; - print_version () ; - if (argc < 2 || strcmp (argv [1], "--help") == 0 || strcmp (argv [1], "-h") == 0) - { usage_exit (program_name (argv [0])) ; - return 1 ; - } ; + usage_exit (program_name (argv [0])) ; - if (strcmp (argv [1], "-i") == 0) + if (strcmp (argv [1], "--instrument") == 0) { int error = 0 ; for (k = 2 ; k < argc ; k++) @@ -77,7 +73,7 @@ main (int argc, char *argv []) return error ; } ; - if (strcmp (argv [1], "-b") == 0) + if (strcmp (argv [1], "--broadcast") == 0) { int error = 0 ; for (k = 2 ; k < argc ; k++) @@ -85,7 +81,7 @@ main (int argc, char *argv []) return error ; } ; - if (strcmp (argv [1], "-c") == 0) + if (strcmp (argv [1], "--channel-map") == 0) { int error = 0 ; for (k = 2 ; k < argc ; k++) @@ -93,6 +89,14 @@ main (int argc, char *argv []) return error ; } ; + if (strcmp (argv [1], "--cart") == 0) + { int error = 0 ; + + for (k = 2 ; k < argc ; k++) + error += cart_dump (argv [k]) ; + return error ; + } ; + for (k = 1 ; k < argc ; k++) info_dump (argv [k]) ; @@ -108,38 +112,29 @@ main (int argc, char *argv []) static double data [BUFFER_LEN] ; -static void -print_version (void) -{ char buffer [256] ; - - sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer)) ; - printf ("\nVersion : %s\n\n", buffer) ; -} /* print_version */ - - static void usage_exit (const char *progname) { printf ("Usage :\n %s ...\n", progname) ; printf (" Prints out information about one or more sound files.\n\n") ; - printf (" %s -i \n", progname) ; + printf (" %s --instrument \n", progname) ; printf (" Prints out the instrument data for the given file.\n\n") ; - printf (" %s -b \n", progname) ; + printf (" %s --broadcast \n", progname) ; printf (" Prints out the broadcast WAV info for the given file.\n\n") ; + printf (" %s --channel-map \n", progname) ; + printf (" Prints out the channel map for the given file.\n\n") ; + printf (" %s --cart \n", progname) ; + printf (" Prints out the cart chunk WAV info for the given file.\n\n") ; + + printf ("Using %s.\n\n", sf_version_string ()) ; #if (defined (_WIN32) || defined (WIN32)) printf ("This is a Unix style command line application which\n" "should be run in a MSDOS box or Command Shell window.\n\n") ; printf ("Sleeping for 5 seconds before exiting.\n\n") ; fflush (stdout) ; - /* This is the officially blessed by microsoft way but I can't get - ** it to link. - ** Sleep (15) ; - ** Instead, use this: - */ Sleep (5 * 1000) ; #endif - printf ("Using %s.\n\n", sf_version_string ()) ; - exit (0) ; + exit (1) ; } /* usage_exit */ /*============================================================================== @@ -148,15 +143,6 @@ usage_exit (const char *progname) static double data [BUFFER_LEN] ; -static double -get_signal_max (SNDFILE *file) -{ double max ; - - sf_command (file, SFC_CALC_SIGNAL_MAX, &max, sizeof (max)) ; - - return max ; -} /* get_signal_max */ - static double calc_decibels (SF_INFO * sfinfo, double max) { double decibels ; @@ -231,8 +217,8 @@ generate_duration_str (SF_INFO *sfinfo) static void info_dump (const char *filename) { static char strbuffer [BUFFER_LEN] ; - SNDFILE *file ; - SF_INFO sfinfo ; + SNDFILE *file ; + SF_INFO sfinfo ; double signal_max, decibels ; memset (&sfinfo, 0, sizeof (sfinfo)) ; @@ -267,7 +253,7 @@ info_dump (const char *filename) if (sfinfo.frames < 100 * 1024 * 1024) { /* Do not use sf_signal_max because it doesn't work for non-seekable files . */ - signal_max = get_signal_max (file) ; + sf_command (file, SFC_CALC_SIGNAL_MAX, &signal_max, sizeof (signal_max)) ; decibels = calc_decibels (&sfinfo, signal_max) ; printf ("Signal Max : %g (%4.2f dB)\n", signal_max, decibels) ; } ; @@ -296,8 +282,8 @@ str_of_type (int mode) static int instrument_dump (const char *filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; +{ SNDFILE *file ; + SF_INFO sfinfo ; SF_INSTRUMENT inst ; int got_inst, k ; @@ -335,8 +321,8 @@ instrument_dump (const char *filename) static int broadcast_dump (const char *filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; +{ SNDFILE *file ; + SF_INFO sfinfo ; SF_BROADCAST_INFO_2K bext ; double time_ref_sec ; int got_bext ; @@ -371,28 +357,43 @@ broadcast_dump (const char *filename) time_ref_sec = ((pow (2.0, 32) * bext.time_reference_high) + (1.0 * bext.time_reference_low)) / sfinfo.samplerate ; - printf ("Description : %.*s\n", (int) sizeof (bext.description), bext.description) ; - printf ("Originator : %.*s\n", (int) sizeof (bext.originator), bext.originator) ; - printf ("Origination ref : %.*s\n", (int) sizeof (bext.originator_reference), bext.originator_reference) ; - printf ("Origination date : %.*s\n", (int) sizeof (bext.origination_date), bext.origination_date) ; - printf ("Origination time : %.*s\n", (int) sizeof (bext.origination_time), bext.origination_time) ; + printf ("Description : %.*s\n", (int) sizeof (bext.description), bext.description) ; + printf ("Originator : %.*s\n", (int) sizeof (bext.originator), bext.originator) ; + printf ("Origination ref : %.*s\n", (int) sizeof (bext.originator_reference), bext.originator_reference) ; + printf ("Origination date : %.*s\n", (int) sizeof (bext.origination_date), bext.origination_date) ; + printf ("Origination time : %.*s\n", (int) sizeof (bext.origination_time), bext.origination_time) ; if (bext.time_reference_high == 0 && bext.time_reference_low == 0) - printf ("Time ref : 0\n") ; + printf ("Time ref : 0\n") ; else - printf ("Time ref : 0x%x%08x (%.6f seconds)\n", bext.time_reference_high, bext.time_reference_low, time_ref_sec) ; + printf ("Time ref : 0x%x%08x (%.6f seconds)\n", bext.time_reference_high, bext.time_reference_low, time_ref_sec) ; - printf ("BWF version : %d\n", bext.version) ; - printf ("UMID : %.*s\n", (int) sizeof (bext.umid), bext.umid) ; - printf ("Coding history : %.*s\n", bext.coding_history_size, bext.coding_history) ; + printf ("BWF version : %d\n", bext.version) ; + + if (bext.version >= 1) + printf ("UMID : %.*s\n", (int) sizeof (bext.umid), bext.umid) ; + + if (bext.version >= 2) + { /* 0x7fff shall be used to designate an unused value */ + /* valid range: -99.99 .. 99.99 */ + printf ("Loudness value : %6.2f LUFS\n", bext.loudness_value / 100.0) ; + /* valid range: 0.00 .. 99.99 */ + printf ("Loudness range : %6.2f LU\n", bext.loudness_range / 100.0) ; + /* valid range: -99.99 .. 99.99 */ + printf ("Max. true peak level : %6.2f dBTP\n", bext.max_true_peak_level / 100.0) ; + printf ("Max. momentary loudness : %6.2f LUFS\n", bext.max_momentary_loudness / 100.0) ; + printf ("Max. short term loudness : %6.2f LUFS\n", bext.max_shortterm_loudness / 100.0) ; + } ; + + printf ("Coding history : %.*s\n", bext.coding_history_size, bext.coding_history) ; return 0 ; } /* broadcast_dump */ static int chanmap_dump (const char *filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; +{ SNDFILE *file ; + SF_INFO sfinfo ; int * channel_map ; int got_chanmap, k ; @@ -465,6 +466,60 @@ chanmap_dump (const char *filename) return 0 ; } /* chanmap_dump */ +static int +cart_dump (const char *filename) +{ SNDFILE *file ; + SF_INFO sfinfo ; + SF_CART_INFO_VAR (1024) cart ; + int got_cart, k ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + memset (&cart, 0, sizeof (cart)) ; + + if ((file = sf_open (filename, SFM_READ, &sfinfo)) == NULL) + { printf ("Error : Not able to open input file %s.\n", filename) ; + fflush (stdout) ; + memset (data, 0, sizeof (data)) ; + puts (sf_strerror (NULL)) ; + return 1 ; + } ; + + got_cart = sf_command (file, SFC_GET_CART_INFO, &cart, sizeof (cart)) ; + sf_close (file) ; + + if (got_cart == SF_FALSE) + { printf ("Error : File '%s' does not contain cart information.\n\n", filename) ; + return 1 ; + } ; + + printf ("Version : %.*s\n", (int) sizeof (cart.version), cart.version) ; + printf ("Title : %.*s\n", (int) sizeof (cart.title), cart.title) ; + printf ("Artist : %.*s\n", (int) sizeof (cart.artist), cart.artist) ; + printf ("Cut id : %.*s\n", (int) sizeof (cart.cut_id), cart.cut_id) ; + printf ("Category : %.*s\n", (int) sizeof (cart.category), cart.category) ; + printf ("Classification : %.*s\n", (int) sizeof (cart.classification), cart.classification) ; + printf ("Out cue : %.*s\n", (int) sizeof (cart.out_cue), cart.out_cue) ; + printf ("Start date : %.*s\n", (int) sizeof (cart.start_date), cart.start_date) ; + printf ("Start time : %.*s\n", (int) sizeof (cart.start_time), cart.start_time) ; + printf ("End date : %.*s\n", (int) sizeof (cart.end_date), cart.end_date) ; + printf ("End time : %.*s\n", (int) sizeof (cart.end_time), cart.end_time) ; + printf ("App id : %.*s\n", (int) sizeof (cart.producer_app_id), cart.producer_app_id) ; + printf ("App version : %.*s\n", (int) sizeof (cart.producer_app_version), cart.producer_app_version) ; + printf ("User defined : %.*s\n", (int) sizeof (cart.user_def), cart.user_def) ; + printf ("Level ref. : %d\n", cart.level_reference) ; + printf ("Post timers :\n") ; + + for (k = 0 ; k < ARRAY_LEN (cart.post_timers) ; k++) + if (cart.post_timers [k].usage [0]) + printf (" %d %.*s %d\n", k, (int) sizeof (cart.post_timers [k].usage), cart.post_timers [k].usage, cart.post_timers [k].value) ; + + printf ("Reserved : %.*s\n", (int) sizeof (cart.reserved), cart.reserved) ; + printf ("Url : %.*s\n", (int) sizeof (cart.url), cart.url) ; + printf ("Tag text : %.*s\n", cart.tag_text_size, cart.tag_text) ; + + return 0 ; +} /* cart_dump */ + static void total_dump (void) { printf ("========================================\n") ; diff --git a/lib-src/libsndfile/programs/sndfile-interleave.c b/lib-src/libsndfile/programs/sndfile-interleave.c index 0e2cee0ea..4c0444316 100644 --- a/lib-src/libsndfile/programs/sndfile-interleave.c +++ b/lib-src/libsndfile/programs/sndfile-interleave.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2009-2011 Erik de Castro Lopo +** Copyright (C) 2009-2015 Erik de Castro Lopo ** ** All rights reserved. ** @@ -82,7 +82,7 @@ main (int argc, char **argv) usage_exit () ; } ; - if (argc - 2 > MAX_INPUTS) + if (argc - 3 > MAX_INPUTS) { printf ("\nError : Cannot handle more than %d input channels.\n\n", MAX_INPUTS) ; exit (1) ; } ; @@ -146,7 +146,7 @@ usage_exit (void) { puts ("\nUsage : sndfile-interleave ... -o \n") ; puts ("Merge two or more mono files into a single multi-channel file.\n") ; printf ("Using %s.\n\n", sf_version_string ()) ; - exit (0) ; + exit (1) ; } /* usage_exit */ @@ -163,7 +163,7 @@ interleave_int (STATE * state) if (read_len < BUFFER_LEN) memset (state->din.i + read_len, 0, sizeof (state->din.i [0]) * (BUFFER_LEN - read_len)) ; - for (k = 0 ; k < read_len ; k++) + for (k = 0 ; k < BUFFER_LEN ; k++) state->dout.i [k * state->channels + ch] = state->din.i [k] ; max_read_len = MAX (max_read_len, read_len) ; @@ -189,7 +189,7 @@ interleave_double (STATE * state) if (read_len < BUFFER_LEN) memset (state->din.d + read_len, 0, sizeof (state->din.d [0]) * (BUFFER_LEN - read_len)) ; - for (k = 0 ; k < read_len ; k++) + for (k = 0 ; k < BUFFER_LEN ; k++) state->dout.d [k * state->channels + ch] = state->din.d [k] ; max_read_len = MAX (max_read_len, read_len) ; diff --git a/lib-src/libsndfile/programs/sndfile-metadata-get.c b/lib-src/libsndfile/programs/sndfile-metadata-get.c index b77ef4f4b..9a0963803 100644 --- a/lib-src/libsndfile/programs/sndfile-metadata-get.c +++ b/lib-src/libsndfile/programs/sndfile-metadata-get.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2014 Erik de Castro Lopo ** Copyright (C) 2008-2010 George Blood Audio ** ** All rights reserved. @@ -61,7 +61,7 @@ main (int argc, char *argv []) progname = program_name (argv [0]) ; /* Check if we've been asked for help. */ - if (argc <= 2 || strcmp (argv [1], "--help") == 0 || strcmp (argv [1], "-h") == 0) + if (argc < 2 || strcmp (argv [1], "--help") == 0 || strcmp (argv [1], "-h") == 0) usage_exit (progname, 0) ; if (argv [argc - 1][0] != '-') @@ -77,7 +77,6 @@ main (int argc, char *argv []) exit (1) ; } ; - /* Get the time in case we need it later. */ memset (&sfinfo, 0, sizeof (sfinfo)) ; if ((file = sf_open (filename, SFM_READ, &sfinfo)) == NULL) { printf ("Error : Open of file '%s' failed : %s\n\n", filename, sf_strerror (file)) ; @@ -103,23 +102,28 @@ usage_exit (const char *progname, int exit_code) { printf ("\nUsage :\n %s [options] \n\nOptions:\n", progname) ; puts ( - " --bext-description Print the 'bext' description.\n" - " --bext-originator Print the 'bext; originator info.\n" - " --bext-orig-ref Print the 'bext' origination reference.\n" - " --bext-umid Print the 'bext' UMID.\n" - " --bext-orig-date Print the 'bext' origination date.\n" - " --bext-orig-time Print the 'bext' origination time.\n" - " --bext-coding-hist Print the 'bext' coding history.\n" + " --bext-description Print the 'bext' description.\n" + " --bext-originator Print the 'bext' originator info.\n" + " --bext-orig-ref Print the 'bext' origination reference.\n" + " --bext-umid Print the 'bext' UMID.\n" + " --bext-orig-date Print the 'bext' origination date.\n" + " --bext-orig-time Print the 'bext' origination time.\n" + " --bext-loudness-value Print the 'bext' loudness value.\n" + " --bext-loudness-range Print the 'bext' loudness range.\n" + " --bext-max-truepeak Print the 'bext' max. true peak level\n" + " --bext-max-momentary Print the 'bext' max. momentary loudness\n" + " --bext-max-shortterm Print the 'bext' max. short term loudness\n" + " --bext-coding-hist Print the 'bext' coding history.\n" ) ; puts ( - " --str-title Print the title metadata.\n" - " --str-copyright Print the copyright metadata.\n" - " --str-artist Print the artist metadata.\n" - " --str-comment Print the comment metadata.\n" - " --str-date Print the creation date metadata.\n" - " --str-album Print the album metadata.\n" - " --str-license Print the license metadata.\n" + " --str-title Print the title metadata.\n" + " --str-copyright Print the copyright metadata.\n" + " --str-artist Print the artist metadata.\n" + " --str-comment Print the comment metadata.\n" + " --str-date Print the creation date metadata.\n" + " --str-album Print the album metadata.\n" + " --str-license Print the license metadata.\n" ) ; printf ("Using %s.\n\n", sf_version_string ()) ; @@ -131,20 +135,32 @@ process_args (SNDFILE * file, const SF_BROADCAST_INFO_2K * binfo, int argc, char { const char * str ; int k, do_all = 0 ; -#define HANDLE_BEXT_ARG(cmd,name,field) \ +#define HANDLE_BEXT_ARG(cmd, name, field) \ if (do_all || strcmp (argv [k], cmd) == 0) \ - { printf ("%-20s : %.*s\n", name, (int) sizeof (binfo->field), binfo->field) ; \ + { printf ("%-22s : %.*s\n", name, (int) sizeof (binfo->field), binfo->field) ; \ if (! do_all) \ continue ; \ } ; -#define HANDLE_STR_ARG(cmd,name,id) \ +#define HANDLE_BEXT_ARG_INT(cmd, name, field) \ + if (do_all || strcmp (argv [k], cmd) == 0) \ + { printf ("%-22s : %6.2f\n", name, binfo->field / 100.0) ; \ + if (! do_all) \ + continue ; \ + } ; + +#define HANDLE_STR_ARG(cmd, name, id) \ if (do_all || strcmp (argv [k], cmd) == 0) \ { str = sf_get_string (file, id) ; \ - printf ("%-20s : %s\n", name, str ? str : "") ; \ + printf ("%-22s : %s\n", name, str ? str : "") ; \ if (! do_all) continue ; \ } ; + if (argc == 0) + { do_all = 1 ; + argc = 1 ; + } ; + for (k = 0 ; k < argc ; k++) { if (do_all || strcmp (argv [k], "--all") == 0) do_all = 1 ; @@ -155,6 +171,11 @@ process_args (SNDFILE * file, const SF_BROADCAST_INFO_2K * binfo, int argc, char HANDLE_BEXT_ARG ("--bext-umid", "UMID", umid) ; HANDLE_BEXT_ARG ("--bext-orig-date", "Origination date", origination_date) ; HANDLE_BEXT_ARG ("--bext-orig-time", "Origination time", origination_time) ; + HANDLE_BEXT_ARG_INT ("--bext-loudness-value", "Loudness value", loudness_value) ; + HANDLE_BEXT_ARG_INT ("--bext-loudness-range", "Loudness range", loudness_range) ; + HANDLE_BEXT_ARG_INT ("--bext-max-truepeak", "Max. true peak level", max_true_peak_level) ; + HANDLE_BEXT_ARG_INT ("--bext-max-momentary", "Max. momentary level", max_momentary_loudness) ; + HANDLE_BEXT_ARG_INT ("--bext-max-shortterm", "Max. short term level", max_shortterm_loudness) ; HANDLE_BEXT_ARG ("--bext-coding-hist", "Coding history", coding_history) ; HANDLE_STR_ARG ("--str-title", "Name", SF_STR_TITLE) ; diff --git a/lib-src/libsndfile/programs/sndfile-metadata-set.c b/lib-src/libsndfile/programs/sndfile-metadata-set.c index cf0babfc2..b1ed64056 100644 --- a/lib-src/libsndfile/programs/sndfile-metadata-set.c +++ b/lib-src/libsndfile/programs/sndfile-metadata-set.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo ** Copyright (C) 2008-2010 George Blood Audio ** ** All rights reserved. @@ -57,6 +57,7 @@ main (int argc, char *argv []) struct tm timedata ; const char *progname ; const char * filenames [2] = { NULL, NULL } ; + char date [128], time [128] ; int k ; /* Store the program name. */ @@ -66,16 +67,14 @@ main (int argc, char *argv []) if (argc < 3 || strcmp (argv [1], "--help") == 0 || strcmp (argv [1], "-h") == 0) usage_exit (progname, 0) ; - /* Clear set all fields of the struct to zero bytes. */ + /* Set all fields of the struct to zero bytes. */ memset (&info, 0, sizeof (info)) ; /* Get the time in case we need it later. */ read_localtime (&timedata) ; for (k = 1 ; k < argc ; k++) - { char tmp [20] ; - - if (argv [k][0] != '-') + { if (argv [k][0] != '-') { if (filenames [0] == NULL) filenames [0] = argv [k] ; else if (filenames [1] == NULL) @@ -87,7 +86,7 @@ main (int argc, char *argv []) continue ; } ; -#define HANDLE_BEXT_ARG(cmd,field) \ +#define HANDLE_BEXT_ARG(cmd, field) \ if (strcmp (argv [k], cmd) == 0) \ { k ++ ; \ if (k == argc) missing_param (argv [k - 1]) ; \ @@ -101,10 +100,15 @@ main (int argc, char *argv []) HANDLE_BEXT_ARG ("--bext-umid", umid) ; HANDLE_BEXT_ARG ("--bext-orig-date", origination_date) ; HANDLE_BEXT_ARG ("--bext-orig-time", origination_time) ; + HANDLE_BEXT_ARG ("--bext-loudness-value", loudness_value) ; + HANDLE_BEXT_ARG ("--bext-loudness-range", loudness_range) ; + HANDLE_BEXT_ARG ("--bext-max-truepeak", max_true_peak_level) ; + HANDLE_BEXT_ARG ("--bext-max-momentary", max_momentary_loudness) ; + HANDLE_BEXT_ARG ("--bext-max-shortterm", max_shortterm_loudness) ; HANDLE_BEXT_ARG ("--bext-coding-hist", coding_history) ; HANDLE_BEXT_ARG ("--bext-time-ref", time_ref) ; -#define HANDLE_STR_ARG(cmd,field) \ +#define HANDLE_STR_ARG(cmd, field) \ if (strcmp (argv [k], cmd) == 0) \ { k ++ ; \ if (k == argc) missing_param (argv [k - 1]) ; \ @@ -122,30 +126,30 @@ main (int argc, char *argv []) /* Following options do not take an argument. */ if (strcmp (argv [k], "--bext-auto-time-date") == 0) - { snprintf (tmp, sizeof (tmp), "%02d:%02d:%02d", timedata.tm_hour, timedata.tm_min, timedata.tm_sec) ; - info.origination_time = strdup (tmp) ; + { snprintf (time, sizeof (time), "%02d:%02d:%02d", timedata.tm_hour, timedata.tm_min, timedata.tm_sec) ; + info.origination_time = time ; - snprintf (tmp, sizeof (tmp), "%04d-%02d-%02d", timedata.tm_year + 1900, timedata.tm_mon + 1, timedata.tm_mday) ; - info.origination_date = strdup (tmp) ; + snprintf (date, sizeof (date), "%04d-%02d-%02d", timedata.tm_year + 1900, timedata.tm_mon + 1, timedata.tm_mday) ; + info.origination_date = date ; continue ; } ; if (strcmp (argv [k], "--bext-auto-time") == 0) - { snprintf (tmp, sizeof (tmp), "%02d:%02d:%02d", timedata.tm_hour, timedata.tm_min, timedata.tm_sec) ; - info.origination_time = strdup (tmp) ; + { snprintf (time, sizeof (time), "%02d:%02d:%02d", timedata.tm_hour, timedata.tm_min, timedata.tm_sec) ; + info.origination_time = time ; continue ; } ; if (strcmp (argv [k], "--bext-auto-date") == 0) - { snprintf (tmp, sizeof (tmp), "%04d-%02d-%02d", timedata.tm_year + 1900, timedata.tm_mon + 1, timedata.tm_mday) ; - info.origination_date = strdup (tmp) ; + { snprintf (date, sizeof (date), "%04d-%02d-%02d", timedata.tm_year + 1900, timedata.tm_mon + 1, timedata.tm_mday) ; + info.origination_date = strdup (date) ; continue ; } ; if (strcmp (argv [k], "--str-auto-date") == 0) - { snprintf (tmp, sizeof (tmp), "%04d-%02d-%02d", timedata.tm_year + 1900, timedata.tm_mon + 1, timedata.tm_mday) ; + { snprintf (date, sizeof (date), "%04d-%02d-%02d", timedata.tm_year + 1900, timedata.tm_mon + 1, timedata.tm_mday) ; - info.date = strdup (tmp) ; + info.date = strdup (date) ; continue ; } ; @@ -207,8 +211,13 @@ usage_exit (const char *progname, int exit_code) " --bext-umid Set the 'bext' UMID.\n" " --bext-orig-date Set the 'bext' origination date.\n" " --bext-orig-time Set the 'bext' origination time.\n" + " --bext-loudness-value Set the 'bext' loudness value.\n" + " --bext-loudness-range Set the 'bext' loudness range.\n" + " --bext-max-truepeak Set the 'bext' max. true peak level\n" + " --bext-max-momentary Set the 'bext' max. momentary loudness\n" + " --bext-max-shortterm Set the 'bext' max. short term loudness\n" " --bext-coding-hist Set the 'bext' coding history.\n" - " --bext-time-raf Set the 'bext' Time ref.\n" + " --bext-time-ref Set the 'bext' Time ref.\n" "\n" " --str-comment Set the metadata comment.\n" " --str-title Set the metadata title.\n" @@ -257,6 +266,9 @@ has_bext_fields_set (const METADATA_INFO * info) if (info->origination_date || info->origination_time || info->umid || info->coding_history || info->time_ref) return 1 ; + if (info->loudness_value || info->loudness_range || info->max_true_peak_level || info->max_momentary_loudness || info->max_shortterm_loudness) + return 1 ; + return 0 ; } /* has_bext_fields_set */ @@ -281,4 +293,3 @@ read_localtime (struct tm * timedata) return ; } /* read_localtime */ - diff --git a/lib-src/libsndfile/programs/sndfile-play-beos.cpp b/lib-src/libsndfile/programs/sndfile-play-beos.cpp deleted file mode 100644 index fb3fde4cd..000000000 --- a/lib-src/libsndfile/programs/sndfile-play-beos.cpp +++ /dev/null @@ -1,144 +0,0 @@ -/* -** Copyright (C) 2001 Marcus Overhagen -** -** 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-1307, USA. -*/ - -#include - -#include -#include -#include - -#include - -#define BUFFER_LEN 1024 - -/*------------------------------------------------------------------------------ -** BeOS functions for playing a sound. -*/ - -#if defined (__BEOS__) - -struct shared_data -{ - BSoundPlayer *player; - SNDFILE *sndfile; - SF_INFO sfinfo; - sem_id finished; -}; - -static void -buffer_callback(void *theCookie, void *buf, size_t size, const media_raw_audio_format &format) -{ - shared_data *data = (shared_data *)theCookie; - short *buffer = (short *)buf; - int count = size / sizeof(short); - int m, readcount; - - if (!data->player->HasData()) - return; - - readcount = sf_read_short(data->sndfile, buffer, count); - if (readcount == 0) - { data->player->SetHasData(false); - release_sem(data->finished); - } - if (readcount < count) - { for (m = readcount ; m < count ; m++) - buffer [m] = 0 ; - } - if (data->sfinfo.pcmbitwidth < 16) - { for (m = 0 ; m < count ; m++) - buffer [m] *= 256 ; - } -} - -static void -beos_play (int argc, char *argv []) -{ - shared_data data; - status_t status; - int k; - - /* BSoundPlayer requires a BApplication object */ - BApplication app("application/x-vnd.MarcusOverhagen-sfplay"); - - for (k = 1 ; k < argc ; k++) - { printf ("Playing %s\n", argv [k]) ; - if (! (data.sndfile = sf_open_read (argv [k], &data.sfinfo))) - { sf_perror (NULL) ; - continue ; - } ; - - if (data.sfinfo.channels < 1 || data.sfinfo.channels > 2) - { printf ("Error : channels = %d.\n", data.sfinfo.channels) ; - sf_close (data.sndfile) ; - continue ; - } ; - - data.finished = create_sem(0,"finished"); - - media_raw_audio_format format = - { data.sfinfo.samplerate, - data.sfinfo.channels, - media_raw_audio_format::B_AUDIO_SHORT, - B_HOST_IS_LENDIAN ? B_MEDIA_LITTLE_ENDIAN : B_MEDIA_BIG_ENDIAN, - BUFFER_LEN * sizeof(short) - }; - - BSoundPlayer player(&format,"player",buffer_callback,NULL,&data); - data.player = &player; - - if ((status = player.InitCheck()) != B_OK) - { - printf ("Error : BSoundPlayer init failed, %s.\n", strerror(status)) ; - delete_sem(data.finished); - sf_close (data.sndfile) ; - continue ; - } - - player.SetVolume(1.0); - player.Start(); - player.SetHasData(true); - acquire_sem(data.finished); - player.Stop(); - delete_sem(data.finished); - - sf_close (data.sndfile) ; - - } ; - -} /* beos_play */ - -#endif - -/*============================================================================== -** Main function. -*/ - -int -main (int argc, char *argv []) -{ - if (argc < 2) - { printf ("Usage : %s \n\n", argv [0]) ; - return 1 ; - } ; - - beos_play (argc, argv) ; - - return 0 ; -} /* main */ - diff --git a/lib-src/libsndfile/programs/sndfile-play.c b/lib-src/libsndfile/programs/sndfile-play.c index 9f86e6486..40d37349a 100644 --- a/lib-src/libsndfile/programs/sndfile-play.c +++ b/lib-src/libsndfile/programs/sndfile-play.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2018 Erik de Castro Lopo ** ** All rights reserved. ** @@ -39,6 +39,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -52,16 +54,14 @@ #include #endif -#if defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__FreeBSD__) +#if defined (__ANDROID__) + +#elif defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__FreeBSD__) #include #include #include -#elif (defined (__MACH__) && defined (__APPLE__)) - #include - #include - -#elif defined (HAVE_SNDIO_H) +#elif HAVE_SNDIO_H #include #elif (defined (sun) && defined (unix)) @@ -119,10 +119,10 @@ alsa_play (int argc, char *argv []) int m ; sf_command (sndfile, SFC_CALC_SIGNAL_MAX, &scale, sizeof (scale)) ; - if (scale < 1e-10) - scale = 1.0 ; + if (scale > 1.0) + scale = 1.0 / scale ; else - scale = 32700.0 / scale ; + scale = 1.0 ; while ((readcount = sf_read_float (sndfile, buffer, BUFFER_LEN))) { for (m = 0 ; m < readcount ; m++) @@ -353,11 +353,11 @@ alsa_write_float (snd_pcm_t *alsa_dev, float *data, int frames, int channels) ** Linux/OSS functions for playing a sound. */ -#if defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__FreeBSD__) +#if !defined (__ANDROID__) && (defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__FreeBSD__)) static int opensoundsys_open_device (int channels, int srate) ; -static void +static int opensoundsys_play (int argc, char *argv []) { static short buffer [BUFFER_LEN] ; SNDFILE *sndfile ; @@ -415,7 +415,7 @@ opensoundsys_play (int argc, char *argv []) sf_close (sndfile) ; } ; - return ; + return writecount ; } /* opensoundsys_play */ static int @@ -444,7 +444,7 @@ opensoundsys_open_device (int channels, int srate) if (ioctl (fd, SNDCTL_DSP_SETFMT, &fmt) != 0) { perror ("opensoundsys_open_device : set format ") ; exit (1) ; - } ; + } ; if (ioctl (fd, SNDCTL_DSP_CHANNELS, &channels) != 0) { perror ("opensoundsys_open_device : channels ") ; @@ -470,182 +470,19 @@ opensoundsys_open_device (int channels, int srate) ** Mac OS X functions for playing a sound. */ -#if (defined (__MACH__) && defined (__APPLE__)) /* MacOSX */ - -typedef struct -{ AudioStreamBasicDescription format ; - - UInt32 buf_size ; - AudioDeviceID device ; - - SNDFILE *sndfile ; - SF_INFO sfinfo ; - - int fake_stereo ; - int done_playing ; -} MacOSXAudioData ; - -#include - -static OSStatus -macosx_audio_out_callback (AudioDeviceID device, const AudioTimeStamp* current_time, - const AudioBufferList* data_in, const AudioTimeStamp* time_in, - AudioBufferList* data_out, const AudioTimeStamp* time_out, - void* client_data) -{ MacOSXAudioData *audio_data ; - int size, sample_count, read_count, k ; - float *buffer ; - - /* Prevent compiler warnings. */ - device = device ; - current_time = current_time ; - data_in = data_in ; - time_in = time_in ; - time_out = time_out ; - - audio_data = (MacOSXAudioData*) client_data ; - - size = data_out->mBuffers [0].mDataByteSize ; - sample_count = size / sizeof (float) ; - - buffer = (float*) data_out->mBuffers [0].mData ; - - if (audio_data->fake_stereo != 0) - { read_count = sf_read_float (audio_data->sndfile, buffer, sample_count / 2) ; - - for (k = read_count - 1 ; k >= 0 ; k--) - { buffer [2 * k ] = buffer [k] ; - buffer [2 * k + 1] = buffer [k] ; - } ; - read_count *= 2 ; - } - else - read_count = sf_read_float (audio_data->sndfile, buffer, sample_count) ; - - /* Fill the remainder with zeroes. */ - if (read_count < sample_count) - { if (audio_data->fake_stereo == 0) - memset (&(buffer [read_count]), 0, (sample_count - read_count) * sizeof (float)) ; - /* Tell the main application to terminate. */ - audio_data->done_playing = SF_TRUE ; - } ; - - return noErr ; -} /* macosx_audio_out_callback */ - -static void -macosx_play (int argc, char *argv []) -{ MacOSXAudioData audio_data ; - OSStatus err ; - UInt32 count, buffer_size ; - int k ; - - audio_data.fake_stereo = 0 ; - audio_data.device = kAudioDeviceUnknown ; - - /* get the default output device for the HAL */ - count = sizeof (AudioDeviceID) ; - if ((err = AudioHardwareGetProperty (kAudioHardwarePropertyDefaultOutputDevice, - &count, (void *) &(audio_data.device))) != noErr) - { printf ("AudioHardwareGetProperty (kAudioDevicePropertyDefaultOutputDevice) failed.\n") ; - return ; - } ; - - /* get the buffersize that the default device uses for IO */ - count = sizeof (UInt32) ; - if ((err = AudioDeviceGetProperty (audio_data.device, 0, false, kAudioDevicePropertyBufferSize, - &count, &buffer_size)) != noErr) - { printf ("AudioDeviceGetProperty (kAudioDevicePropertyBufferSize) failed.\n") ; - return ; - } ; - - /* get a description of the data format used by the default device */ - count = sizeof (AudioStreamBasicDescription) ; - if ((err = AudioDeviceGetProperty (audio_data.device, 0, false, kAudioDevicePropertyStreamFormat, - &count, &(audio_data.format))) != noErr) - { printf ("AudioDeviceGetProperty (kAudioDevicePropertyStreamFormat) failed.\n") ; - return ; - } ; - - /* Base setup completed. Now play files. */ - for (k = 1 ; k < argc ; k++) - { printf ("Playing %s\n", argv [k]) ; - if (! (audio_data.sndfile = sf_open (argv [k], SFM_READ, &(audio_data.sfinfo)))) - { puts (sf_strerror (NULL)) ; - continue ; - } ; - - if (audio_data.sfinfo.channels < 1 || audio_data.sfinfo.channels > 2) - { printf ("Error : channels = %d.\n", audio_data.sfinfo.channels) ; - continue ; - } ; - - audio_data.format.mSampleRate = audio_data.sfinfo.samplerate ; - - if (audio_data.sfinfo.channels == 1) - { audio_data.format.mChannelsPerFrame = 2 ; - audio_data.fake_stereo = 1 ; - } - else - audio_data.format.mChannelsPerFrame = audio_data.sfinfo.channels ; - - if ((err = AudioDeviceSetProperty (audio_data.device, NULL, 0, false, kAudioDevicePropertyStreamFormat, - sizeof (AudioStreamBasicDescription), &(audio_data.format))) != noErr) - { printf ("AudioDeviceSetProperty (kAudioDevicePropertyStreamFormat) failed.\n") ; - return ; - } ; - - /* we want linear pcm */ - if (audio_data.format.mFormatID != kAudioFormatLinearPCM) - return ; - - /* Fire off the device. */ - if ((err = AudioDeviceAddIOProc (audio_data.device, macosx_audio_out_callback, - (void *) &audio_data)) != noErr) - { printf ("AudioDeviceAddIOProc failed.\n") ; - return ; - } ; - - err = AudioDeviceStart (audio_data.device, macosx_audio_out_callback) ; - if (err != noErr) - return ; - - audio_data.done_playing = SF_FALSE ; - - while (audio_data.done_playing == SF_FALSE) - usleep (10 * 1000) ; /* 10 000 milliseconds. */ - - if ((err = AudioDeviceStop (audio_data.device, macosx_audio_out_callback)) != noErr) - { printf ("AudioDeviceStop failed.\n") ; - return ; - } ; - - err = AudioDeviceRemoveIOProc (audio_data.device, macosx_audio_out_callback) ; - if (err != noErr) - { printf ("AudioDeviceRemoveIOProc failed.\n") ; - return ; - } ; - - sf_close (audio_data.sndfile) ; - } ; - - return ; -} /* macosx_play */ - -#endif /* MacOSX */ - +/* MacOSX 10.8 use a new Audio API. Someone needs to write some code for it. */ /*------------------------------------------------------------------------------ ** Win32 functions for playing a sound. ** ** This API sucks. Its needlessly complicated and is *WAY* too loose with -** passing pointers arounf in integers and and using char* pointers to +** passing pointers around in integers and using char* pointers to ** point to data instead of short*. It plain sucks! */ #if (OS_IS_WIN32 == 1) -#define WIN32_BUFFER_LEN (1<<15) +#define WIN32_BUFFER_LEN (1 << 15) typedef struct { HWAVEOUT hwave ; @@ -701,8 +538,9 @@ win32_audio_out_callback (HWAVEOUT hwave, UINT msg, DWORD_PTR data, DWORD param1 { Win32_Audio_Data *audio_data ; /* Prevent compiler warnings. */ - hwave = hwave ; - param1 = param2 ; + (void) hwave ; + (void) param1 ; + (void) param2 ; if (data == 0) return ; @@ -825,16 +663,16 @@ win32_play (int argc, char *argv []) #endif /* Win32 */ /*------------------------------------------------------------------------------ -** OpenBDS's sndio. +** OpenBSD's sndio. */ -#if defined (HAVE_SNDIO_H) +#if HAVE_SNDIO_H static void sndio_play (int argc, char *argv []) { struct sio_hdl *hdl ; struct sio_par par ; - short buffer [BUFFER_LEN] ; + short buffer [BUFFER_LEN] ; SNDFILE *sndfile ; SF_INFO sfinfo ; int k, readcount ; @@ -980,7 +818,7 @@ main (int argc, char *argv []) if (argc < 2) { printf ("\nUsage : %s \n\n", program_name (argv [0])) ; - printf (" Using %s.\n\n", sf_version_string ()) ; + printf ("Using %s.\n\n", sf_version_string ()) ; #if (OS_IS_WIN32 == 1) printf ("This is a Unix style command line application which\n" "should be run in a MSDOS box or Command Shell window.\n\n") ; @@ -991,7 +829,11 @@ main (int argc, char *argv []) return 1 ; } ; -#if defined (__linux__) +#if defined (__ANDROID__) + puts ("*** Playing sound not yet supported on Android.") ; + puts ("*** Please feel free to submit a patch.") ; + return 1 ; +#elif defined (__linux__) #if HAVE_ALSA_ASOUNDLIB_H if (access ("/proc/asound/cards", R_OK) == 0) alsa_play (argc, argv) ; @@ -1000,20 +842,14 @@ main (int argc, char *argv []) opensoundsys_play (argc, argv) ; #elif defined (__FreeBSD_kernel__) || defined (__FreeBSD__) opensoundsys_play (argc, argv) ; -#elif (defined (__MACH__) && defined (__APPLE__)) - macosx_play (argc, argv) ; -#elif defined HAVE_SNDIO_H +#elif HAVE_SNDIO_H sndio_play (argc, argv) ; #elif (defined (sun) && defined (unix)) solaris_play (argc, argv) ; #elif (OS_IS_WIN32 == 1) win32_play (argc, argv) ; -#elif defined (__BEOS__) - printf ("This program cannot be compiled on BeOS.\n") ; - printf ("Instead, compile the file sfplay_beos.cpp.\n") ; - return 1 ; #else - puts ("*** Playing sound not yet supported on this platform.") ; + puts ("*** Playing sound not supported on this platform.") ; puts ("*** Please feel free to submit a patch.") ; return 1 ; #endif diff --git a/lib-src/libsndfile/programs/sndfile-salvage.c b/lib-src/libsndfile/programs/sndfile-salvage.c index a39a57a56..9c21d5237 100644 --- a/lib-src/libsndfile/programs/sndfile-salvage.c +++ b/lib-src/libsndfile/programs/sndfile-salvage.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2010-2011 Erik de Castro Lopo +** Copyright (C) 2010-2014 Erik de Castro Lopo ** ** All rights reserved. ** @@ -30,6 +30,8 @@ ** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "sfconfig.h" + #include #include #include @@ -37,7 +39,11 @@ #include #include #include +#if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" +#endif #include #include #include @@ -79,7 +85,7 @@ usage_exit (const char *progname) { printf ("Usage :\n\n %s \n\n", progname) ; puts ("Salvages the audio data from WAV files which are more than 4G in length.\n") ; printf ("Using %s.\n\n", sf_version_string ()) ; - exit (0) ; + exit (1) ; } /* usage_exit */ static void @@ -157,7 +163,7 @@ salvage_file (const char * broken_wav, const char * fixed_w64) read_size *= sfinfo.channels ; if ((sndfile = sf_open (fixed_w64, SFM_WRITE, &sfinfo)) == NULL) - { printf ("sf_open ('%s') failed : %s\n", broken_wav, sf_strerror (NULL)) ; + { printf ("sf_open ('%s') failed : %s\n", fixed_w64, sf_strerror (NULL)) ; exit (1) ; } ; @@ -240,7 +246,7 @@ find_data_offset (int fd, int format) cptr = memchr (buffer, target [0], rlen - slen) ; if (cptr && memcmp (cptr, target, slen) == 0) - offset = cptr - buffer ; + offset = cptr - buffer ; else { printf ("Error : Could not find data offset.\n") ; exit (1) ; diff --git a/lib-src/libsndfile/programs/test-sndfile-metadata-set.py b/lib-src/libsndfile/programs/test-sndfile-metadata-set.py index a21a36b3d..0006936ce 100755 --- a/lib-src/libsndfile/programs/test-sndfile-metadata-set.py +++ b/lib-src/libsndfile/programs/test-sndfile-metadata-set.py @@ -1,6 +1,6 @@ -#!/usr/bin/python +#!/usr/bin/env python -# Copyright (C) 2008-2011 Erik de Castro Lopo +# Copyright (C) 2008-2016 Erik de Castro Lopo # # All rights reserved. # @@ -32,157 +32,167 @@ # Simple test script for the sndfile-metadata-set program. -import commands, os, sys +from __future__ import print_function + +try: + # py2 + import commands +except ImportError: + # py3 + import subprocess as commands + +import os, sys import time, datetime +class Programs: + def __init__ (self, needs_exe): + if needs_exe: + extension = ".exe" + else: + extension = "" + self.meta_set_prog = "./sndfile-metadata-set" + extension + self.meta_get_prog = "./sndfile-metadata-get" + extension + self.make_sine_prog = "../examples/make_sine" + extension + + def _run_command (self, should_fail, cmd): + status, output = commands.getstatusoutput (cmd) + if should_fail and not status: + print("\n\nError : command '%s' should have failed." % cmd) + print(output) + print() + sys.exit (1) + if not should_fail and status: + print("\n\nError : command '%s' should not have failed." % cmd) + print(output) + print() + sys.exit (1) + return output + + def meta_set (self, should_fail, args): + return self._run_command (should_fail, self.meta_set_prog + " " + args) + + def meta_get (self, should_fail, args): + return self._run_command (should_fail, self.meta_get_prog + " " + args) + + def make_sine (self): + return os.system (self.make_sine_prog) + + def check_executables (self): + for name in [ self.meta_set_prog, self.meta_get_prog, self.make_sine_prog ]: + if not (os.path.isfile (name)): + print("\n\nError : Can't find executable '%s'. Have you run make?" % name) + sys.exit (1) + + def print_test_name (name): - print " %-30s :" % name, + print(" %-30s :" % name, end="") -def assert_info (filename, arg, value): - cmd = "./sndfile-metadata-get %s %s" % (arg, filename) - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - if output.find (value) < 0: - print "\n\nError : not able to find '%s'." % value - print output - sys.exit (1) - return +def assert_info (programs, filename, arg, value): + output = programs.meta_get (False, "%s %s" % (arg, filename)) + if output.find (value) < 0: + print("\n\nError : not able to find '%s'." % value) + print(output) + sys.exit (1) + return -def check_executable (name): - if not (os.path.isfile (name)): - print "\n\nError : Can't find executable '%s'. Have you run make?" % name - sys.exit (1) +def test_empty_fail (programs): + print_test_name ("Empty fail test") + output = programs.meta_set (True, "--bext-description Alpha sine.wav") + print("ok") -def test_empty_fail (): - print_test_name ("Empty fail test") - cmd = "./sndfile-metadata-set --bext-description Alpha sine.wav" - status, output = commands.getstatusoutput (cmd) - if not status: - print "\n\nError : command '%s' should have failed." % cmd - sys.exit (1) - print "ok" +def test_copy (programs): + print_test_name ("Copy test") + output = programs.meta_set (False, "--bext-description \"First Try\" sine.wav output.wav") + assert_info (programs, "output.wav", "--bext-description", "First Try") + print("ok") -def test_copy (): - print_test_name ("Copy test") - cmd = "./sndfile-metadata-set --bext-description \"First Try\" sine.wav output.wav" - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - assert_info ("output.wav", "--bext-description", "First Try") - print "ok" +def test_update (programs, tests): + print_test_name ("Update test") + for arg, value in tests: + output = programs.meta_set (False, "%s \"%s\" output.wav" % (arg, value)) + assert_info (programs, "output.wav", arg, value) + print("ok") -def test_update (tests): - print_test_name ("Update test") - for arg, value in tests: - cmd = "./sndfile-metadata-set %s \"%s\" output.wav" % (arg, value) - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - assert_info ("output.wav", arg, value) - print "ok" +def test_post_mod (programs, tests): + print_test_name ("Post mod test") + for arg, value in tests: + assert_info (programs, "output.wav", arg, value) + print("ok") -def test_post_mod (tests): - print_test_name ("Post mod test") - for arg, value in tests: - assert_info ("output.wav", arg, value) - print "ok" - -def test_auto_date (): - print_test_name ("Auto date test") - cmd = "./sndfile-metadata-set --bext-auto-time-date sine.wav date-time.wav" - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - target = datetime.date.today ().__str__ () - assert_info ("date-time.wav", "--bext-orig-date", target) - print "ok" +def test_auto_date (programs): + print_test_name ("Auto date test") + output = programs.meta_set (False, "--bext-auto-time-date sine.wav date-time.wav") + target = datetime.date.today ().__str__ () + assert_info (programs, "date-time.wav", "--bext-orig-date", target) + print("ok") #------------------------------------------------------------------------------- -def test_coding_history (): - print_test_name ("Coding history test") - cmd = "./sndfile-metadata-set --bext-coding-hist \"alpha beta\" output.wav" - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - cmd = "./sndfile-metadata-get --bext-coding-hist output.wav" - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - print "ok" +def test_coding_history (programs): + print_test_name ("Coding history test") + output = programs.meta_set (False, "--bext-coding-hist \"alpha beta\" output.wav") + output = programs.meta_get (False, "--bext-coding-hist output.wav") + print("ok") #------------------------------------------------------------------------------- -def test_rewrite (): - print_test_name ("Rewrite test") - cmd = "./sndfile-metadata-set --bext-originator \"Really, really long string\" output.wav" - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - cmd = "./sndfile-metadata-set --bext-originator \"Short\" output.wav" - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - cmd = "./sndfile-metadata-get --bext-originator output.wav" - status, output = commands.getstatusoutput (cmd) - if status: - print "\n\nError : command '%s' should not have failed." % cmd - sys.exit (1) - if output.find ("really long") > 0: - print "\n\nError : output '%s' should not contain 'really long'." % output - sys.exit (1) - print "ok" +def test_rewrite (programs): + print_test_name ("Rewrite test") + output = programs.meta_set (False, "--bext-originator \"Really, really long string\" output.wav") + output = programs.meta_set (False, "--bext-originator \"Short\" output.wav") + output = programs.meta_get (False, "--bext-originator output.wav") + if output.find ("really long") > 0: + print("\n\nError : output '%s' should not contain 'really long'." % output) + sys.exit (1) + print("ok") #=============================================================================== test_dir = "programs" +print("\nTesting WAV metadata manipulation:") + if os.path.isdir (test_dir): - os.chdir (test_dir) + os.chdir (test_dir) -for f in [ "sndfile-metadata-set", "sndfile-metadata-get", "../examples/make_sine" ]: - check_executable (f) +if len (sys.argv) >= 1 and sys.argv [1].endswith ("mingw32"): + needs_exe = True +else: + needs_exe = False -os.system ("../examples/make_sine") +programs = Programs (needs_exe) + +programs.check_executables () + +programs.make_sine () if not os.path.isfile ("sine.wav"): - print "\n\nError : Can't file file 'sine.wav'." - sys.exit (1) + print("\n\nError : Can't file file 'sine.wav'.") + sys.exit (1) -print "" - -test_empty_fail () -test_copy () +test_empty_fail (programs) +test_copy (programs) tests = [ - ("--bext-description", "Alpha"), ("--bext-originator", "Beta"), ("--bext-orig-ref", "Charlie"), - ("--bext-umid", "Delta"), ("--bext-orig-date", "2001-10-01"), ("--bext-orig-time", "01:02:03"), - ("--str-title", "Echo"), ("--str-artist", "Fox trot") - ] + ("--bext-description", "Alpha"), ("--bext-originator", "Beta"), ("--bext-orig-ref", "Charlie"), + ("--bext-umid", "Delta"), ("--bext-orig-date", "2001-10-01"), ("--bext-orig-time", "01:02:03"), + ("--str-title", "Echo"), ("--str-artist", "Fox trot") + ] -test_auto_date () -test_update (tests) -test_post_mod (tests) +test_auto_date (programs) +test_update (programs, tests) +test_post_mod (programs, tests) -test_update ([ ("--str-artist", "Fox") ]) +test_update (programs, [ ("--str-artist", "Fox") ]) # This never worked. # test_coding_history () -test_rewrite () +test_rewrite (programs) -print "" +print() sys.exit (0) diff --git a/lib-src/libsndfile/regtest/Makefile.am b/lib-src/libsndfile/regtest/Makefile.am deleted file mode 100644 index 1102a9ba6..000000000 --- a/lib-src/libsndfile/regtest/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -## Process this file with automake to produce Makefile.in - -bin_PROGRAMS = sndfile-regtest - -noinst_HEADERS = regtest.h - -AM_CPPFLAGS = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS) - -sndfile_regtest_SOURCES = sndfile-regtest.c database.c checksum.c -sndfile_regtest_LDADD = $(top_builddir)/src/libsndfile.la $(SQLITE3_LIBS) - diff --git a/lib-src/libsndfile/regtest/Makefile.in b/lib-src/libsndfile/regtest/Makefile.in deleted file mode 100644 index 47e408d5d..000000000 --- a/lib-src/libsndfile/regtest/Makefile.in +++ /dev/null @@ -1,689 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -bin_PROGRAMS = sndfile-regtest$(EXEEXT) -subdir = regtest -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/Cfg/depcomp $(noinst_HEADERS) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) -am_sndfile_regtest_OBJECTS = sndfile-regtest.$(OBJEXT) \ - database.$(OBJEXT) checksum.$(OBJEXT) -sndfile_regtest_OBJECTS = $(am_sndfile_regtest_OBJECTS) -am__DEPENDENCIES_1 = -sndfile_regtest_DEPENDENCIES = $(top_builddir)/src/libsndfile.la \ - $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -depcomp = $(SHELL) $(top_srcdir)/Cfg/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(sndfile_regtest_SOURCES) -DIST_SOURCES = $(sndfile_regtest_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -HEADERS = $(noinst_HEADERS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -noinst_HEADERS = regtest.h -AM_CPPFLAGS = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS) -sndfile_regtest_SOURCES = sndfile-regtest.c database.c checksum.c -sndfile_regtest_LDADD = $(top_builddir)/src/libsndfile.la $(SQLITE3_LIBS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu regtest/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu regtest/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -sndfile-regtest$(EXEEXT): $(sndfile_regtest_OBJECTS) $(sndfile_regtest_DEPENDENCIES) $(EXTRA_sndfile_regtest_DEPENDENCIES) - @rm -f sndfile-regtest$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sndfile_regtest_OBJECTS) $(sndfile_regtest_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checksum.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/database.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile-regtest.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binPROGRAMS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/regtest/Readme.txt b/lib-src/libsndfile/regtest/Readme.txt new file mode 100644 index 000000000..bc038d642 --- /dev/null +++ b/lib-src/libsndfile/regtest/Readme.txt @@ -0,0 +1,108 @@ +sndfile-regtest +=============== + +The 'sndfile-regtest' program is a regression test-suite for libsndile. + +This program is intended to allow anyone who has an interest in the +reliability and correctness of libsndfile to do their own regression +testing. From the point of view of the libsndfile developers, this +program now allows for distributed regression testing of libsndfile +which will make libsndfile better. + + +How Does it Work +---------------- +Anyone who wishes to take part in the distributed regression testing of +libsndfile can download the regression test program and install it. + +Once installed the user can start collecting files and adding them to +their own personal database. Then, as new versions of libsndfile come +out, the user should test the new library version against their database +of files (instructions below). + +Any files which were successfully added to the database in the past but +now fail the check with the new library version represent a regression. +The user should then contact the libsndfile developers so that a copy +of the test file can be made available to the developers. + + +Requirements +------------ +The regression test program uses sqlite3 as the database engine. On +Debian, the required packages are : + + sqlite3 + libsqlite3-0 + libsqlite3-dev + +but similar packages should be available on any other Linux style +system. + +The regression test currently only compiles under Unix-like systems. +At some time in the future the regression test will distributed along +with the libsndfile source code distribution. + + +Organization of Files +--------------------- +The regession test program keeps its database file in the directory it +is run from. In addition, the database only contains information about +the files, not the files themselves. + +This means that database file should probably be kept in the same +directory (or a directory above) the test files. + + +Setting it Up for the First Time +-------------------------------- +The sndfile-regtest program should be on your PATH. You can then cd into +the directory where you intend to keep you test files and +run the command: + + sndfile-regtest --create-db + +which creates a file named '.sndfile-regtest.db' in the current directory. + +Files can then be added to the database using the command: + + sndfile-regtest --add-file file1.wav + +The --add-file option allows more than one file to be added at a time +using: + + sndfile-regtest --add-file file1.wav file2.aif ..... + + +Checking Files +-------------- +One or more files that have already been added to the database can be +checked using: + + sndfile-regtest --check-file file1.wav file2.aif ..... + +It is also possible to check all files in the database using: + + sndfile-regtest --check-all + + +Running a Regression Test +------------------------- +Once you have a collection of files and a database it is possible to test +new versions of libsndfile before you install them. If for instance you +have just compiled a new version of libsndfile in the directory +/usr/src/libsndfile-X.Y.Z, then you can use an existing sndfile-regtest +binary with the new libsndfile using something like: + + LD_PRELOAD=/usr/src/libsndfile-X.Y.Z/src/.libs/libsndfile.so.X.Y.Z \ + sndfile-regtest --check-all + + +Reporting Regressions +--------------------- +Any user who finds a file which was added to the regression database with +an earlier version of libsndfile and then fails the check with a later +version of the library should contact the author (erikd at mega dash nerd +dot com). If possible place the file on a web server and email the author +a link to it. + + diff --git a/lib-src/libsndfile/regtest/database.c b/lib-src/libsndfile/regtest/database.c index c8b718023..a6739818a 100644 --- a/lib-src/libsndfile/regtest/database.c +++ b/lib-src/libsndfile/regtest/database.c @@ -20,9 +20,16 @@ #include #include +#if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" +#endif #include #include +#ifdef HAVE_DIRECT_H +#include +#endif #include #include @@ -146,7 +153,7 @@ db_file_exists (REG_DB * db_handle, const char * filename) db->count = 0 ; err = sqlite3_exec (db->sql, db->cmdbuf, (sqlite3_callback) count_callback, db, &errmsg) ; - if (db->count == 1) + if (err == 0 && db->count == 1) return 1 ; return 0 ; diff --git a/lib-src/libsndfile/sndfile.pc.in b/lib-src/libsndfile/sndfile.pc.in index 28269c19e..961cf93c6 100644 --- a/lib-src/libsndfile/sndfile.pc.in +++ b/lib-src/libsndfile/sndfile.pc.in @@ -5,8 +5,8 @@ includedir=@includedir@ Name: sndfile Description: A library for reading and writing audio files -Requires: +Requires: +Requires.private: @EXTERNAL_XIPH_REQUIRE@ Version: @VERSION@ Libs: -L${libdir} -lsndfile -Libs.private: @EXTERNAL_LIBS@ -Cflags: -I${includedir} +Cflags: -I${includedir} diff --git a/lib-src/libsndfile/src/ALAC/ALACAudioTypes.h b/lib-src/libsndfile/src/ALAC/ALACAudioTypes.h new file mode 100644 index 000000000..52d3f44a0 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/ALACAudioTypes.h @@ -0,0 +1,206 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: ALACAudioTypes.h +*/ + +#ifndef ALACAUDIOTYPES_H +#define ALACAUDIOTYPES_H + +/* Force these Mac OS specific things to zero. */ +#define PRAGMA_STRUCT_ALIGN 0 +#define PRAGMA_STRUCT_PACKPUSH 0 +#define PRAGMA_STRUCT_PACK 0 +#define PRAGMA_ONCE 0 +#define PRAGMA_MARK 0 + + +#if PRAGMA_ONCE +#pragma once +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include "sfendian.h" + +#if CPU_IS_BIG_ENDIAN == 1 +#define TARGET_RT_BIG_ENDIAN 1 +#else +#define TARGET_RT_BIG_ENDIAN 0 +#endif + +#define kChannelAtomSize 12 + +enum +{ + kALAC_UnimplementedError = -4, + kALAC_FileNotFoundError = -43, + kALAC_ParamError = -50, + kALAC_MemFullError = -108, + fALAC_FrameLengthError = -666, + + /* Add for libsndfile */ + kALAC_BadBitWidth = -0x100000, + kALAC_IncompatibleVersion = -0x100001, + kALAC_BadSpecificConfigSize = -0x100002, + kALAC_ZeroChannelCount = -0x100003, + kALAC_NumSamplesTooBig = -0x100004, + kALAC_UnsupportedElement = -0x100005, +} ; + +enum +{ + kALACFormatAppleLossless = MAKE_MARKER ('a', 'l', 'a', 'c'), + kALACFormatLinearPCM = MAKE_MARKER ('l', 'p', 'c', 'm') +} ; + +enum +{ + kALACMaxChannels = 8, + kALACMaxEscapeHeaderBytes = 8, + kALACMaxSearches = 16, + kALACMaxCoefs = 16, + kALACDefaultFramesPerPacket = 4096 +} ; + +typedef uint32_t ALACChannelLayoutTag ; + +enum +{ + kALACFormatFlagIsFloat = (1 << 0), // 0x1 + kALACFormatFlagIsBigEndian = (1 << 1), // 0x2 + kALACFormatFlagIsSignedInteger = (1 << 2), // 0x4 + kALACFormatFlagIsPacked = (1 << 3), // 0x8 + kALACFormatFlagIsAlignedHigh = (1 << 4), // 0x10 +} ; + +enum +{ +#if TARGET_RT_BIG_ENDIAN + kALACFormatFlagsNativeEndian = kALACFormatFlagIsBigEndian +#else + kALACFormatFlagsNativeEndian = 0 +#endif +} ; + +// this is required to be an IEEE 64bit float +typedef double alac_float64_t ; + +// These are the Channel Layout Tags used in the Channel Layout Info portion of the ALAC magic cookie +enum +{ kALACChannelLayoutTag_Mono = (100 << 16) | 1, // C + kALACChannelLayoutTag_Stereo = (101 << 16) | 2, // L R + kALACChannelLayoutTag_MPEG_3_0_B = (113 << 16) | 3, // C L R + kALACChannelLayoutTag_MPEG_4_0_B = (116 << 16) | 4, // C L R Cs + kALACChannelLayoutTag_MPEG_5_0_D = (120 << 16) | 5, // C L R Ls Rs + kALACChannelLayoutTag_MPEG_5_1_D = (124 << 16) | 6, // C L R Ls Rs LFE + kALACChannelLayoutTag_AAC_6_1 = (142 << 16) | 7, // C L R Ls Rs Cs LFE + kALACChannelLayoutTag_MPEG_7_1_B = (127 << 16) | 8 // C Lc Rc L R Ls Rs LFE (doc: IS-13818-7 MPEG2-AAC) +} ; + +// ALAC currently only utilizes these channels layouts. There is a one for one correspondance between a +// given number of channels and one of these layout tags +static const ALACChannelLayoutTag ALACChannelLayoutTags [kALACMaxChannels] = +{ + kALACChannelLayoutTag_Mono, // C + kALACChannelLayoutTag_Stereo, // L R + kALACChannelLayoutTag_MPEG_3_0_B, // C L R + kALACChannelLayoutTag_MPEG_4_0_B, // C L R Cs + kALACChannelLayoutTag_MPEG_5_0_D, // C L R Ls Rs + kALACChannelLayoutTag_MPEG_5_1_D, // C L R Ls Rs LFE + kALACChannelLayoutTag_AAC_6_1, // C L R Ls Rs Cs LFE + kALACChannelLayoutTag_MPEG_7_1_B // C Lc Rc L R Ls Rs LFE (doc: IS-13818-7 MPEG2-AAC) +} ; + +// AudioChannelLayout from CoreAudioTypes.h. We never need the AudioChannelDescription so we remove it +struct ALACAudioChannelLayout +{ ALACChannelLayoutTag mChannelLayoutTag ; + uint32_t mChannelBitmap ; + uint32_t mNumberChannelDescriptions ; +} ; +typedef struct ALACAudioChannelLayout ALACAudioChannelLayout ; + +struct AudioFormatDescription +{ + alac_float64_t mSampleRate ; + uint32_t mFormatID ; + uint32_t mFormatFlags ; + uint32_t mBytesPerPacket ; + uint32_t mFramesPerPacket ; + uint32_t mBytesPerFrame ; + uint32_t mChannelsPerFrame ; + uint32_t mBitsPerChannel ; + uint32_t mReserved ; +} ; +typedef struct AudioFormatDescription AudioFormatDescription ; + +/* Lossless Definitions */ + +enum +{ + kALACCodecFormat = MAKE_MARKER ('a', 'l', 'a', 'c'), + kALACVersion = 0, + kALACCompatibleVersion = kALACVersion, + kALACDefaultFrameSize = 4096 +} ; + +// note: this struct is wrapped in an 'alac' atom in the sample description extension area +// note: in QT movies, it will be further wrapped in a 'wave' atom surrounded by 'frma' and 'term' atoms +typedef struct ALACSpecificConfig +{ + uint32_t frameLength ; + uint8_t compatibleVersion ; + uint8_t bitDepth ; // max 32 + uint8_t pb ; // 0 <= pb <= 255 + uint8_t mb ; + uint8_t kb ; + uint8_t numChannels ; + uint16_t maxRun ; + uint32_t maxFrameBytes ; + uint32_t avgBitRate ; + uint32_t sampleRate ; + +} ALACSpecificConfig ; + + +// The AudioChannelLayout atom type is not exposed yet so define it here +enum +{ + AudioChannelLayoutAID = MAKE_MARKER ('c', 'h', 'a', 'n') +} ; + +#if PRAGMA_STRUCT_ALIGN + #pragma options align = reset +#elif PRAGMA_STRUCT_PACKPUSH + #pragma pack (pop) +#elif PRAGMA_STRUCT_PACK + #pragma pack () +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* ALACAUDIOTYPES_H */ diff --git a/lib-src/libsndfile/src/ALAC/ALACBitUtilities.c b/lib-src/libsndfile/src/ALAC/ALACBitUtilities.c new file mode 100644 index 000000000..d861be4f1 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/ALACBitUtilities.c @@ -0,0 +1,262 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/*============================================================================= + File: ALACBitUtilities.c + + $NoKeywords: $ +=============================================================================*/ + +#include +#include "ALACBitUtilities.h" + +#define PRAGMA_MARK 0 + +// BitBufferInit +// +void BitBufferInit (BitBuffer * bits, uint8_t * buffer, uint32_t byteSize) +{ + bits->cur = buffer ; + bits->end = bits->cur + byteSize ; + bits->bitIndex = 0 ; + bits->byteSize = byteSize ; +} + +// BitBufferRead +// +uint32_t BitBufferRead (BitBuffer * bits, uint8_t numBits) +{ + uint32_t returnBits ; + + //Assert (numBits <= 16) ; + + returnBits = ((uint32_t) bits->cur [0] << 16) | ((uint32_t) bits->cur [1] << 8) | ((uint32_t) bits->cur [2]) ; + returnBits = returnBits << bits->bitIndex ; + returnBits &= 0x00FFFFFF ; + + bits->bitIndex += numBits ; + + returnBits = returnBits >> (24 - numBits) ; + + bits->cur += (bits->bitIndex >> 3) ; + bits->bitIndex &= 7 ; + + //Assert (bits->cur <= bits->end) ; + + return returnBits ; +} + +// BitBufferReadSmall +// +// Reads up to 8 bits +uint8_t BitBufferReadSmall (BitBuffer * bits, uint8_t numBits) +{ + uint16_t returnBits ; + + //Assert (numBits <= 8) ; + + returnBits = (bits->cur [0] << 8) | bits->cur [1] ; + returnBits = returnBits << bits->bitIndex ; + + bits->bitIndex += numBits ; + + returnBits = returnBits >> (16 - numBits) ; + + bits->cur += (bits->bitIndex >> 3) ; + bits->bitIndex &= 7 ; + + //Assert (bits->cur <= bits->end) ; + + return (uint8_t) returnBits ; +} + +// BitBufferReadOne +// +// Reads one byte +uint8_t BitBufferReadOne (BitBuffer * bits) +{ + uint8_t returnBits ; + + returnBits = (bits->cur [0] >> (7 - bits->bitIndex)) & 1 ; + + bits->bitIndex++ ; + + bits->cur += (bits->bitIndex >> 3) ; + bits->bitIndex &= 7 ; + + //Assert (bits->cur <= bits->end) ; + + return returnBits ; +} + +// BitBufferPeek +// +uint32_t BitBufferPeek (BitBuffer * bits, uint8_t numBits) +{ + return ((((((uint32_t) bits->cur [0] << 16) | ((uint32_t) bits->cur [1] << 8) | + ((uint32_t) bits->cur [2])) << bits->bitIndex) & 0x00FFFFFF) >> (24 - numBits)) ; +} + +// BitBufferPeekOne +// +uint32_t BitBufferPeekOne (BitBuffer * bits) +{ + return ((bits->cur [0] >> (7 - bits->bitIndex)) & 1) ; +} + +// BitBufferUnpackBERSize +// +uint32_t BitBufferUnpackBERSize (BitBuffer * bits) +{ + uint32_t size ; + uint8_t tmp ; + + for (size = 0, tmp = 0x80u ; tmp &= 0x80u ; size = (size << 7u) | (tmp & 0x7fu)) + tmp = (uint8_t) BitBufferReadSmall (bits, 8) ; + + return size ; +} + +// BitBufferGetPosition +// +uint32_t BitBufferGetPosition (BitBuffer * bits) +{ + uint8_t * begin ; + + begin = bits->end - bits->byteSize ; + + return ((uint32_t) (bits->cur - begin) * 8) + bits->bitIndex ; +} + +// BitBufferByteAlign +// +void BitBufferByteAlign (BitBuffer * bits, int32_t addZeros) +{ + // align bit buffer to next byte boundary, writing zeros if requested + if (bits->bitIndex == 0) + return ; + + if (addZeros) + BitBufferWrite (bits, 0, 8 - bits->bitIndex) ; + else + BitBufferAdvance (bits, 8 - bits->bitIndex) ; +} + +// BitBufferAdvance +// +void BitBufferAdvance (BitBuffer * bits, uint32_t numBits) +{ + if (numBits) + { + bits->bitIndex += numBits ; + bits->cur += (bits->bitIndex >> 3) ; + bits->bitIndex &= 7 ; + } +} + +// BitBufferRewind +// +void BitBufferRewind (BitBuffer * bits, uint32_t numBits) +{ + uint32_t numBytes ; + + if (numBits == 0) + return ; + + if (bits->bitIndex >= numBits) + { + bits->bitIndex -= numBits ; + return ; + } + + numBits -= bits->bitIndex ; + bits->bitIndex = 0 ; + + numBytes = numBits / 8 ; + numBits = numBits % 8 ; + + bits->cur -= numBytes ; + + if (numBits > 0) + { + bits->bitIndex = 8 - numBits ; + bits->cur-- ; + } + + if (bits->cur < (bits->end - bits->byteSize)) + { + //DebugCMsg ("BitBufferRewind: Rewound too far.") ; + + bits->cur = (bits->end - bits->byteSize) ; + bits->bitIndex = 0 ; + } +} + +// BitBufferWrite +// +void BitBufferWrite (BitBuffer * bits, uint32_t bitValues, uint32_t numBits) +{ + uint32_t invBitIndex ; + + RequireAction (bits != NULL, return ;) ; + RequireActionSilent (numBits > 0, return ;) ; + + invBitIndex = 8 - bits->bitIndex ; + + while (numBits > 0) + { + uint32_t tmp ; + uint8_t shift ; + uint8_t mask ; + uint32_t curNum ; + + curNum = MIN (invBitIndex, numBits) ; + + tmp = bitValues >> (numBits - curNum) ; + + shift = (uint8_t) (invBitIndex - curNum) ; + mask = 0xffu >> (8 - curNum) ; // must be done in two steps to avoid compiler sequencing ambiguity + mask <<= shift ; + + bits->cur [0] = (bits->cur [0] & ~mask) | (((uint8_t) tmp << shift) & mask) ; + numBits -= curNum ; + + // increment to next byte if need be + invBitIndex -= curNum ; + if (invBitIndex == 0) + { + invBitIndex = 8 ; + bits->cur++ ; + } + } + + bits->bitIndex = 8 - invBitIndex ; +} + +void BitBufferReset (BitBuffer * bits) +//void BitBufferInit (BitBuffer * bits, uint8_t * buffer, uint32_t byteSize) +{ + bits->cur = bits->end - bits->byteSize ; + bits->bitIndex = 0 ; +} + +#if PRAGMA_MARK +#pragma mark - +#endif diff --git a/lib-src/libsndfile/src/ALAC/ALACBitUtilities.h b/lib-src/libsndfile/src/ALAC/ALACBitUtilities.h new file mode 100644 index 000000000..97080cdfe --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/ALACBitUtilities.h @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/*============================================================================= + File: ALACBitUtilities.h + + $NoKeywords: $ +=============================================================================*/ + +#ifndef __ALACBITUTILITIES_H +#define __ALACBITUTILITIES_H + +#include + +#ifndef MIN +#define MIN(x, y) ((x) < (y) ? (x) : (y)) +#endif // MIN +#ifndef MAX +#define MAX(x, y) ((x) > (y) ? (x) : (y)) +#endif // MAX + +#define RequireAction(condition, action) if (! (condition)) { action } +#define RequireActionSilent(condition, action) if (! (condition)) { action } +#define RequireNoErr(condition, action) if (condition) { action } + +enum +{ + ALAC_noErr = 0 +} ; + + +typedef enum +{ ID_SCE = 0, /* Single Channel Element */ + ID_CPE = 1, /* Channel Pair Element */ + ID_CCE = 2, /* Coupling Channel Element */ + ID_LFE = 3, /* LFE Channel Element */ + ID_DSE = 4, /* not yet supported */ + ID_PCE = 5, + ID_FIL = 6, + ID_END = 7 +} ELEMENT_TYPE ; + +// types +typedef struct BitBuffer +{ + uint8_t * cur ; + uint8_t * end ; + uint32_t bitIndex ; + uint32_t byteSize ; + +} BitBuffer ; + +/* + BitBuffer routines + - these routines take a fixed size buffer and read/write to it + - bounds checking must be done by the client +*/ +void BitBufferInit (BitBuffer * bits, uint8_t * buffer, uint32_t byteSize) ; +uint32_t BitBufferRead (BitBuffer * bits, uint8_t numBits) ; // note: cannot read more than 16 bits at a time +uint8_t BitBufferReadSmall (BitBuffer * bits, uint8_t numBits) ; +uint8_t BitBufferReadOne (BitBuffer * bits) ; +uint32_t BitBufferPeek (BitBuffer * bits, uint8_t numBits) ; // note: cannot read more than 16 bits at a time +uint32_t BitBufferPeekOne (BitBuffer * bits) ; +uint32_t BitBufferUnpackBERSize (BitBuffer * bits) ; +uint32_t BitBufferGetPosition (BitBuffer * bits) ; +void BitBufferByteAlign (BitBuffer * bits, int32_t addZeros) ; +void BitBufferAdvance (BitBuffer * bits, uint32_t numBits) ; +void BitBufferRewind (BitBuffer * bits, uint32_t numBits) ; +void BitBufferWrite (BitBuffer * bits, uint32_t value, uint32_t numBits) ; +void BitBufferReset (BitBuffer * bits) ; + +#endif /* __BITUTILITIES_H */ diff --git a/lib-src/libsndfile/src/ALAC/ALACDecoder.h b/lib-src/libsndfile/src/ALAC/ALACDecoder.h new file mode 100644 index 000000000..8eb7531f8 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/ALACDecoder.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: ALACDecoder.h +*/ + +#ifndef _ALACDECODER_H +#define _ALACDECODER_H + +#include + +#include "ALACAudioTypes.h" + +struct BitBuffer ; + +class ALACDecoder +{ + public: + ALACDecoder () ; + ~ALACDecoder () ; + + int32_t Init (void * inMagicCookie, uint32_t inMagicCookieSize) ; + int32_t Decode (struct BitBuffer * bits, uint8_t * sampleBuffer, uint32_t numSamples, uint32_t numChannels, uint32_t * outNumSamples) ; + + public: + // decoding parameters (public for use in the analyzer) + ALACSpecificConfig mConfig ; + + protected: + int32_t FillElement (struct BitBuffer * bits) ; + int32_t DataStreamElement (struct BitBuffer * bits) ; + + uint16_t mActiveElements ; + + // decoding buffers + int32_t * mMixBufferU ; + int32_t * mMixBufferV ; + int32_t * mPredictor ; + uint16_t * mShiftBuffer ; // note: this points to mPredictor's memory but different + // variable for clarity and type difference +} ; + +#endif /* _ALACDECODER_H */ diff --git a/lib-src/libsndfile/src/ALAC/ALACEncoder.h b/lib-src/libsndfile/src/ALAC/ALACEncoder.h new file mode 100644 index 000000000..eb5b79ee3 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/ALACEncoder.h @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: ALACEncoder.h +*/ + +#pragma once + +#include + +#include "ALACAudioTypes.h" + + +struct BitBuffer ; + +class ALACEncoder +{ + public : + ALACEncoder () ; + virtual ~ALACEncoder () ; + + virtual int32_t Encode (AudioFormatDescription theInputFormat, AudioFormatDescription theOutputFormat, + unsigned char * theReadBuffer, unsigned char * theWriteBuffer, int32_t * ioNumBytes) ; + virtual int32_t Finish () ; + + void SetFastMode (bool fast) { mFastMode = fast ; } ; + + // this must be called *before* InitializeEncoder () + void SetFrameSize (uint32_t frameSize) { mFrameSize = frameSize ; } ; + + void GetConfig (ALACSpecificConfig & config) ; + uint32_t GetMagicCookieSize (uint32_t inNumChannels) ; + void GetMagicCookie (void * config, uint32_t * ioSize) ; + + virtual int32_t InitializeEncoder (AudioFormatDescription theOutputFormat) ; + + protected : + virtual void GetSourceFormat (const AudioFormatDescription * source, AudioFormatDescription * output) ; + + int32_t EncodeStereo (struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ; + int32_t EncodeStereoFast (struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ; + int32_t EncodeStereoEscape (struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t numSamples) ; + int32_t EncodeMono (struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ; + + + // ALAC encoder parameters + int16_t mBitDepth ; + bool mFastMode ; + + // encoding state + int16_t mLastMixRes [kALACMaxChannels] ; + + // encoding buffers + int32_t * mMixBufferU ; + int32_t * mMixBufferV ; + int32_t * mPredictorU ; + int32_t * mPredictorV ; + uint16_t * mShiftBufferUV ; + + uint8_t * mWorkBuffer ; + + // per-channel coefficients buffers + int16_t mCoefsU [kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs] ; + int16_t mCoefsV [kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs] ; + + // encoding statistics + uint32_t mTotalBytesGenerated ; + uint32_t mAvgBitRate ; + uint32_t mMaxFrameBytes ; + uint32_t mFrameSize ; + uint32_t mMaxOutputBytes ; + uint32_t mNumChannels ; + uint32_t mOutputSampleRate ; +} ; diff --git a/lib-src/libsndfile/src/ALAC/EndianPortable.h b/lib-src/libsndfile/src/ALAC/EndianPortable.h new file mode 100644 index 000000000..aa1f449b4 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/EndianPortable.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. +** Copyright (C) 2013-2014 Erik de Castro Lopo + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +// +// EndianPortable.h +// +// Copyright 2011 Apple Inc. All rights reserved. +// + +#ifndef _EndianPortable_h +#define _EndianPortable_h + +#include + +#define Swap16NtoB(x) H2BE_16 (x) +#define Swap16BtoN(x) BE2H_16 (x) + +#define Swap32NtoB(x) H2BE_32 (x) +#define Swap32BtoN(x) BE2H_32 (x) + +#endif diff --git a/lib-src/libsndfile/src/ALAC/LICENSE b/lib-src/libsndfile/src/ALAC/LICENSE new file mode 100644 index 000000000..7d8595490 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/LICENSE @@ -0,0 +1,170 @@ +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control +with that entity. For the purposes of this definition, "control" means +(i) the power, direct or indirect, to cause the direction or management +of such entity, whether by contract or otherwise, or (ii) ownership +of fifty percent (50%) or more of the outstanding shares, or (iii) +beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, +and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but not +limited to compiled object code, generated documentation, and +conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object +form, made available under the License, as indicated by a copyright +notice that is included in or attached to the work (an example is +provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object +form, that is based on (or derived from) the Work and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. For the purposes +of this License, Derivative Works shall not include works that remain +separable from, or merely link (or bind by name) to the interfaces of, +the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor +for inclusion in the Work by the copyright owner or by an individual +or Legal Entity authorized to submit on behalf of the copyright owner. +For the purposes of this definition, "submitted" means any form of +electronic, verbal, or written communication sent to the Licensor +or its representatives, including but not limited to communication +on electronic mailing lists, source code control systems, and issue +tracking systems that are managed by, or on behalf of, the Licensor +for the purpose of discussing and improving the Work, but excluding +communication that is conspicuously marked or otherwise designated in +writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions +of this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, publicly +display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except +as stated in this section) patent license to make, have made, use, +offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) +alone or by combination of their Contribution(s) with the Work to which +such Contribution(s) was submitted. If You institute patent litigation +against any entity (including a cross-claim or counterclaim in a +lawsuit) alleging that the Work or a Contribution incorporated within +the Work constitutes direct or contributory patent infringement, then +any patent licenses granted to You under this License for that Work +shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof in any medium, with or without +modifications, and in Source or Object form, provided that You meet the +following conditions: + +You must give any other recipients of the Work or Derivative Works a +copy of this License; and + +You must cause any modified files to carry prominent notices stating +that You changed the files; and + +You must retain, in the Source form of any Derivative Works that You +distribute, all copyright, patent, trademark, and attribution notices +from the Source form of the Work, excluding those notices that do not +pertain to any part of the Derivative Works; and + +If the Work includes a "NOTICE" text file as part of its distribution, +then any Derivative Works that You distribute must include a readable +copy of the attribution notices contained within such NOTICE file, +excluding those notices that do not pertain to any part of the +Derivative Works, in at least one of the following places: within a +NOTICE text file distributed as part of the Derivative Works; within +the Source form or documentation, if provided along with the Derivative +Works; or, within a display generated by the Derivative Works, if and +wherever such third-party notices normally appear. The contents of the +NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative +Works that You distribute, alongside or as an addendum to the NOTICE +text from the Work, provided that such additional attribution notices +cannot be construed as modifying the License. You may add Your own +copyright statement to Your modifications and may provide additional +or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as +a whole, provided Your use, reproduction, and distribution of the Work +otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work by +You to the Licensor shall be under the terms and conditions of this +License, without any additional terms or conditions. Notwithstanding +the above, nothing herein shall supersede or modify the terms of any +separate license agreement you may have executed with Licensor regarding +such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed +to in writing, Licensor provides the Work (and each Contributor +provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied, including, without +limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, +MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your +exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, unless +required by applicable law (such as deliberate and grossly negligent +acts) or agreed to in writing, shall any Contributor be liable to You +for damages, including any direct, indirect, special, incidental, or +consequential damages of any character arising as a result of this +License or out of the use or inability to use the Work (including but +not limited to damages for loss of goodwill, work stoppage, computer +failure or malfunction, or any and all other commercial damages or +losses), even if such Contributor has been advised of the possibility of +such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the +Work or Derivative Works thereof, You may choose to offer, and charge a +fee for, acceptance of support, warranty, indemnity, or other liability +obligations and/or rights consistent with this License. However, in +accepting such obligations, You may act only on Your own behalf and +on Your sole responsibility, not on behalf of any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor +harmless for any liability incurred by, or claims asserted against, such +Contributor by reason of your accepting any such warranty or additional +liability. diff --git a/lib-src/libsndfile/src/ALAC/ag_dec.c b/lib-src/libsndfile/src/ALAC/ag_dec.c new file mode 100644 index 000000000..e7e4c62ad --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/ag_dec.c @@ -0,0 +1,356 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: ag_dec.c + + Contains: Adaptive Golomb decode routines. + + Copyright: (c) 2001-2011 Apple, Inc. +*/ + +#include +#include +#include +#include + +#include "aglib.h" +#include "ALACBitUtilities.h" +#include "ALACAudioTypes.h" + +#define CODE_TO_LONG_MAXBITS 32 +#define N_MAX_MEAN_CLAMP 0xffff +#define N_MEAN_CLAMP_VAL 0xffff +#define REPORT_VAL 40 + +#if __GNUC__ +#define ALWAYS_INLINE __attribute__ ((always_inline)) +#else +#define ALWAYS_INLINE +#endif + +/* And on the subject of the CodeWarrior x86 compiler and inlining, I reworked a lot of this + to help the compiler out. In many cases this required manual inlining or a macro. Sorry + if it is ugly but the performance gains are well worth it. + - WSK 5/19/04 +*/ + +void set_standard_ag_params (AGParamRecPtr params, uint32_t fullwidth, uint32_t sectorwidth) +{ + /* Use + fullwidth = sectorwidth = numOfSamples, for analog 1-dimensional type-short data, + but use + fullwidth = full image width, sectorwidth = sector (patch) width + for such as image (2-dim.) data. + */ + set_ag_params (params, MB0, PB0, KB0, fullwidth, sectorwidth, MAX_RUN_DEFAULT) ; +} + +void set_ag_params (AGParamRecPtr params, uint32_t m, uint32_t p, uint32_t k, uint32_t f, uint32_t s, uint32_t maxrun) +{ + params->mb = params->mb0 = m ; + params->pb = p ; + params->kb = k ; + params->wb = (1u << params->kb) - 1 ; + params->qb = QB-params->pb ; + params->fw = f ; + params->sw = s ; + params->maxrun = maxrun ; +} + +#if PRAGMA_MARK +#pragma mark - +#endif + + +// note: implementing this with some kind of "count leading zeros" assembly is a big performance win +static inline int32_t lead (int32_t m) +{ + long j ; + unsigned long c = (1ul << 31) ; + + for (j = 0 ; j < 32 ; j++) + { + if ((c & m) != 0) + break ; + c >>= 1 ; + } + return j ; +} + +#define arithmin(a, b) ((a) < (b) ? (a) : (b)) + +static inline int32_t ALWAYS_INLINE lg3a (int32_t x) +{ + int32_t result ; + + x += 3 ; + result = lead (x) ; + + return 31 - result ; +} + +static inline uint32_t ALWAYS_INLINE read32bit (uint8_t * buffer) +{ + // embedded CPUs typically can't read unaligned 32-bit words so just read the bytes + uint32_t value ; + + value = ((uint32_t) buffer [0] << 24) | ((uint32_t) buffer [1] << 16) | + ((uint32_t) buffer [2] << 8) | (uint32_t) buffer [3] ; + return value ; + +} + +#if PRAGMA_MARK +#pragma mark - +#endif + +#define get_next_fromlong(inlong, suff) ((inlong) >> (32 - (suff))) + + +static inline uint32_t ALWAYS_INLINE +getstreambits (uint8_t *in, int32_t bitoffset, int32_t numbits) +{ + uint32_t load1, load2 ; + uint32_t byteoffset = bitoffset / 8 ; + uint32_t result ; + + //Assert (numbits <= 32) ; + + load1 = read32bit (in + byteoffset) ; + + if ((numbits + (bitoffset & 0x7)) > 32) + { + int32_t load2shift ; + + result = load1 << (bitoffset & 0x7) ; + load2 = (uint32_t) in [byteoffset + 4] ; + load2shift = (8 - (numbits + (bitoffset & 0x7) - 32)) ; + load2 >>= load2shift ; + result >>= (32 - numbits) ; + result |= load2 ; + } + else + { + result = load1 >> (32 - numbits - (bitoffset & 7)) ; + } + + // a shift of >= "the number of bits in the type of the value being shifted" results in undefined + // behavior so don't try to shift by 32 + if (numbits != (sizeof (result) * 8)) + result &= ~ (0xfffffffful << numbits) ; + + return result ; +} + + +static inline int32_t dyn_get (unsigned char *in, uint32_t *bitPos, uint32_t m, uint32_t k) +{ + uint32_t tempbits = *bitPos ; + uint32_t result ; + uint32_t pre = 0, v ; + uint32_t streamlong ; + + streamlong = read32bit (in + (tempbits >> 3)) ; + streamlong <<= (tempbits & 7) ; + + /* find the number of bits in the prefix */ + { + uint32_t notI = ~streamlong ; + pre = lead (notI) ; + } + + if (pre >= MAX_PREFIX_16) + { + pre = MAX_PREFIX_16 ; + tempbits += pre ; + streamlong <<= pre ; + result = get_next_fromlong (streamlong, MAX_DATATYPE_BITS_16) ; + tempbits += MAX_DATATYPE_BITS_16 ; + + } + else + { + // all of the bits must fit within the long we have loaded + //Assert (pre+1+k <= 32) ; + + tempbits += pre ; + tempbits += 1 ; + streamlong <<= pre + 1 ; + v = get_next_fromlong (streamlong, k) ; + tempbits += k ; + + result = pre*m + v-1 ; + + if (v < 2) + { + result -= (v-1) ; + tempbits -= 1 ; + } + } + + *bitPos = tempbits ; + return result ; +} + + +static inline int32_t dyn_get_32bit (uint8_t * in, uint32_t * bitPos, int32_t m, int32_t k, int32_t maxbits) +{ + uint32_t tempbits = *bitPos ; + uint32_t v ; + uint32_t streamlong ; + uint32_t result ; + + streamlong = read32bit (in + (tempbits >> 3)) ; + streamlong <<= (tempbits & 7) ; + + /* find the number of bits in the prefix */ + { + uint32_t notI = ~streamlong ; + result = lead (notI) ; + } + + if (result >= MAX_PREFIX_32) + { + result = getstreambits (in, tempbits+MAX_PREFIX_32, maxbits) ; + tempbits += MAX_PREFIX_32 + maxbits ; + } + else + { + /* all of the bits must fit within the long we have loaded*/ + //Assert (k<=14) ; + //Assert (result= 2) + { + result += (v-1) ; + tempbits += 1 ; + } + } + } + + *bitPos = tempbits ; + + return result ; +} + +int32_t dyn_decomp (AGParamRecPtr params, BitBuffer * bitstream, int32_t * pc, int32_t numSamples, int32_t maxSize, uint32_t * outNumBits) +{ + uint8_t *in ; + int32_t *outPtr = pc ; + uint32_t bitPos, startPos, maxPos ; + uint32_t j, m, k, n, c, mz ; + int32_t del, zmode ; + uint32_t mb ; + uint32_t pb_local = params->pb ; + uint32_t kb_local = params->kb ; + uint32_t wb_local = params->wb ; + int32_t status ; + + RequireAction ((bitstream != NULL) && (pc != NULL) && (outNumBits != NULL), return kALAC_ParamError ;) ; + *outNumBits = 0 ; + + in = bitstream->cur ; + startPos = bitstream->bitIndex ; + maxPos = bitstream->byteSize * 8 ; + bitPos = startPos ; + + mb = params->mb0 ; + zmode = 0 ; + + c = 0 ; + status = ALAC_noErr ; + + while (c < (uint32_t) numSamples) + { + // bail if we've run off the end of the buffer + RequireAction (bitPos < maxPos, status = kALAC_ParamError ; goto Exit ;) ; + + m = (mb) >> QBSHIFT ; + k = lg3a (m) ; + + k = arithmin (k, kb_local) ; + m = (1 << k) - 1 ; + + n = dyn_get_32bit (in, &bitPos, m, k, maxSize) ; + + // least significant bit is sign bit + { + uint32_t ndecode = n + zmode ; + int32_t multiplier = - (int) (ndecode & 1) ; + + multiplier |= 1 ; + del = ((ndecode+1) >> 1) * (multiplier) ; + } + + *outPtr++ = del ; + + c++ ; + + mb = pb_local * (n + zmode) + mb - ((pb_local * mb) >> QBSHIFT) ; + + // update mean tracking + if (n > N_MAX_MEAN_CLAMP) + mb = N_MEAN_CLAMP_VAL ; + + zmode = 0 ; + + if (((mb << MMULSHIFT) < QB) && (c < (uint32_t) numSamples)) + { + zmode = 1 ; + k = lead (mb) - BITOFF + ((mb + MOFF) >> MDENSHIFT) ; + mz = ((1 << k) - 1) & wb_local ; + + n = dyn_get (in, &bitPos, mz, k) ; + + RequireAction (c+n <= (uint32_t) numSamples, status = kALAC_ParamError ; goto Exit ;) ; + + for (j = 0 ; j < n ; j++) + { + *outPtr++ = 0 ; + ++c ; + } + + if (n >= 65535) + zmode = 0 ; + + mb = 0 ; + } + } + +Exit: + *outNumBits = (bitPos - startPos) ; + BitBufferAdvance (bitstream, *outNumBits) ; + RequireAction (bitstream->cur <= bitstream->end, status = kALAC_ParamError ;) ; + + return status ; +} diff --git a/lib-src/libsndfile/src/ALAC/ag_enc.c b/lib-src/libsndfile/src/ALAC/ag_enc.c new file mode 100644 index 000000000..2b1df194e --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/ag_enc.c @@ -0,0 +1,350 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2013-2014 Erik de Castro Lopo + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: ag_enc.c + + Contains: Adaptive Golomb encode routines. + + Copyright: (c) 2001-2011 Apple, Inc. +*/ + +#include "aglib.h" +#include "ALACBitUtilities.h" +#include "EndianPortable.h" +#include "ALACAudioTypes.h" + +#include +#include +#include +#include + +#define CODE_TO_LONG_MAXBITS 32 +#define N_MAX_MEAN_CLAMP 0xffff +#define N_MEAN_CLAMP_VAL 0xffff +#define REPORT_VAL 40 + +#if __GNUC__ +#define ALWAYS_INLINE __attribute__ ((always_inline)) +#else +#define ALWAYS_INLINE +#endif + + +/* And on the subject of the CodeWarrior x86 compiler and inlining, I reworked a lot of this + to help the compiler out. In many cases this required manual inlining or a macro. Sorry + if it is ugly but the performance gains are well worth it. + - WSK 5/19/04 +*/ + +// note: implementing this with some kind of "count leading zeros" assembly is a big performance win +static inline int32_t lead (int32_t m) +{ + long j ; + unsigned long c = (1ul << 31) ; + + for (j = 0 ; j < 32 ; j++) + { + if ((c & m) != 0) + break ; + c >>= 1 ; + } + return j ; +} + +#define arithmin (a, b) ((a) < (b) ? (a) : (b)) + +static inline int32_t ALWAYS_INLINE lg3a (int32_t x) +{ + int32_t result ; + + x += 3 ; + result = lead (x) ; + + return 31 - result ; +} + +static inline int32_t ALWAYS_INLINE abs_func (int32_t a) +{ + // note: the CW PPC intrinsic __abs () turns into these instructions so no need to try and use it + int32_t isneg = a >> 31 ; + int32_t xorval = a ^ isneg ; + int32_t result = xorval-isneg ; + + return result ; +} + +#if PRAGMA_MARK +#pragma mark - +#endif + +static inline int32_t dyn_code (int32_t m, int32_t k, int32_t n, uint32_t *outNumBits) +{ + uint32_t divx, mod, de ; + uint32_t numBits ; + uint32_t value ; + + // Assert (n >= 0) ; + + divx = n / m ; + + if (divx >= MAX_PREFIX_16) + { + numBits = MAX_PREFIX_16 + MAX_DATATYPE_BITS_16 ; + value = (((1 << MAX_PREFIX_16) - 1) << MAX_DATATYPE_BITS_16) + n ; + } + else + { + mod = n%m ; + de = (mod == 0) ; + numBits = divx + k + 1 - de ; + value = (((1 << divx) - 1) << (numBits - divx)) + mod + 1 - de ; + + // if coding this way is bigger than doing escape, then do escape + if (numBits > MAX_PREFIX_16 + MAX_DATATYPE_BITS_16) + { + numBits = MAX_PREFIX_16 + MAX_DATATYPE_BITS_16 ; + value = (((1 << MAX_PREFIX_16) - 1) << MAX_DATATYPE_BITS_16) + n ; + } + } + + *outNumBits = numBits ; + + return (int32_t) value ; +} + + +static inline int32_t dyn_code_32bit (int32_t maxbits, uint32_t m, uint32_t k, uint32_t n, uint32_t *outNumBits, uint32_t *outValue, uint32_t *overflow, uint32_t *overflowbits) +{ + uint32_t divx, mod, de ; + uint32_t numBits ; + uint32_t value ; + int32_t didOverflow = 0 ; + + divx = n / m ; + + if (divx < MAX_PREFIX_32) + { + mod = n - (m * divx) ; + + de = (mod == 0) ; + numBits = divx + k + 1 - de ; + value = (((1 << divx) - 1) << (numBits - divx)) + mod + 1 - de ; + if (numBits > 25) + goto codeasescape ; + } + else + { +codeasescape: + numBits = MAX_PREFIX_32 ; + value = (((1 << MAX_PREFIX_32) - 1)) ; + *overflow = n ; + *overflowbits = maxbits ; + didOverflow = 1 ; + } + + *outNumBits = numBits ; + *outValue = value ; + + return didOverflow ; +} + + +static inline void ALWAYS_INLINE dyn_jam_noDeref (unsigned char *out, uint32_t bitPos, uint32_t numBits, uint32_t value) +{ + uint32_t mask ; + uint32_t curr ; + uint32_t shift ; + + //Assert (numBits <= 32) ; + + curr = psf_get_be32 (out, bitPos >> 3) ; + + shift = 32 - (bitPos & 7) - numBits ; + + mask = ~0u >> (32 - numBits) ; // mask must be created in two steps to avoid compiler sequencing ambiguity + mask <<= shift ; + + value = (value << shift) & mask ; + value |= curr & ~mask ; + + psf_put_be32 (out, bitPos >> 3, value) ; +} + + +static inline void ALWAYS_INLINE dyn_jam_noDeref_large (unsigned char *out, uint32_t bitPos, uint32_t numBits, uint32_t value) +{ + uint32_t w ; + uint32_t curr ; + uint32_t mask ; + int32_t shiftvalue = (32 - (bitPos & 7) - numBits) ; + + //Assert (numBits <= 32) ; + + curr = psf_get_be32 (out, bitPos >> 3) ; + + if (shiftvalue < 0) + { + uint8_t tailbyte ; + uint8_t *tailptr ; + + w = value >> -shiftvalue ; + mask = ~0u >> -shiftvalue ; + w |= (curr & ~mask) ; + + tailptr = out + (bitPos >> 3) + 4 ; + tailbyte = (value << ((8+shiftvalue))) & 0xff ; + *tailptr = (uint8_t) tailbyte ; + } + else + { + mask = ~0u >> (32 - numBits) ; + mask <<= shiftvalue ; // mask must be created in two steps to avoid compiler sequencing ambiguity + + w = (value << shiftvalue) & mask ; + w |= curr & ~mask ; + } + + psf_put_be32 (out, bitPos >> 3, w) ; +} + + +int32_t dyn_comp (AGParamRecPtr params, int32_t * pc, BitBuffer * bitstream, int32_t numSamples, int32_t bitSize, uint32_t * outNumBits) +{ + unsigned char * out ; + uint32_t bitPos, startPos ; + uint32_t m, k, n, c, mz, nz ; + uint32_t numBits ; + uint32_t value ; + int32_t del, zmode ; + uint32_t overflow, overflowbits ; + int32_t status ; + + // shadow the variables in params so there's not the dereferencing overhead + uint32_t mb, pb, kb, wb ; + int32_t rowPos = 0 ; + int32_t rowSize = params->sw ; + int32_t rowJump = (params->fw) - rowSize ; + int32_t * inPtr = pc ; + + *outNumBits = 0 ; + RequireAction ((bitSize >= 1) && (bitSize <= 32), return kALAC_ParamError ;) ; + + out = bitstream->cur ; + startPos = bitstream->bitIndex ; + bitPos = startPos ; + + mb = params->mb = params->mb0 ; + pb = params->pb ; + kb = params->kb ; + wb = params->wb ; + zmode = 0 ; + + c = 0 ; + status = ALAC_noErr ; + + while (c < (uint32_t) numSamples) + { + m = mb >> QBSHIFT ; + k = lg3a (m) ; + if (k > kb) + { + k = kb ; + } + m = (1 << k) - 1 ; + + del = *inPtr++ ; + rowPos++ ; + + n = (abs_func (del) << 1) - ((del >> 31) & 1) - zmode ; + //Assert (32-lead (n) <= bitSize) ; + + if (dyn_code_32bit (bitSize, m, k, n, &numBits, &value, &overflow, &overflowbits)) + { + dyn_jam_noDeref (out, bitPos, numBits, value) ; + bitPos += numBits ; + dyn_jam_noDeref_large (out, bitPos, overflowbits, overflow) ; + bitPos += overflowbits ; + } + else + { + dyn_jam_noDeref (out, bitPos, numBits, value) ; + bitPos += numBits ; + } + + c++ ; + if (rowPos >= rowSize) + { + rowPos = 0 ; + inPtr += rowJump ; + } + + mb = pb * (n + zmode) + mb - ((pb * mb) >> QBSHIFT) ; + + // update mean tracking if it's overflowed + if (n > N_MAX_MEAN_CLAMP) + mb = N_MEAN_CLAMP_VAL ; + + zmode = 0 ; + + RequireAction (c <= (uint32_t) numSamples, status = kALAC_ParamError ; goto Exit ;) ; + + if (((mb << MMULSHIFT) < QB) && (c < (uint32_t) numSamples)) + { + zmode = 1 ; + nz = 0 ; + + while (c < (uint32_t) numSamples && *inPtr == 0) + { + /* Take care of wrap-around globals. */ + ++inPtr ; + ++nz ; + ++c ; + if (++rowPos >= rowSize) + { + rowPos = 0 ; + inPtr += rowJump ; + } + + if (nz >= 65535) + { + zmode = 0 ; + break ; + } + } + + k = lead (mb) - BITOFF + ((mb + MOFF) >> MDENSHIFT) ; + mz = ((1 << k) - 1) & wb ; + + value = dyn_code (mz, k, nz, &numBits) ; + dyn_jam_noDeref (out, bitPos, numBits, value) ; + bitPos += numBits ; + + mb = 0 ; + } + } + + *outNumBits = (bitPos - startPos) ; + BitBufferAdvance (bitstream, *outNumBits) ; + +Exit: + return status ; +} diff --git a/lib-src/libsndfile/src/ALAC/aglib.h b/lib-src/libsndfile/src/ALAC/aglib.h new file mode 100644 index 000000000..825c4bdfd --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/aglib.h @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: aglib.h + + Copyright: (C) 2001-2011 Apple, Inc. +*/ + +#ifndef AGLIB_H +#define AGLIB_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define QBSHIFT 9 +#define QB (1 << QBSHIFT) +#define PB0 40 +#define MB0 10 +#define KB0 14 +#define MAX_RUN_DEFAULT 255 + +#define MMULSHIFT 2 +#define MDENSHIFT (QBSHIFT - MMULSHIFT - 1) +#define MOFF ((1 << (MDENSHIFT - 2))) + +#define BITOFF 24 + +/* Max. prefix of 1's. */ +#define MAX_PREFIX_16 9 +#define MAX_PREFIX_TOLONG_16 15 +#define MAX_PREFIX_32 9 + +/* Max. bits in 16-bit data type */ +#define MAX_DATATYPE_BITS_16 16 + +typedef struct AGParamRec +{ + uint32_t mb, mb0, pb, kb, wb, qb ; + uint32_t fw, sw ; + + uint32_t maxrun ; + + // fw = 1, sw = 1 ; + +} AGParamRec, *AGParamRecPtr ; + +struct BitBuffer ; + +void set_standard_ag_params (AGParamRecPtr params, uint32_t fullwidth, uint32_t sectorwidth) ; +void set_ag_params (AGParamRecPtr params, uint32_t m, uint32_t p, uint32_t k, uint32_t f, uint32_t s, uint32_t maxrun) ; + +int32_t dyn_comp (AGParamRecPtr params, int32_t * pc, struct BitBuffer * bitstream, int32_t numSamples, int32_t bitSize, uint32_t * outNumBits) ; +int32_t dyn_decomp (AGParamRecPtr params, struct BitBuffer * bitstream, int32_t * pc, int32_t numSamples, int32_t maxSize, uint32_t * outNumBits) ; + + +#ifdef __cplusplus +} +#endif + +#endif //#ifndef AGLIB_H diff --git a/lib-src/libsndfile/src/ALAC/alac_codec.h b/lib-src/libsndfile/src/ALAC/alac_codec.h new file mode 100644 index 000000000..c73347d12 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/alac_codec.h @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2012-2014 Erik de Castro Lopo + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: alac_codec.h +*/ + +#ifndef ALAC_CODEC_H +#define ALAC_CODEC_H + +#include + +#include "ALACAudioTypes.h" + +#define ALAC_FRAME_LENGTH 4096 + +struct BitBuffer ; + +typedef struct alac_decoder_s +{ + // decoding parameters (public for use in the analyzer) + ALACSpecificConfig mConfig ; + + uint16_t mActiveElements ; + + // decoding buffers + int32_t mMixBufferU [ALAC_FRAME_LENGTH] ; + int32_t mMixBufferV [ALAC_FRAME_LENGTH] ; + union + { + int32_t mPredictor [ALAC_FRAME_LENGTH] ; + uint16_t mShiftBuffer [ALAC_FRAME_LENGTH] ; + } ; + uint32_t mNumChannels ; +} ALAC_DECODER ; + +typedef struct alac_encoder_s +{ + // ALAC encoder parameters + int16_t mBitDepth ; + + // encoding state + int16_t mLastMixRes [kALACMaxChannels] ; + + int32_t mFastMode ; + + // encoding buffers + int32_t mMixBufferU [ALAC_FRAME_LENGTH] ; + int32_t mMixBufferV [ALAC_FRAME_LENGTH] ; + int32_t mPredictorU [ALAC_FRAME_LENGTH] ; + int32_t mPredictorV [ALAC_FRAME_LENGTH] ; + uint16_t mShiftBufferUV [2 * ALAC_FRAME_LENGTH] ; + uint8_t mWorkBuffer [4 * ALAC_FRAME_LENGTH] ; + + // per-channel coefficients buffers + int16_t mCoefsU [kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs] ; + int16_t mCoefsV [kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs] ; + + // encoding statistics + uint32_t mTotalBytesGenerated ; + uint32_t mAvgBitRate ; + uint32_t mMaxFrameBytes ; + uint32_t mFrameSize ; + uint32_t mMaxOutputBytes ; + uint32_t mNumChannels ; + uint32_t mOutputSampleRate ; +} ALAC_ENCODER ; + + +int32_t alac_decoder_init (ALAC_DECODER *p, void * inMagicCookie, uint32_t inMagicCookieSize) ; +int32_t alac_encoder_init (ALAC_ENCODER *p, uint32_t samplerate, uint32_t channels, uint32_t format_flags, uint32_t frameSize) ; + +int32_t alac_decode (ALAC_DECODER *, struct BitBuffer * bits, int32_t * sampleBuffer, + uint32_t numSamples, uint32_t * outNumSamples) ; + +int32_t alac_encode (ALAC_ENCODER *p, uint32_t numSamples, + const int32_t * theReadBuffer, unsigned char * theWriteBuffer, + uint32_t * ioNumBytes) ; + +void alac_set_fastmode (ALAC_ENCODER * p, int32_t fast) ; + +uint32_t alac_get_magic_cookie_size (uint32_t inNumChannels) ; +void alac_get_magic_cookie (ALAC_ENCODER *p, void * config, uint32_t * ioSize) ; +void alac_get_source_format (ALAC_ENCODER *p, const AudioFormatDescription * source, AudioFormatDescription * output) ; + +#endif diff --git a/lib-src/libsndfile/src/ALAC/alac_decoder.c b/lib-src/libsndfile/src/ALAC/alac_decoder.c new file mode 100644 index 000000000..6c124e650 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/alac_decoder.c @@ -0,0 +1,652 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2012-2015 Erik de Castro Lopo + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: ALACDecoder.cpp +*/ + +#include +#include +#include +#include + +#include "alac_codec.h" + +#include "dplib.h" +#include "aglib.h" +#include "matrixlib.h" +#include "shift.h" + +#include "ALACBitUtilities.h" +#include "EndianPortable.h" + +typedef enum +{ false = 0, + true = 1 +} bool ; + +// constants/data +const uint32_t kMaxBitDepth = 32 ; // max allowed bit depth is 32 + + +// prototypes +static int32_t alac_fill_element (struct BitBuffer * bits) ; +static int32_t alac_data_stream_element (struct BitBuffer * bits) ; + +static void Zero32 (int32_t * buffer, uint32_t numItems, uint32_t stride) ; + + +/* + Init () + - initialize the decoder with the given configuration +*/ +int32_t +alac_decoder_init (ALAC_DECODER *p, void * inMagicCookie, uint32_t inMagicCookieSize) +{ + int32_t status = ALAC_noErr ; + ALACSpecificConfig theConfig ; + uint8_t * theActualCookie = (uint8_t *) inMagicCookie ; + uint32_t theCookieBytesRemaining = inMagicCookieSize ; + + // For historical reasons the decoder needs to be resilient to magic cookies vended by older encoders. + // As specified in the ALACMagicCookieDescription.txt document, there may be additional data encapsulating + // the ALACSpecificConfig. This would consist of format ('frma') and 'alac' atoms which precede the + // ALACSpecificConfig. + // See ALACMagicCookieDescription.txt for additional documentation concerning the 'magic cookie' + + // skip format ('frma') atom if present + if (theActualCookie [4] == 'f' && theActualCookie [5] == 'r' && theActualCookie [6] == 'm' && theActualCookie [7] == 'a') + { + theActualCookie += 12 ; + theCookieBytesRemaining -= 12 ; + } + + // skip 'alac' atom header if present + if (theActualCookie [4] == 'a' && theActualCookie [5] == 'l' && theActualCookie [6] == 'a' && theActualCookie [7] == 'c') + { + theActualCookie += 12 ; + theCookieBytesRemaining -= 12 ; + } + + // read the ALACSpecificConfig + if (theCookieBytesRemaining >= sizeof (ALACSpecificConfig)) + { + theConfig.frameLength = psf_get_be32 (theActualCookie, offsetof (ALACSpecificConfig, frameLength)) ; + + if (theConfig.frameLength > ALAC_FRAME_LENGTH) + return fALAC_FrameLengthError ; + + theConfig.compatibleVersion = theActualCookie [offsetof (ALACSpecificConfig, compatibleVersion)] ; + theConfig.bitDepth = theActualCookie [offsetof (ALACSpecificConfig, bitDepth)] ; + theConfig.pb = theActualCookie [offsetof (ALACSpecificConfig, pb)] ; + theConfig.mb = theActualCookie [offsetof (ALACSpecificConfig, mb)] ; + theConfig.kb = theActualCookie [offsetof (ALACSpecificConfig, kb)] ; + theConfig.numChannels = theActualCookie [offsetof (ALACSpecificConfig, numChannels)] ; + theConfig.maxRun = psf_get_be16 (theActualCookie, offsetof (ALACSpecificConfig, maxRun)) ; + theConfig.maxFrameBytes = psf_get_be32 (theActualCookie, offsetof (ALACSpecificConfig, maxFrameBytes)) ; + theConfig.avgBitRate = psf_get_be32 (theActualCookie, offsetof (ALACSpecificConfig, avgBitRate)) ; + theConfig.sampleRate = psf_get_be32 (theActualCookie, offsetof (ALACSpecificConfig, sampleRate)) ; + + p->mConfig = theConfig ; + p->mNumChannels = theConfig.numChannels ; + + RequireAction (p->mConfig.compatibleVersion <= kALACVersion, return kALAC_IncompatibleVersion ;) ; + RequireAction ((p->mConfig.bitDepth >= 8 && p->mConfig.bitDepth <= 32), return kALAC_BadBitWidth ;) ; + RequireAction ((p->mMixBufferU != NULL) && (p->mMixBufferV != NULL) && (p->mPredictor != NULL), + status = kALAC_MemFullError ; goto Exit ;) ; + } + else + { + status = kALAC_BadSpecificConfigSize ; + } + + // skip to Channel Layout Info + // theActualCookie += sizeof (ALACSpecificConfig) ; + + // Currently, the Channel Layout Info portion of the magic cookie (as defined in the + // ALACMagicCookieDescription.txt document) is unused by the decoder. + +Exit: + return status ; +} + +/* + Decode () + - the decoded samples are interleaved into the output buffer in the order they arrive in + the bitstream +*/ +int32_t +alac_decode (ALAC_DECODER *p, struct BitBuffer * bits, int32_t * sampleBuffer, uint32_t numSamples, uint32_t * outNumSamples) +{ + BitBuffer shiftBits ; + uint32_t bits1, bits2 ; + uint8_t tag ; + uint8_t elementInstanceTag ; + AGParamRec agParams ; + uint32_t channelIndex ; + int16_t coefsU [32] ; // max possible size is 32 although NUMCOEPAIRS is the current limit + int16_t coefsV [32] ; + uint8_t numU, numV ; + uint8_t mixBits ; + int8_t mixRes ; + uint16_t unusedHeader ; + uint8_t escapeFlag ; + uint32_t chanBits ; + uint8_t bytesShifted ; + uint32_t shift ; + uint8_t modeU, modeV ; + uint32_t denShiftU, denShiftV ; + uint16_t pbFactorU, pbFactorV ; + uint16_t pb ; + int32_t * out32 ; + uint8_t headerByte ; + uint8_t partialFrame ; + uint32_t extraBits ; + int32_t val ; + uint32_t i, j ; + int32_t status ; + uint32_t numChannels = p->mNumChannels ; + + RequireAction ((bits != NULL) && (sampleBuffer != NULL) && (outNumSamples != NULL), return kALAC_ParamError ;) ; + RequireAction (p->mNumChannels > 0, return kALAC_ZeroChannelCount ;) ; + + p->mActiveElements = 0 ; + channelIndex = 0 ; + + status = ALAC_noErr ; + *outNumSamples = numSamples ; + + while (status == ALAC_noErr) + { + // bail if we ran off the end of the buffer + RequireAction (bits->cur < bits->end, status = kALAC_ParamError ; goto Exit ;) ; + + // copy global decode params for this element + pb = p->mConfig.pb ; + + // read element tag + tag = BitBufferReadSmall (bits, 3) ; + switch (tag) + { + case ID_SCE: + case ID_LFE: + { + // mono/LFE channel + elementInstanceTag = BitBufferReadSmall (bits, 4) ; + p->mActiveElements |= (1u << elementInstanceTag) ; + + // read the 12 unused header bits + unusedHeader = (uint16_t) BitBufferRead (bits, 12) ; + RequireAction (unusedHeader == 0, status = kALAC_ParamError ; goto Exit ;) ; + + // read the 1-bit "partial frame" flag, 2-bit "shift-off" flag & 1-bit "escape" flag + headerByte = (uint8_t) BitBufferRead (bits, 4) ; + + partialFrame = headerByte >> 3 ; + + bytesShifted = (headerByte >> 1) & 0x3u ; + RequireAction (bytesShifted != 3, status = kALAC_ParamError ; goto Exit ;) ; + + shift = bytesShifted * 8 ; + + escapeFlag = headerByte & 0x1 ; + + chanBits = p->mConfig.bitDepth - (bytesShifted * 8) ; + + // check for partial frame to override requested numSamples + if (partialFrame != 0) + { + numSamples = BitBufferRead (bits, 16) << 16 ; + numSamples |= BitBufferRead (bits, 16) ; + + RequireAction (numSamples < kALACDefaultFramesPerPacket, return kALAC_NumSamplesTooBig ;) ; + } + + if (escapeFlag == 0) + { + // compressed frame, read rest of parameters + mixBits = (uint8_t) BitBufferRead (bits, 8) ; + mixRes = (int8_t) BitBufferRead (bits, 8) ; + //Assert ((mixBits == 0) && (mixRes == 0)) ; // no mixing for mono + + headerByte = (uint8_t) BitBufferRead (bits, 8) ; + modeU = headerByte >> 4 ; + denShiftU = headerByte & 0xfu ; + + headerByte = (uint8_t) BitBufferRead (bits, 8) ; + pbFactorU = headerByte >> 5 ; + numU = headerByte & 0x1fu ; + + for (i = 0 ; i < numU ; i++) + coefsU [i] = (int16_t) BitBufferRead (bits, 16) ; + + // if shift active, skip the shift buffer but remember where it starts + if (bytesShifted != 0) + { + shiftBits = *bits ; + BitBufferAdvance (bits, (bytesShifted * 8) * numSamples) ; + } + + // decompress + set_ag_params (&agParams, p->mConfig.mb, (pb * pbFactorU) / 4, p->mConfig.kb, numSamples, numSamples, p->mConfig.maxRun) ; + status = dyn_decomp (&agParams, bits, p->mPredictor, numSamples, chanBits, &bits1) ; + RequireNoErr (status, goto Exit ;) ; + + if (modeU == 0) + { + unpc_block (p->mPredictor, p->mMixBufferU, numSamples, &coefsU [0], numU, chanBits, denShiftU) ; + } + else + { + // the special "numActive == 31" mode can be done in-place + unpc_block (p->mPredictor, p->mPredictor, numSamples, NULL, 31, chanBits, 0) ; + unpc_block (p->mPredictor, p->mMixBufferU, numSamples, &coefsU [0], numU, chanBits, denShiftU) ; + } + } + else + { + //Assert (bytesShifted == 0) ; + + // uncompressed frame, copy data into the mix buffer to use common output code + shift = 32 - chanBits ; + if (chanBits <= 16) + { + for (i = 0 ; i < numSamples ; i++) + { + val = (int32_t) BitBufferRead (bits, (uint8_t) chanBits) ; + val = (val << shift) >> shift ; + p->mMixBufferU [i] = val ; + } + } + else + { + // BitBufferRead () can't read more than 16 bits at a time so break up the reads + extraBits = chanBits - 16 ; + for (i = 0 ; i < numSamples ; i++) + { + val = (int32_t) BitBufferRead (bits, 16) ; + val = arith_shift_left (val, 16) >> shift ; + p->mMixBufferU [i] = val | BitBufferRead (bits, (uint8_t) extraBits) ; + } + } + + mixBits = mixRes = 0 ; + bits1 = chanBits * numSamples ; + bytesShifted = 0 ; + } + + // now read the shifted values into the shift buffer + if (bytesShifted != 0) + { + shift = bytesShifted * 8 ; + //Assert (shift <= 16) ; + + for (i = 0 ; i < numSamples ; i++) + p->mShiftBuffer [i] = (uint16_t) BitBufferRead (&shiftBits, (uint8_t) shift) ; + } + + // convert 32-bit integers into output buffer + switch (p->mConfig.bitDepth) + { + case 16: + out32 = sampleBuffer + channelIndex ; + for (i = 0, j = 0 ; i < numSamples ; i++, j += numChannels) + out32 [j] = arith_shift_left (p->mMixBufferU [i], 16) ; + break ; + case 20: + out32 = sampleBuffer + channelIndex ; + copyPredictorTo20 (p->mMixBufferU, out32, numChannels, numSamples) ; + break ; + case 24: + out32 = sampleBuffer + channelIndex ; + if (bytesShifted != 0) + copyPredictorTo24Shift (p->mMixBufferU, p->mShiftBuffer, out32, numChannels, numSamples, bytesShifted) ; + else + copyPredictorTo24 (p->mMixBufferU, out32, numChannels, numSamples) ; + break ; + case 32: + out32 = sampleBuffer + channelIndex ; + if (bytesShifted != 0) + copyPredictorTo32Shift (p->mMixBufferU, p->mShiftBuffer, out32, numChannels, numSamples, bytesShifted) ; + else + copyPredictorTo32 (p->mMixBufferU, out32, numChannels, numSamples) ; + break ; + } + + channelIndex += 1 ; + *outNumSamples = numSamples ; + break ; + } + + case ID_CPE: + { + // if decoding this pair would take us over the max channels limit, bail + if ((channelIndex + 2) > numChannels) + goto NoMoreChannels ; + + // stereo channel pair + elementInstanceTag = BitBufferReadSmall (bits, 4) ; + p->mActiveElements |= (1u << elementInstanceTag) ; + + // read the 12 unused header bits + unusedHeader = (uint16_t) BitBufferRead (bits, 12) ; + RequireAction (unusedHeader == 0, status = kALAC_ParamError ; goto Exit ;) ; + + // read the 1-bit "partial frame" flag, 2-bit "shift-off" flag & 1-bit "escape" flag + headerByte = (uint8_t) BitBufferRead (bits, 4) ; + + partialFrame = headerByte >> 3 ; + + bytesShifted = (headerByte >> 1) & 0x3u ; + RequireAction (bytesShifted != 3, status = kALAC_ParamError ; goto Exit ;) ; + + shift = bytesShifted * 8 ; + + escapeFlag = headerByte & 0x1 ; + + chanBits = p->mConfig.bitDepth - (bytesShifted * 8) + 1 ; + + // check for partial frame length to override requested numSamples + if (partialFrame != 0) + { + numSamples = BitBufferRead (bits, 16) << 16 ; + numSamples |= BitBufferRead (bits, 16) ; + + RequireAction (numSamples < kALACDefaultFramesPerPacket, return kALAC_NumSamplesTooBig ;) ; + } + + if (escapeFlag == 0) + { + // compressed frame, read rest of parameters + mixBits = (uint8_t) BitBufferRead (bits, 8) ; + mixRes = (int8_t) BitBufferRead (bits, 8) ; + + headerByte = (uint8_t) BitBufferRead (bits, 8) ; + modeU = headerByte >> 4 ; + denShiftU = headerByte & 0xfu ; + + headerByte = (uint8_t) BitBufferRead (bits, 8) ; + pbFactorU = headerByte >> 5 ; + numU = headerByte & 0x1fu ; + for (i = 0 ; i < numU ; i++) + coefsU [i] = (int16_t) BitBufferRead (bits, 16) ; + + headerByte = (uint8_t) BitBufferRead (bits, 8) ; + modeV = headerByte >> 4 ; + denShiftV = headerByte & 0xfu ; + + headerByte = (uint8_t) BitBufferRead (bits, 8) ; + pbFactorV = headerByte >> 5 ; + numV = headerByte & 0x1fu ; + for (i = 0 ; i < numV ; i++) + coefsV [i] = (int16_t) BitBufferRead (bits, 16) ; + + // if shift active, skip the interleaved shifted values but remember where they start + if (bytesShifted != 0) + { + shiftBits = *bits ; + BitBufferAdvance (bits, (bytesShifted * 8) * 2 * numSamples) ; + } + + // decompress and run predictor for "left" channel + set_ag_params (&agParams, p->mConfig.mb, (pb * pbFactorU) / 4, p->mConfig.kb, numSamples, numSamples, p->mConfig.maxRun) ; + status = dyn_decomp (&agParams, bits, p->mPredictor, numSamples, chanBits, &bits1) ; + RequireNoErr (status, goto Exit ;) ; + + if (modeU == 0) + { + unpc_block (p->mPredictor, p->mMixBufferU, numSamples, &coefsU [0], numU, chanBits, denShiftU) ; + } + else + { + // the special "numActive == 31" mode can be done in-place + unpc_block (p->mPredictor, p->mPredictor, numSamples, NULL, 31, chanBits, 0) ; + unpc_block (p->mPredictor, p->mMixBufferU, numSamples, &coefsU [0], numU, chanBits, denShiftU) ; + } + + // decompress and run predictor for "right" channel + set_ag_params (&agParams, p->mConfig.mb, (pb * pbFactorV) / 4, p->mConfig.kb, numSamples, numSamples, p->mConfig.maxRun) ; + status = dyn_decomp (&agParams, bits, p->mPredictor, numSamples, chanBits, &bits2) ; + RequireNoErr (status, goto Exit ;) ; + + if (modeV == 0) + { + unpc_block (p->mPredictor, p->mMixBufferV, numSamples, &coefsV [0], numV, chanBits, denShiftV) ; + } + else + { + // the special "numActive == 31" mode can be done in-place + unpc_block (p->mPredictor, p->mPredictor, numSamples, NULL, 31, chanBits, 0) ; + unpc_block (p->mPredictor, p->mMixBufferV, numSamples, &coefsV [0], numV, chanBits, denShiftV) ; + } + } + else + { + //Assert (bytesShifted == 0) ; + + // uncompressed frame, copy data into the mix buffers to use common output code + chanBits = p->mConfig.bitDepth ; + shift = 32 - chanBits ; + if (chanBits <= 16) + { + for (i = 0 ; i < numSamples ; i++) + { + val = (int32_t) BitBufferRead (bits, (uint8_t) chanBits) ; + val = (val << shift) >> shift ; + p->mMixBufferU [i] = val ; + + val = (int32_t) BitBufferRead (bits, (uint8_t) chanBits) ; + val = (val << shift) >> shift ; + p->mMixBufferV [i] = val ; + } + } + else + { + // BitBufferRead () can't read more than 16 bits at a time so break up the reads + extraBits = chanBits - 16 ; + for (i = 0 ; i < numSamples ; i++) + { + val = (int32_t) BitBufferRead (bits, 16) ; + val = (((uint32_t) val) << 16) >> shift ; + p->mMixBufferU [i] = val | BitBufferRead (bits, (uint8_t) extraBits) ; + + val = (int32_t) BitBufferRead (bits, 16) ; + val = ((uint32_t) val) >> shift ; + p->mMixBufferV [i] = val | BitBufferRead (bits, (uint8_t) extraBits) ; + } + } + + bits1 = chanBits * numSamples ; + bits2 = chanBits * numSamples ; + mixBits = mixRes = 0 ; + bytesShifted = 0 ; + } + + // now read the shifted values into the shift buffer + if (bytesShifted != 0) + { + shift = bytesShifted * 8 ; + //Assert (shift <= 16) ; + + for (i = 0 ; i < (numSamples * 2) ; i += 2) + { + p->mShiftBuffer [i + 0] = (uint16_t) BitBufferRead (&shiftBits, (uint8_t) shift) ; + p->mShiftBuffer [i + 1] = (uint16_t) BitBufferRead (&shiftBits, (uint8_t) shift) ; + } + } + + // un-mix the data and convert to output format + // - note that mixRes = 0 means just interleave so we use that path for uncompressed frames + switch (p->mConfig.bitDepth) + { + case 16: + out32 = sampleBuffer + channelIndex ; + unmix16 (p->mMixBufferU, p->mMixBufferV, out32, numChannels, numSamples, mixBits, mixRes) ; + break ; + case 20: + out32 = sampleBuffer + channelIndex ; + unmix20 (p->mMixBufferU, p->mMixBufferV, out32, numChannels, numSamples, mixBits, mixRes) ; + break ; + case 24: + out32 = sampleBuffer + channelIndex ; + unmix24 (p->mMixBufferU, p->mMixBufferV, out32, numChannels, numSamples, + mixBits, mixRes, p->mShiftBuffer, bytesShifted) ; + break ; + case 32: + out32 = sampleBuffer + channelIndex ; + unmix32 (p->mMixBufferU, p->mMixBufferV, out32, numChannels, numSamples, + mixBits, mixRes, p->mShiftBuffer, bytesShifted) ; + break ; + } + + channelIndex += 2 ; + *outNumSamples = numSamples ; + break ; + } + + case ID_CCE: + case ID_PCE: + { + // unsupported element, bail + //AssertNoErr (tag) ; + status = kALAC_UnsupportedElement ; + break ; + } + + case ID_DSE: + { + // data stream element -- parse but ignore + status = alac_data_stream_element (bits) ; + break ; + } + + case ID_FIL: + { + // fill element -- parse but ignore + status = alac_fill_element (bits) ; + break ; + } + + case ID_END: + { + // frame end, all done so byte align the frame and check for overruns + BitBufferByteAlign (bits, false) ; + //Assert (bits->cur == bits->end) ; + goto Exit ; + } + } + +#if 0 // ! DEBUG + // if we've decoded all of our channels, bail (but not in debug b/c we want to know if we're seeing bad bits) + // - this also protects us if the config does not match the bitstream or crap data bits follow the audio bits + if (channelIndex >= numChannels) + break ; +#endif + } + +NoMoreChannels: + + // if we get here and haven't decoded all of the requested channels, fill the remaining channels with zeros + for ( ; channelIndex < numChannels ; channelIndex++) + { + int32_t * fill32 = sampleBuffer + channelIndex ; + Zero32 (fill32, numSamples, numChannels) ; + } + +Exit: + return status ; +} + +#if PRAGMA_MARK +#pragma mark - +#endif + +/* + FillElement () + - they're just filler so we don't need 'em +*/ +static int32_t +alac_fill_element (struct BitBuffer * bits) +{ + int16_t count ; + + // 4-bit count or (4-bit + 8-bit count) if 4-bit count == 15 + // - plus this weird -1 thing I still don't fully understand + count = BitBufferReadSmall (bits, 4) ; + if (count == 15) + count += (int16_t) BitBufferReadSmall (bits, 8) - 1 ; + + BitBufferAdvance (bits, count * 8) ; + + RequireAction (bits->cur <= bits->end, return kALAC_ParamError ;) ; + + return ALAC_noErr ; +} + +/* + DataStreamElement () + - we don't care about data stream elements so just skip them +*/ +static int32_t +alac_data_stream_element (struct BitBuffer * bits) +{ + int32_t data_byte_align_flag ; + uint16_t count ; + + // the tag associates this data stream element with a given audio element + + /* element_instance_tag = */ BitBufferReadSmall (bits, 4) ; + + data_byte_align_flag = BitBufferReadOne (bits) ; + + // 8-bit count or (8-bit + 8-bit count) if 8-bit count == 255 + count = BitBufferReadSmall (bits, 8) ; + if (count == 255) + count += BitBufferReadSmall (bits, 8) ; + + // the align flag means the bitstream should be byte-aligned before reading the following data bytes + if (data_byte_align_flag) + BitBufferByteAlign (bits, false) ; + + // skip the data bytes + BitBufferAdvance (bits, count * 8) ; + + RequireAction (bits->cur <= bits->end, return kALAC_ParamError ;) ; + + return ALAC_noErr ; +} + +/* + ZeroN () + - helper routines to clear out output channel buffers when decoding fewer channels than requested +*/ +static void Zero32 (int32_t * buffer, uint32_t numItems, uint32_t stride) +{ + if (stride == 1) + { + memset (buffer, 0, numItems * sizeof (int32_t)) ; + } + else + { + for (uint32_t indx = 0 ; indx < (numItems * stride) ; indx += stride) + buffer [indx] = 0 ; + } +} diff --git a/lib-src/libsndfile/src/ALAC/alac_decoder.h b/lib-src/libsndfile/src/ALAC/alac_decoder.h new file mode 100644 index 000000000..8a4359226 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/alac_decoder.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: alac_decoder.h +*/ + +#ifndef ALAC_DECODER_H +#define ALAC_DECODER_H + +#include + +#include "ALACAudioTypes.h" + +typedef enum +{ + false = 0, + ALAC_TRUE = 1 +} bool ; + +struct BitBuffer ; + +typedef struct alac_decoder +{ + // decoding parameters (public for use in the analyzer) + ALACSpecificConfig mConfig ; + + uint16_t mActiveElements ; + + // decoding buffers + int32_t * mMixBufferU ; + int32_t * mMixBufferV ; + int32_t * mPredictor ; + uint16_t * mShiftBuffer ; // note: this points to mPredictor's memory but different + // variable for clarity and type difference +} alac_decoder ; + +alac_decoder * alac_decoder_new (void) ; +void alac_decoder_delete (alac_decoder *) ; + +int32_t alac_init (alac_decoder *p, void * inMagicCookie, uint32_t inMagicCookieSize) ; +int32_t alac_decode (alac_decoder *, struct BitBuffer * bits, uint8_t * sampleBuffer, uint32_t numSamples, uint32_t numChannels, uint32_t * outNumSamples) ; + +#endif /* ALAC_DECODER_H */ diff --git a/lib-src/libsndfile/src/ALAC/alac_encoder.c b/lib-src/libsndfile/src/ALAC/alac_encoder.c new file mode 100644 index 000000000..599399afe --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/alac_encoder.c @@ -0,0 +1,1333 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2012-2015 Erik de Castro Lopo + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: ALACEncoder.cpp +*/ + +// build stuff +#define VERBOSE_DEBUG 0 +#define DebugMsg printf + +// headers +#include +#include +#include + +#include "sfendian.h" + +#include "alac_codec.h" + +#include "aglib.h" +#include "dplib.h" +#include "matrixlib.h" + +#include "ALACBitUtilities.h" +#include "ALACAudioTypes.h" +#include "EndianPortable.h" + +typedef enum +{ + false = 0, + true = 1 +} bool ; + +static void GetConfig (ALAC_ENCODER *p, ALACSpecificConfig * config) ; + +static int32_t EncodeStereo (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ; +static int32_t EncodeStereoFast (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ; +static int32_t EncodeStereoEscape (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t numSamples) ; +static int32_t EncodeMono (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ; + + + +// Note: in C you can't typecast to a 2-dimensional array pointer but that's what we need when +// picking which coefs to use so we declare this typedef b/c we *can* typecast to this type +typedef int16_t (*SearchCoefs) [kALACMaxCoefs] ; + +// defines/constants +const uint32_t kALACEncoderMagic = MAKE_MARKER ('d', 'p', 'g', 'e') ; +const uint32_t kMaxSampleSize = 32 ; // max allowed bit width is 32 +const uint32_t kDefaultMixBits = 2 ; +const uint32_t kDefaultMixRes = 0 ; +const uint32_t kMaxRes = 4 ; +const uint32_t kDefaultNumUV = 8 ; +const uint32_t kMinUV = 4 ; +const uint32_t kMaxUV = 8 ; + +// static functions +#if VERBOSE_DEBUG +static void AddFiller (BitBuffer * bits, int32_t numBytes) ; +#endif + + +/* + Map Format: 3-bit field per channel which is the same as the "element tag" that should be placed + at the beginning of the frame for that channel. Indicates whether SCE, CPE, or LFE. + Each particular field is accessed via the current channel indx. Note that the channel + indx increments by two for channel pairs. + + For example: + + C L R 3-channel input = (ID_CPE << 3) | (ID_SCE) + indx 0 value = (map & (0x7ul << (0 * 3))) >> (0 * 3) + indx 1 value = (map & (0x7ul << (1 * 3))) >> (1 * 3) + + C L R Ls Rs LFE 5.1-channel input = (ID_LFE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE) + indx 0 value = (map & (0x7ul << (0 * 3))) >> (0 * 3) + indx 1 value = (map & (0x7ul << (1 * 3))) >> (1 * 3) + indx 3 value = (map & (0x7ul << (3 * 3))) >> (3 * 3) + indx 5 value = (map & (0x7ul << (5 * 3))) >> (5 * 3) + indx 7 value = (map & (0x7ul << (7 * 3))) >> (7 * 3) +*/ +static const uint32_t sChannelMaps [kALACMaxChannels] = +{ + ID_SCE, + ID_CPE, + (ID_CPE << 3) | (ID_SCE), + (ID_SCE << 9) | (ID_CPE << 3) | (ID_SCE), + (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE), + (ID_SCE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE), + (ID_SCE << 18) | (ID_SCE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE), + (ID_SCE << 21) | (ID_CPE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE) +} ; + +#if PRAGMA_MARK +#pragma mark - +#endif + +void +alac_set_fastmode (ALAC_ENCODER * p, int32_t fast) +{ + p->mFastMode = fast ; +} + + +/* + HEADER SPECIFICATION + + For every segment we adopt the following header: + + 1 byte reserved (always 0) + 1 byte flags (see below) + [4 byte frame length] (optional, see below) + ---Next, the per-segment ALAC parameters--- + 1 byte mixBits (middle-side parameter) + 1 byte mixRes (middle-side parameter, interpreted as signed char) + + 1 byte shiftU (4 bits modeU, 4 bits denShiftU) + 1 byte filterU (3 bits pbFactorU, 5 bits numU) + (numU) shorts (signed DP coefficients for V channel) + ---Next, 2nd-channel ALAC parameters in case of stereo mode--- + 1 byte shiftV (4 bits modeV, 4 bits denShiftV) + 1 byte filterV (3 bits pbFactorV, 5 bits numV) + (numV) shorts (signed DP coefficients for V channel) + ---After this come the shift-off bytes for (>= 24)-bit data (n-byte shift) if indicated--- + ---Then comes the AG-compressor bitstream--- + + + FLAGS + ----- + + The presence of certain flag bits changes the header format such that the parameters might + not even be sent. The currently defined flags format is: + + 0000psse + + where 0 = reserved, must be 0 + p = 1-bit field "partial frame" flag indicating 32-bit frame length follows this byte + ss = 2-bit field indicating "number of shift-off bytes ignored by compression" + e = 1-bit field indicating "escape" + + The "partial frame" flag means that the following segment is not equal to the frame length specified + in the out-of-band decoder configuration. This allows the decoder to deal with end-of-file partial + segments without incurring the 32-bit overhead for each segment. + + The "shift-off" field indicates the number of bytes at the bottom of the word that were passed through + uncompressed. The reason for this is that the entropy inherent in the LS bytes of >= 24-bit words + quite often means that the frame would have to be "escaped" b/c the compressed size would be >= the + uncompressed size. However, by shifting the input values down and running the remaining bits through + the normal compression algorithm, a net win can be achieved. If this field is non-zero, it means that + the shifted-off bytes follow after the parameter section of the header and before the compressed + bitstream. Note that doing this also allows us to use matrixing on 32-bit inputs after one or more + bytes are shifted off the bottom which helps the eventual compression ratio. For stereo channels, + the shifted off bytes are interleaved. + + The "escape" flag means that this segment was not compressed b/c the compressed size would be + >= uncompressed size. In that case, the audio data was passed through uncompressed after the header. + The other header parameter bytes will not be sent. + + + PARAMETERS + ---------- + + If the segment is not a partial or escape segment, the total header size (in bytes) is given exactly by: + + 4 + (2 + 2 * numU) (mono mode) + 4 + (2 + 2 * numV) + (2 + 2 * numV) (stereo mode) + + where the ALAC filter-lengths numU, numV are bounded by a + constant (in the current source, numU, numV <= NUMCOEPAIRS), and + this forces an absolute upper bound on header size. + + Each segment-decode process loads up these bytes from the front of the + local stream, in the above order, then follows with the entropy-encoded + bits for the given segment. + + To generalize middle-side, there are various mixing modes including middle-side, each lossless, + as embodied in the mix () and unmix () functions. These functions exploit a generalized middle-side + transformation: + + u := [(rL + (m-r)R)/m] ; + v := L - R ; + + where [ ] denotes integer floor. The (lossless) inverse is + + L = u + v - [rV/m] ; + R = L - v ; + + In the segment header, m and r are encoded in mixBits and mixRes. + Classical "middle-side" is obtained with m = 2, r = 1, but now + we have more generalized mixes. + + NOTES + ----- + The relevance of the ALAC coefficients is explained in detail + in patent documents. +*/ + +/* + EncodeStereo () + - encode a channel pair +*/ +static int32_t +EncodeStereo (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) +{ + BitBuffer workBits ; + BitBuffer startBits = *bitstream ; // squirrel away copy of current state in case we need to go back and do an escape packet + AGParamRec agParams ; + uint32_t bits1, bits2 ; + uint32_t dilate ; + int32_t mixBits, mixRes, maxRes ; + uint32_t minBits, minBits1, minBits2 ; + uint32_t numU, numV ; + uint32_t mode ; + uint32_t pbFactor ; + uint32_t chanBits ; + uint8_t bytesShifted ; + SearchCoefs coefsU ; + SearchCoefs coefsV ; + uint32_t indx ; + uint8_t partialFrame ; + uint32_t escapeBits ; + bool doEscape ; + int32_t status = ALAC_noErr ; + int32_t bestRes ; + + // make sure we handle this bit-depth before we get going + RequireAction ((p->mBitDepth == 16) || (p->mBitDepth == 20) || (p->mBitDepth == 24) || (p->mBitDepth == 32), return kALAC_ParamError ;) ; + + // reload coefs pointers for this channel pair + // - note that, while you might think they should be re-initialized per block, retaining state across blocks + // actually results in better overall compression + // - strangely, re-using the same coefs for the different passes of the "mixRes" search loop instead of using + // different coefs for the different passes of "mixRes" results in even better compression + coefsU = (SearchCoefs) p->mCoefsU [channelIndex] ; + coefsV = (SearchCoefs) p->mCoefsV [channelIndex] ; + + // matrix encoding adds an extra bit but 32-bit inputs cannot be matrixed b/c 33 is too many + // so enable 16-bit "shift off" and encode in 17-bit mode + // - in addition, 24-bit mode really improves with one byte shifted off + if (p->mBitDepth == 32) + bytesShifted = 2 ; + else if (p->mBitDepth >= 24) + bytesShifted = 1 ; + else + bytesShifted = 0 ; + + chanBits = p->mBitDepth - (bytesShifted * 8) + 1 ; + + // flag whether or not this is a partial frame + partialFrame = (numSamples == p->mFrameSize) ? 0 : 1 ; + + // brute-force encode optimization loop + // - run over variations of the encoding params to find the best choice + mixBits = kDefaultMixBits ; + maxRes = kMaxRes ; + numU = numV = kDefaultNumUV ; + mode = 0 ; + pbFactor = 4 ; + dilate = 8 ; + + minBits = minBits1 = minBits2 = 1ul << 31 ; + + bestRes = p->mLastMixRes [channelIndex] ; + + for (mixRes = 0 ; mixRes <= maxRes ; mixRes++) + { + // mix the stereo inputs + switch (p->mBitDepth) + { + case 16: + mix16 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples / dilate, mixBits, mixRes) ; + break ; + case 20: + mix20 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples / dilate, mixBits, mixRes) ; + break ; + case 24: + // includes extraction of shifted-off bytes + mix24 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples / dilate, + mixBits, mixRes, p->mShiftBufferUV, bytesShifted) ; + break ; + case 32: + // includes extraction of shifted-off bytes + mix32 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples / dilate, + mixBits, mixRes, p->mShiftBufferUV, bytesShifted) ; + break ; + } + + BitBufferInit (&workBits, p->mWorkBuffer, p->mMaxOutputBytes) ; + + // run the dynamic predictors + pc_block (p->mMixBufferU, p->mPredictorU, numSamples / dilate, coefsU [numU - 1], numU, chanBits, DENSHIFT_DEFAULT) ; + pc_block (p->mMixBufferV, p->mPredictorV, numSamples / dilate, coefsV [numV - 1], numV, chanBits, DENSHIFT_DEFAULT) ; + + // run the lossless compressor on each channel + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples / dilate, numSamples / dilate, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorU, &workBits, numSamples / dilate, chanBits, &bits1) ; + RequireNoErr (status, goto Exit ;) ; + + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples / dilate, numSamples / dilate, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorV, &workBits, numSamples / dilate, chanBits, &bits2) ; + RequireNoErr (status, goto Exit ;) ; + + // look for best match + if ((bits1 + bits2) < minBits1) + { + minBits1 = bits1 + bits2 ; + bestRes = mixRes ; + } + } + + p->mLastMixRes [channelIndex] = (int16_t) bestRes ; + + // mix the stereo inputs with the current best mixRes + mixRes = p->mLastMixRes [channelIndex] ; + switch (p->mBitDepth) + { + case 16: + mix16 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, mixBits, mixRes) ; + break ; + case 20: + mix20 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, mixBits, mixRes) ; + break ; + case 24: + // also extracts the shifted off bytes into the shift buffers + mix24 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, + mixBits, mixRes, p->mShiftBufferUV, bytesShifted) ; + break ; + case 32: + // also extracts the shifted off bytes into the shift buffers + mix32 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, + mixBits, mixRes, p->mShiftBufferUV, bytesShifted) ; + break ; + } + + // now it's time for the predictor coefficient search loop + numU = numV = kMinUV ; + minBits1 = minBits2 = 1ul << 31 ; + + for (uint32_t numUV = kMinUV ; numUV <= kMaxUV ; numUV += 4) + { + BitBufferInit (&workBits, p->mWorkBuffer, p->mMaxOutputBytes) ; + + dilate = 32 ; + + // run the predictor over the same data multiple times to help it converge + for (uint32_t converge = 0 ; converge < 8 ; converge++) + { + pc_block (p->mMixBufferU, p->mPredictorU, numSamples / dilate, coefsU [numUV-1], numUV, chanBits, DENSHIFT_DEFAULT) ; + pc_block (p->mMixBufferV, p->mPredictorV, numSamples / dilate, coefsV [numUV-1], numUV, chanBits, DENSHIFT_DEFAULT) ; + } + + dilate = 8 ; + + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples / dilate, numSamples / dilate, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorU, &workBits, numSamples / dilate, chanBits, &bits1) ; + + if ((bits1 * dilate + 16 * numUV) < minBits1) + { + minBits1 = bits1 * dilate + 16 * numUV ; + numU = numUV ; + } + + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples / dilate, numSamples / dilate, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorV, &workBits, numSamples / dilate, chanBits, &bits2) ; + + if ((bits2 * dilate + 16 * numUV) < minBits2) + { + minBits2 = bits2 * dilate + 16 * numUV ; + numV = numUV ; + } + } + + // test for escape hatch if best calculated compressed size turns out to be more than the input size + minBits = minBits1 + minBits2 + (8 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0) ; + if (bytesShifted != 0) + minBits += (numSamples * (bytesShifted * 8) * 2) ; + + escapeBits = (numSamples * p->mBitDepth * 2) + ((partialFrame == true) ? 32 : 0) + (2 * 8) ; /* 2 common header bytes */ + + doEscape = (minBits >= escapeBits) ? true : false ; + + if (doEscape == false) + { + // write bitstream header and coefs + BitBufferWrite (bitstream, 0, 12) ; + BitBufferWrite (bitstream, (partialFrame << 3) | (bytesShifted << 1), 4) ; + if (partialFrame) + BitBufferWrite (bitstream, numSamples, 32) ; + BitBufferWrite (bitstream, mixBits, 8) ; + BitBufferWrite (bitstream, mixRes, 8) ; + + //Assert ((mode < 16) && (DENSHIFT_DEFAULT < 16)) ; + //Assert ((pbFactor < 8) && (numU < 32)) ; + //Assert ((pbFactor < 8) && (numV < 32)) ; + + BitBufferWrite (bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8) ; + BitBufferWrite (bitstream, (pbFactor << 5) | numU, 8) ; + for (indx = 0 ; indx < numU ; indx++) + BitBufferWrite (bitstream, coefsU [numU - 1][indx], 16) ; + + BitBufferWrite (bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8) ; + BitBufferWrite (bitstream, (pbFactor << 5) | numV, 8) ; + for (indx = 0 ; indx < numV ; indx++) + BitBufferWrite (bitstream, coefsV [numV - 1][indx], 16) ; + + // if shift active, write the interleaved shift buffers + if (bytesShifted != 0) + { + uint32_t bitShift = bytesShifted * 8 ; + + //Assert (bitShift <= 16) ; + + for (indx = 0 ; indx < (numSamples * 2) ; indx += 2) + { + uint32_t shiftedVal ; + + shiftedVal = ((uint32_t) p->mShiftBufferUV [indx + 0] << bitShift) | (uint32_t) p->mShiftBufferUV [indx + 1] ; + BitBufferWrite (bitstream, shiftedVal, bitShift * 2) ; + } + } + + // run the dynamic predictor and lossless compression for the "left" channel + // - note: to avoid allocating more buffers, we're mixing and matching between the available buffers instead + // of only using "U" buffers for the U-channel and "V" buffers for the V-channel + if (mode == 0) + { + pc_block (p->mMixBufferU, p->mPredictorU, numSamples, coefsU [numU - 1], numU, chanBits, DENSHIFT_DEFAULT) ; + } + else + { + pc_block (p->mMixBufferU, p->mPredictorV, numSamples, coefsU [numU - 1], numU, chanBits, DENSHIFT_DEFAULT) ; + pc_block (p->mPredictorV, p->mPredictorU, numSamples, NULL, 31, chanBits, 0) ; + } + + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorU, bitstream, numSamples, chanBits, &bits1) ; + RequireNoErr (status, goto Exit ;) ; + + // run the dynamic predictor and lossless compression for the "right" channel + if (mode == 0) + { + pc_block (p->mMixBufferV, p->mPredictorV, numSamples, coefsV [numV - 1], numV, chanBits, DENSHIFT_DEFAULT) ; + } + else + { + pc_block (p->mMixBufferV, p->mPredictorU, numSamples, coefsV [numV - 1], numV, chanBits, DENSHIFT_DEFAULT) ; + pc_block (p->mPredictorU, p->mPredictorV, numSamples, NULL, 31, chanBits, 0) ; + } + + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorV, bitstream, numSamples, chanBits, &bits2) ; + RequireNoErr (status, goto Exit ;) ; + + /* if we happened to create a compressed packet that was actually bigger than an escape packet would be, + chuck it and do an escape packet + */ + minBits = BitBufferGetPosition (bitstream) - BitBufferGetPosition (&startBits) ; + if (minBits >= escapeBits) + { + *bitstream = startBits ; // reset bitstream state + doEscape = true ; + printf ("compressed frame too big: %u vs. %u \n", minBits, escapeBits) ; + } + } + + if (doEscape == true) + { + /* escape */ + status = EncodeStereoEscape (p, bitstream, inputBuffer, stride, numSamples) ; + +#if VERBOSE_DEBUG + DebugMsg ("escape!: %u vs %u\n", minBits, escapeBits) ; +#endif + } + +Exit: + return status ; +} + +/* + EncodeStereoFast () + - encode a channel pair without the search loop for maximum possible speed +*/ +static int32_t +EncodeStereoFast (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) +{ + BitBuffer startBits = *bitstream ; // squirrel away current bit position in case we decide to use escape hatch + AGParamRec agParams ; + uint32_t bits1, bits2 ; + int32_t mixBits, mixRes ; + uint32_t minBits, minBits1, minBits2 ; + uint32_t numU, numV ; + uint32_t mode ; + uint32_t pbFactor ; + uint32_t chanBits ; + uint8_t bytesShifted ; + SearchCoefs coefsU ; + SearchCoefs coefsV ; + uint32_t indx ; + uint8_t partialFrame ; + uint32_t escapeBits ; + bool doEscape ; + int32_t status ; + + // make sure we handle this bit-depth before we get going + RequireAction ((p->mBitDepth == 16) || (p->mBitDepth == 20) || (p->mBitDepth == 24) || (p->mBitDepth == 32), return kALAC_ParamError ;) ; + + // reload coefs pointers for this channel pair + // - note that, while you might think they should be re-initialized per block, retaining state across blocks + // actually results in better overall compression + // - strangely, re-using the same coefs for the different passes of the "mixRes" search loop instead of using + // different coefs for the different passes of "mixRes" results in even better compression + coefsU = (SearchCoefs) p->mCoefsU [channelIndex] ; + coefsV = (SearchCoefs) p->mCoefsV [channelIndex] ; + + // matrix encoding adds an extra bit but 32-bit inputs cannot be matrixed b/c 33 is too many + // so enable 16-bit "shift off" and encode in 17-bit mode + // - in addition, 24-bit mode really improves with one byte shifted off + if (p->mBitDepth == 32) + bytesShifted = 2 ; + else if (p->mBitDepth >= 24) + bytesShifted = 1 ; + else + bytesShifted = 0 ; + + chanBits = p->mBitDepth - (bytesShifted * 8) + 1 ; + + // flag whether or not this is a partial frame + partialFrame = (numSamples == p->mFrameSize) ? 0 : 1 ; + + // set up default encoding parameters for "fast" mode + mixBits = kDefaultMixBits ; + mixRes = kDefaultMixRes ; + numU = numV = kDefaultNumUV ; + mode = 0 ; + pbFactor = 4 ; + + minBits = minBits1 = minBits2 = 1ul << 31 ; + + // mix the stereo inputs with default mixBits/mixRes + switch (p->mBitDepth) + { + case 16: + mix16 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, mixBits, mixRes) ; + break ; + case 20: + mix20 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, mixBits, mixRes) ; + break ; + case 24: + // also extracts the shifted off bytes into the shift buffers + mix24 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, + mixBits, mixRes, p->mShiftBufferUV, bytesShifted) ; + break ; + case 32: + // also extracts the shifted off bytes into the shift buffers + mix32 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, + mixBits, mixRes, p->mShiftBufferUV, bytesShifted) ; + break ; + } + + /* speculatively write the bitstream assuming the compressed version will be smaller */ + + // write bitstream header and coefs + BitBufferWrite (bitstream, 0, 12) ; + BitBufferWrite (bitstream, (partialFrame << 3) | (bytesShifted << 1), 4) ; + if (partialFrame) + BitBufferWrite (bitstream, numSamples, 32) ; + BitBufferWrite (bitstream, mixBits, 8) ; + BitBufferWrite (bitstream, mixRes, 8) ; + + //Assert ((mode < 16) && (DENSHIFT_DEFAULT < 16)) ; + //Assert ((pbFactor < 8) && (numU < 32)) ; + //Assert ((pbFactor < 8) && (numV < 32)) ; + + BitBufferWrite (bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8) ; + BitBufferWrite (bitstream, (pbFactor << 5) | numU, 8) ; + for (indx = 0 ; indx < numU ; indx++) + BitBufferWrite (bitstream, coefsU [numU - 1][indx], 16) ; + + BitBufferWrite (bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8) ; + BitBufferWrite (bitstream, (pbFactor << 5) | numV, 8) ; + for (indx = 0 ; indx < numV ; indx++) + BitBufferWrite (bitstream, coefsV [numV - 1][indx], 16) ; + + // if shift active, write the interleaved shift buffers + if (bytesShifted != 0) + { + uint32_t bitShift = bytesShifted * 8 ; + + //Assert (bitShift <= 16) ; + + for (indx = 0 ; indx < (numSamples * 2) ; indx += 2) + { + uint32_t shiftedVal ; + + shiftedVal = ((uint32_t) p->mShiftBufferUV [indx + 0] << bitShift) | (uint32_t) p->mShiftBufferUV [indx + 1] ; + BitBufferWrite (bitstream, shiftedVal, bitShift * 2) ; + } + } + + // run the dynamic predictor and lossless compression for the "left" channel + // - note: we always use mode 0 in the "fast" path so we don't need the code for mode != 0 + pc_block (p->mMixBufferU, p->mPredictorU, numSamples, coefsU [numU - 1], numU, chanBits, DENSHIFT_DEFAULT) ; + + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorU, bitstream, numSamples, chanBits, &bits1) ; + RequireNoErr (status, goto Exit ;) ; + + // run the dynamic predictor and lossless compression for the "right" channel + pc_block (p->mMixBufferV, p->mPredictorV, numSamples, coefsV [numV - 1], numV, chanBits, DENSHIFT_DEFAULT) ; + + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorV, bitstream, numSamples, chanBits, &bits2) ; + RequireNoErr (status, goto Exit ;) ; + + // do bit requirement calculations + minBits1 = bits1 + (numU * sizeof (int16_t) * 8) ; + minBits2 = bits2 + (numV * sizeof (int16_t) * 8) ; + + // test for escape hatch if best calculated compressed size turns out to be more than the input size + minBits = minBits1 + minBits2 + (8 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0) ; + if (bytesShifted != 0) + minBits += (numSamples * (bytesShifted * 8) * 2) ; + + escapeBits = (numSamples * p->mBitDepth * 2) + ((partialFrame == true) ? 32 : 0) + (2 * 8) ; /* 2 common header bytes */ + + doEscape = (minBits >= escapeBits) ? true : false ; + + if (doEscape == false) + { + /* if we happened to create a compressed packet that was actually bigger than an escape packet would be, + chuck it and do an escape packet + */ + minBits = BitBufferGetPosition (bitstream) - BitBufferGetPosition (&startBits) ; + if (minBits >= escapeBits) + { + doEscape = true ; + printf ("compressed frame too big: %u vs. %u\n", minBits, escapeBits) ; + } + + } + + if (doEscape == true) + { + /* escape */ + + // reset bitstream position since we speculatively wrote the compressed version + *bitstream = startBits ; + + // write escape frame + status = EncodeStereoEscape (p, bitstream, inputBuffer, stride, numSamples) ; + +#if VERBOSE_DEBUG + DebugMsg ("escape!: %u vs %u\n", minBits, (numSamples * p->mBitDepth * 2)) ; +#endif + } + +Exit: + return status ; +} + +/* + EncodeStereoEscape () + - encode stereo escape frame +*/ +static int32_t +EncodeStereoEscape (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * inputBuffer, uint32_t stride, uint32_t numSamples) +{ + uint8_t partialFrame ; + uint32_t indx ; + + // flag whether or not this is a partial frame + partialFrame = (numSamples == p->mFrameSize) ? 0 : 1 ; + + // write bitstream header + BitBufferWrite (bitstream, 0, 12) ; + BitBufferWrite (bitstream, (partialFrame << 3) | 1, 4) ; // LSB = 1 means "frame not compressed" + if (partialFrame) + BitBufferWrite (bitstream, numSamples, 32) ; + + // just copy the input data to the output buffer + switch (p->mBitDepth) + { + case 16: + for (indx = 0 ; indx < (numSamples * stride) ; indx += stride) + { + BitBufferWrite (bitstream, inputBuffer [indx + 0] >> 16, 16) ; + BitBufferWrite (bitstream, inputBuffer [indx + 1] >> 16, 16) ; + } + break ; + case 20: + for (indx = 0 ; indx < (numSamples * stride) ; indx += stride) + { + BitBufferWrite (bitstream, inputBuffer [indx + 0] >> 12, 16) ; + BitBufferWrite (bitstream, inputBuffer [indx + 1] >> 12, 16) ; + } + break ; + case 24: + // mix24 () with mixres param = 0 means de-interleave so use it to simplify things + mix24 (inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, 0, 0, p->mShiftBufferUV, 0) ; + for (indx = 0 ; indx < numSamples ; indx++) + { + BitBufferWrite (bitstream, p->mMixBufferU [indx] >> 8, 24) ; + BitBufferWrite (bitstream, p->mMixBufferV [indx] >> 8, 24) ; + } + break ; + case 32: + for (indx = 0 ; indx < (numSamples * stride) ; indx += stride) + { + BitBufferWrite (bitstream, inputBuffer [indx + 0], 32) ; + BitBufferWrite (bitstream, inputBuffer [indx + 1], 32) ; + } + break ; + } + + return ALAC_noErr ; +} + +/* + EncodeMono () + - encode a mono input buffer +*/ +static int32_t +EncodeMono (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) +{ + BitBuffer startBits = *bitstream ; // squirrel away copy of current state in case we need to go back and do an escape packet + AGParamRec agParams ; + uint32_t bits1 ; + uint32_t numU ; + SearchCoefs coefsU ; + uint32_t dilate ; + uint32_t minBits, bestU ; + uint32_t minU, maxU ; + uint32_t indx, indx2 ; + uint8_t bytesShifted ; + uint32_t shift ; + uint32_t mask ; + uint32_t chanBits ; + uint8_t pbFactor ; + uint8_t partialFrame ; + uint32_t escapeBits ; + bool doEscape ; + int32_t status = ALAC_noErr ; + + + // make sure we handle this bit-depth before we get going + RequireAction ((p->mBitDepth == 16) || (p->mBitDepth == 20) || (p->mBitDepth == 24) || (p->mBitDepth == 32), return kALAC_ParamError ;) ; + + // reload coefs array from previous frame + coefsU = (SearchCoefs) p->mCoefsU [channelIndex] ; + + // pick bit depth for actual encoding + // - we lop off the lower byte (s) for 24-/32-bit encodings + if (p->mBitDepth == 32) + bytesShifted = 2 ; + else if (p->mBitDepth >= 24) + bytesShifted = 1 ; + else + bytesShifted = 0 ; + + shift = bytesShifted * 8 ; + mask = (1ul << shift) - 1 ; + chanBits = p->mBitDepth - (bytesShifted * 8) ; + + // flag whether or not this is a partial frame + partialFrame = (numSamples == p->mFrameSize) ? 0 : 1 ; + + // convert N-bit data to 32-bit for predictor + switch (p->mBitDepth) + { + case 16: + // convert 16-bit data to 32-bit for predictor + for (indx = 0, indx2 = 0 ; indx < numSamples ; indx++, indx2 += stride) + p->mMixBufferU [indx] = inputBuffer [indx2] >> 16 ; + break ; + + case 20: + // convert 20-bit data to 32-bit for predictor + for (indx = 0, indx2 = 0 ; indx < numSamples ; indx++, indx2 += stride) + p->mMixBufferU [indx] = inputBuffer [indx2] >> 12 ; + break ; + case 24: + // convert 24-bit data to 32-bit for the predictor and extract the shifted off byte (s) + for (indx = 0, indx2 = 0 ; indx < numSamples ; indx++, indx2 += stride) + { + p->mMixBufferU [indx] = inputBuffer [indx2] >> 8 ; + p->mShiftBufferUV [indx] = (uint16_t) (p->mMixBufferU [indx] & mask) ; + p->mMixBufferU [indx] >>= shift ; + } + + break ; + case 32: + // just copy the 32-bit input data for the predictor and extract the shifted off byte (s) + for (indx = 0, indx2 = 0 ; indx < numSamples ; indx++, indx2 += stride) + { + p->mShiftBufferUV [indx] = (uint16_t) (inputBuffer [indx2] & mask) ; + p->mMixBufferU [indx] = inputBuffer [indx2] >> shift ; + } + break ; + } + + // brute-force encode optimization loop (implied "encode depth" of 0 if comparing to cmd line tool) + // - run over variations of the encoding params to find the best choice + minU = 4 ; + maxU = 8 ; + minBits = 1ul << 31 ; + pbFactor = 4 ; + + bestU = minU ; + + for (numU = minU ; numU <= maxU ; numU += 4) + { + BitBuffer workBits ; + uint32_t numBits ; + + BitBufferInit (&workBits, p->mWorkBuffer, p->mMaxOutputBytes) ; + + dilate = 32 ; + for (uint32_t converge = 0 ; converge < 7 ; converge++) + pc_block (p->mMixBufferU, p->mPredictorU, numSamples / dilate, coefsU [numU - 1], numU, chanBits, DENSHIFT_DEFAULT) ; + + dilate = 8 ; + pc_block (p->mMixBufferU, p->mPredictorU, numSamples / dilate, coefsU [numU - 1], numU, chanBits, DENSHIFT_DEFAULT) ; + + set_ag_params (&agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples / dilate, numSamples / dilate, MAX_RUN_DEFAULT) ; + status = dyn_comp (&agParams, p->mPredictorU, &workBits, numSamples / dilate, chanBits, &bits1) ; + RequireNoErr (status, goto Exit ;) ; + + numBits = (dilate * bits1) + (16 * numU) ; + if (numBits < minBits) + { + bestU = numU ; + minBits = numBits ; + } + } + + // test for escape hatch if best calculated compressed size turns out to be more than the input size + // - first, add bits for the header bytes mixRes/maxRes/shiftU/filterU + minBits += (4 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0) ; + if (bytesShifted != 0) + minBits += (numSamples * (bytesShifted * 8)) ; + + escapeBits = (numSamples * p->mBitDepth) + ((partialFrame == true) ? 32 : 0) + (2 * 8) ; /* 2 common header bytes */ + + doEscape = (minBits >= escapeBits) ? true : false ; + + if (doEscape == false) + { + // write bitstream header + BitBufferWrite (bitstream, 0, 12) ; + BitBufferWrite (bitstream, (partialFrame << 3) | (bytesShifted << 1), 4) ; + if (partialFrame) + BitBufferWrite (bitstream, numSamples, 32) ; + BitBufferWrite (bitstream, 0, 16) ; // mixBits = mixRes = 0 + + // write the params and predictor coefs + numU = bestU ; + BitBufferWrite (bitstream, (0 << 4) | DENSHIFT_DEFAULT, 8) ; // modeU = 0 + BitBufferWrite (bitstream, (pbFactor << 5) | numU, 8) ; + for (indx = 0 ; indx < numU ; indx++) + BitBufferWrite (bitstream, coefsU [numU-1][indx], 16) ; + + // if shift active, write the interleaved shift buffers + if (bytesShifted != 0) + { + for (indx = 0 ; indx < numSamples ; indx++) + BitBufferWrite (bitstream, p->mShiftBufferUV [indx], shift) ; + } + + // run the dynamic predictor with the best result + pc_block (p->mMixBufferU, p->mPredictorU, numSamples, coefsU [numU-1], numU, chanBits, DENSHIFT_DEFAULT) ; + + // do lossless compression + set_standard_ag_params (&agParams, numSamples, numSamples) ; + status = dyn_comp (&agParams, p->mPredictorU, bitstream, numSamples, chanBits, &bits1) ; + //AssertNoErr (status) ; + + + /* if we happened to create a compressed packet that was actually bigger than an escape packet would be, + chuck it and do an escape packet + */ + minBits = BitBufferGetPosition (bitstream) - BitBufferGetPosition (&startBits) ; + if (minBits >= escapeBits) + { + *bitstream = startBits ; // reset bitstream state + doEscape = true ; + printf ("compressed frame too big: %u vs. %u\n", minBits, escapeBits) ; + } + } + + if (doEscape == true) + { + // write bitstream header and coefs + BitBufferWrite (bitstream, 0, 12) ; + BitBufferWrite (bitstream, (partialFrame << 3) | 1, 4) ; // LSB = 1 means "frame not compressed" + if (partialFrame) + BitBufferWrite (bitstream, numSamples, 32) ; + + // just copy the input data to the output buffer + switch (p->mBitDepth) + { + case 16: + for (indx = 0 ; indx < (numSamples * stride) ; indx += stride) + BitBufferWrite (bitstream, inputBuffer [indx] >> 16, 16) ; + break ; + case 20: + // convert 20-bit data to 32-bit for simplicity + for (indx = 0 ; indx < (numSamples * stride) ; indx += stride) + BitBufferWrite (bitstream, inputBuffer [indx] >> 12, 20) ; + break ; + case 24: + // convert 24-bit data to 32-bit for simplicity + for (indx = 0, indx2 = 0 ; indx < numSamples ; indx++, indx2 += stride) + { + p->mMixBufferU [indx] = inputBuffer [indx2] >> 8 ; + BitBufferWrite (bitstream, p->mMixBufferU [indx], 24) ; + } + break ; + case 32: + for (indx = 0 ; indx < (numSamples * stride) ; indx += stride) + BitBufferWrite (bitstream, inputBuffer [indx], 32) ; + break ; + } +#if VERBOSE_DEBUG + DebugMsg ("escape!: %u vs %u\n", minBits, (numSamples * p->mBitDepth)) ; +#endif + } + +Exit: + return status ; +} + +#if PRAGMA_MARK +#pragma mark - +#endif + +/* + Encode () + - encode the next block of samples +*/ +int32_t +alac_encode (ALAC_ENCODER *p, uint32_t numSamples, + const int32_t * theReadBuffer, unsigned char * theWriteBuffer, uint32_t * ioNumBytes) +{ + uint32_t outputSize ; + BitBuffer bitstream ; + int32_t status ; + uint32_t numChannels = p->mNumChannels ; + + // make sure we handle this bit-depth before we get going + RequireAction ((p->mBitDepth == 16) || (p->mBitDepth == 20) || (p->mBitDepth == 24) || (p->mBitDepth == 32), return kALAC_ParamError ;) ; + + // create a bit buffer structure pointing to our output buffer + BitBufferInit (&bitstream, theWriteBuffer, p->mMaxOutputBytes) ; + + if (numChannels == 2) + { + // add 3-bit frame start tag ID_CPE = channel pair & 4-bit element instance tag = 0 + BitBufferWrite (&bitstream, ID_CPE, 3) ; + BitBufferWrite (&bitstream, 0, 4) ; + + // encode stereo input buffer + if (p->mFastMode == false) + status = EncodeStereo (p, &bitstream, theReadBuffer, 2, 0, numSamples) ; + else + status = EncodeStereoFast (p, &bitstream, theReadBuffer, 2, 0, numSamples) ; + RequireNoErr (status, goto Exit ;) ; + } + else if (numChannels == 1) + { + // add 3-bit frame start tag ID_SCE = mono channel & 4-bit element instance tag = 0 + BitBufferWrite (&bitstream, ID_SCE, 3) ; + BitBufferWrite (&bitstream, 0, 4) ; + + // encode mono input buffer + status = EncodeMono (p, &bitstream, theReadBuffer, 1, 0, numSamples) ; + RequireNoErr (status, goto Exit ;) ; + } + else + { + const int32_t * inputBuffer ; + uint32_t tag ; + uint32_t channelIndex ; + uint8_t stereoElementTag ; + uint8_t monoElementTag ; + uint8_t lfeElementTag ; + + inputBuffer = theReadBuffer ; + + stereoElementTag = 0 ; + monoElementTag = 0 ; + lfeElementTag = 0 ; + + for (channelIndex = 0 ; channelIndex < numChannels ;) + { + tag = (sChannelMaps [numChannels - 1] & (0x7ul << (channelIndex * 3))) >> (channelIndex * 3) ; + + BitBufferWrite (&bitstream, tag, 3) ; + switch (tag) + { + case ID_SCE: + // mono + BitBufferWrite (&bitstream, monoElementTag, 4) ; + + status = EncodeMono (p, &bitstream, inputBuffer, numChannels, channelIndex, numSamples) ; + + inputBuffer += 1 ; + channelIndex++ ; + monoElementTag++ ; + break ; + + case ID_CPE: + // stereo + BitBufferWrite (&bitstream, stereoElementTag, 4) ; + + status = EncodeStereo (p, &bitstream, inputBuffer, numChannels, channelIndex, numSamples) ; + + inputBuffer += 2 ; + channelIndex += 2 ; + stereoElementTag++ ; + break ; + + case ID_LFE: + // LFE channel (subwoofer) + BitBufferWrite (&bitstream, lfeElementTag, 4) ; + + status = EncodeMono (p, &bitstream, inputBuffer, numChannels, channelIndex, numSamples) ; + + inputBuffer += 1 ; + channelIndex++ ; + lfeElementTag++ ; + break ; + + default: + printf ("That ain't right! (%u)\n", tag) ; + status = kALAC_ParamError ; + goto Exit ; + } + + RequireNoErr (status, goto Exit ;) ; + } + } + +#if VERBOSE_DEBUG +{ + // if there is room left in the output buffer, add some random fill data to test decoder + int32_t bitsLeft ; + int32_t bytesLeft ; + + bitsLeft = BitBufferGetPosition (&bitstream) - 3 ; // - 3 for ID_END tag + bytesLeft = bitstream.byteSize - ((bitsLeft + 7) / 8) ; + + if ((bytesLeft > 20) && ((bytesLeft & 0x4u) != 0)) + AddFiller (&bitstream, bytesLeft) ; +} +#endif + + // add 3-bit frame end tag: ID_END + BitBufferWrite (&bitstream, ID_END, 3) ; + + // byte-align the output data + BitBufferByteAlign (&bitstream, true) ; + + outputSize = BitBufferGetPosition (&bitstream) / 8 ; + //Assert (outputSize <= mMaxOutputBytes) ; + + + // all good, let iTunes know what happened and remember the total number of input sample frames + *ioNumBytes = outputSize ; + //mEncodedFrames += encodeMsg->numInputSamples ; + + // gather encoding stats + p->mTotalBytesGenerated += outputSize ; + p->mMaxFrameBytes = MAX (p->mMaxFrameBytes, outputSize) ; + + status = ALAC_noErr ; + +Exit: + return status ; +} + + +#if PRAGMA_MARK +#pragma mark - +#endif + +/* + GetConfig () +*/ +void +GetConfig (ALAC_ENCODER *p, ALACSpecificConfig * config) +{ + config->frameLength = Swap32NtoB (p->mFrameSize) ; + config->compatibleVersion = (uint8_t) kALACCompatibleVersion ; + config->bitDepth = (uint8_t) p->mBitDepth ; + config->pb = (uint8_t) PB0 ; + config->kb = (uint8_t) KB0 ; + config->mb = (uint8_t) MB0 ; + config->numChannels = (uint8_t) p->mNumChannels ; + config->maxRun = Swap16NtoB ((uint16_t) MAX_RUN_DEFAULT) ; + config->maxFrameBytes = Swap32NtoB (p->mMaxFrameBytes) ; + config->avgBitRate = Swap32NtoB (p->mAvgBitRate) ; + config->sampleRate = Swap32NtoB (p->mOutputSampleRate) ; +} + +uint32_t +alac_get_magic_cookie_size (uint32_t inNumChannels) +{ + if (inNumChannels > 2) + { + return sizeof (ALACSpecificConfig) + kChannelAtomSize + sizeof (ALACAudioChannelLayout) ; + } + else + { + return sizeof (ALACSpecificConfig) ; + } +} + +void +alac_get_magic_cookie (ALAC_ENCODER *p, void * outCookie, uint32_t * ioSize) +{ + ALACSpecificConfig theConfig = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } ; + ALACAudioChannelLayout theChannelLayout = { 0, 0, 0 } ; + uint8_t theChannelAtom [kChannelAtomSize] = { 0, 0, 0, 0, 'c', 'h', 'a', 'n', 0, 0, 0, 0 } ; + uint32_t theCookieSize = sizeof (ALACSpecificConfig) ; + uint8_t * theCookiePointer = (uint8_t *) outCookie ; + + GetConfig (p, &theConfig) ; + if (theConfig.numChannels > 2) + { + theChannelLayout.mChannelLayoutTag = Swap32NtoB (ALACChannelLayoutTags [theConfig.numChannels - 1]) ; + theCookieSize += (sizeof (ALACAudioChannelLayout) + kChannelAtomSize) ; + } + if (*ioSize >= theCookieSize) + { + memcpy (theCookiePointer, &theConfig, sizeof (ALACSpecificConfig)) ; + theChannelAtom [3] = (sizeof (ALACAudioChannelLayout) + kChannelAtomSize) ; + if (theConfig.numChannels > 2) + { + theCookiePointer += sizeof (ALACSpecificConfig) ; + memcpy (theCookiePointer, theChannelAtom, kChannelAtomSize) ; + theCookiePointer += kChannelAtomSize ; + memcpy (theCookiePointer, &theChannelLayout, sizeof (ALACAudioChannelLayout)) ; + } + *ioSize = theCookieSize ; + } + else + { + *ioSize = 0 ; // no incomplete cookies + } +} + +/* + alac_encoder_init () + - initialize the encoder component with the current config +*/ +int32_t +alac_encoder_init (ALAC_ENCODER *p, uint32_t samplerate, uint32_t channels, uint32_t format_flags, uint32_t frameSize) +{ + int32_t status ; + + p->mFrameSize = (frameSize > 0 && frameSize <= ALAC_FRAME_LENGTH) ? frameSize : ALAC_FRAME_LENGTH ; + + p->mOutputSampleRate = samplerate ; + p->mNumChannels = channels ; + switch (format_flags) + { + case 1: + p->mBitDepth = 16 ; + break ; + case 2: + p->mBitDepth = 20 ; + break ; + case 3: + p->mBitDepth = 24 ; + break ; + case 4: + p->mBitDepth = 32 ; + break ; + default: + break ; + } + + // set up default encoding parameters and state + // - note: mFrameSize is set in the constructor or via alac_set_frame_size () which must be called before this routine + for (uint32_t indx = 0 ; indx < kALACMaxChannels ; indx++) + p->mLastMixRes [indx] = kDefaultMixRes ; + + // the maximum output frame size can be no bigger than (samplesPerBlock * numChannels * ((10 + sampleSize)/8) + 1) + // but note that this can be bigger than the input size! + // - since we don't yet know what our input format will be, use our max allowed sample size in the calculation + p->mMaxOutputBytes = p->mFrameSize * p->mNumChannels * ((10 + kMaxSampleSize) / 8) + 1 ; + + status = ALAC_noErr ; + + // initialize coefs arrays once b/c retaining state across blocks actually improves the encode ratio + for (int32_t channel = 0 ; channel < (int32_t) p->mNumChannels ; channel++) + { + for (int32_t search = 0 ; search < kALACMaxSearches ; search++) + { + init_coefs (p->mCoefsU [channel][search], DENSHIFT_DEFAULT, kALACMaxCoefs) ; + init_coefs (p->mCoefsV [channel][search], DENSHIFT_DEFAULT, kALACMaxCoefs) ; + } + } + + return status ; +} + +/* + alac_get_source_format () + - given the input format, return one of our supported formats +*/ +void +alac_get_source_format (ALAC_ENCODER *p, const AudioFormatDescription * source, AudioFormatDescription * output) +{ + (void) output ; + // default is 16-bit native endian + // - note: for float input we assume that's coming from one of our decoders (mp3, aac) so it only makes sense + // to encode to 16-bit since the source was lossy in the first place + // - note: if not a supported bit depth, find the closest supported bit depth to the input one + if ((source->mFormatID != kALACFormatLinearPCM) || ((source->mFormatFlags & kALACFormatFlagIsFloat) != 0) || (source->mBitsPerChannel <= 16)) + p->mBitDepth = 16 ; + else if (source->mBitsPerChannel <= 20) + p->mBitDepth = 20 ; + else if (source->mBitsPerChannel <= 24) + p->mBitDepth = 24 ; + else + p->mBitDepth = 32 ; + + // we support 16/20/24/32-bit integer data at any sample rate and our target number of channels + // and sample rate were specified when we were configured + /* + MakeUncompressedAudioFormat (mNumChannels, (float) mOutputSampleRate, mBitDepth, kAudioFormatFlagsNativeIntegerPacked, output) ; + */ +} + + + +#if VERBOSE_DEBUG + +#if PRAGMA_MARK +#pragma mark - +#endif + +/* + AddFiller () + - add fill and data stream elements to the bitstream to test the decoder +*/ +static void AddFiller (BitBuffer * bits, int32_t numBytes) +{ + uint8_t tag ; + int32_t indx ; + + // out of lameness, subtract 6 bytes to deal with header + alignment as required for fill/data elements + numBytes -= 6 ; + if (numBytes <= 0) + return ; + + // randomly pick Fill or Data Stream Element based on numBytes requested + tag = (numBytes & 0x8) ? ID_FIL : ID_DSE ; + + BitBufferWrite (bits, tag, 3) ; + if (tag == ID_FIL) + { + // can't write more than 269 bytes in a fill element + numBytes = (numBytes > 269) ? 269 : numBytes ; + + // fill element = 4-bit size unless >= 15 then 4-bit size + 8-bit extension size + if (numBytes >= 15) + { + uint16_t extensionSize ; + + BitBufferWrite (bits, 15, 4) ; + + // 8-bit extension count field is "extra + 1" which is weird but I didn't define the syntax + // - otherwise, there's no way to represent 15 + // - for example, to really mean 15 bytes you must encode extensionSize = 1 + // - why it's not like data stream elements I have no idea + extensionSize = (numBytes - 15) + 1 ; + //Assert (extensionSize <= 255) ; + BitBufferWrite (bits, extensionSize, 8) ; + } + else + BitBufferWrite (bits, numBytes, 4) ; + + BitBufferWrite (bits, 0x10, 8) ; // extension_type = FILL_DATA = b0001 or'ed with fill_nibble = b0000 + for (indx = 0 ; indx < (numBytes - 1) ; indx++) + BitBufferWrite (bits, 0xa5, 8) ; // fill_byte = b10100101 = 0xa5 + } + else + { + // can't write more than 510 bytes in a data stream element + numBytes = (numBytes > 510) ? 510 : numBytes ; + + BitBufferWrite (bits, 0, 4) ; // element instance tag + BitBufferWrite (bits, 1, 1) ; // byte-align flag = true + + // data stream element = 8-bit size unless >= 255 then 8-bit size + 8-bit size + if (numBytes >= 255) + { + BitBufferWrite (bits, 255, 8) ; + BitBufferWrite (bits, numBytes - 255, 8) ; + } + else + BitBufferWrite (bits, numBytes, 8) ; + + BitBufferByteAlign (bits, true) ; // byte-align with zeros + + for (indx = 0 ; indx < numBytes ; indx++) + BitBufferWrite (bits, 0x5a, 8) ; + } +} + +#endif /* VERBOSE_DEBUG */ diff --git a/lib-src/libsndfile/src/ALAC/dp_dec.c b/lib-src/libsndfile/src/ALAC/dp_dec.c new file mode 100644 index 000000000..4f5bc1d69 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/dp_dec.c @@ -0,0 +1,379 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: dp_dec.c + + Contains: Dynamic Predictor decode routines + + Copyright: (c) 2001-2011 Apple, Inc. +*/ + + +#include + +#include "dplib.h" +#include "shift.h" + +#if __GNUC__ +#define ALWAYS_INLINE __attribute__ ((always_inline)) +#else +#define ALWAYS_INLINE +#endif + +#define LOOP_ALIGN + +static inline int32_t ALWAYS_INLINE +sign_of_int (int32_t i) +{ + int32_t negishift ; + + negishift = ((uint32_t) - i) >> 31 ; + return negishift | (i >> 31) ; +} + +void +unpc_block (const int32_t * pc1, int32_t * out, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift) +{ + register int16_t a0, a1, a2, a3 ; + register int32_t b0, b1, b2, b3 ; + int32_t j, k, lim ; + int32_t sum1, sg, sgn, top, dd ; + int32_t * pout ; + int32_t del, del0 ; + uint32_t chanshift = 32 - chanbits ; + int32_t denhalf = 1 << (denshift - 1) ; + + out [0] = pc1 [0] ; + if (numactive == 0) + { + // just copy if numactive == 0 (but don't bother if in/out pointers the same) + if ((num > 1) && (pc1 != out)) + memcpy (&out [1], &pc1 [1], (num - 1) * sizeof (int32_t)) ; + return ; + } + if (numactive == 31) + { + // short-circuit if numactive == 31 + int32_t prev ; + + /* this code is written such that the in/out buffers can be the same + to conserve buffer space on embedded devices like the iPod + + (original code) + for (j = 1 ; j < num ; j++) + del = pc1 [j] + out [j-1] ; + out [j] = (del << chanshift) >> chanshift ; + */ + prev = out [0] ; + for (j = 1 ; j < num ; j++) + { + del = pc1 [j] + prev ; + prev = (del << chanshift) >> chanshift ; + out [j] = prev ; + } + return ; + } + + for (j = 1 ; j <= numactive ; j++) + { + del = pc1 [j] + out [j-1] ; + out [j] = arith_shift_left (del, chanshift) >> chanshift ; + } + + lim = numactive + 1 ; + + if (numactive == 4) + { + // optimization for numactive == 4 + register int16_t ia0, ia1, ia2, ia3 ; + register int32_t ib0, ib1, ib2, ib3 ; + + ia0 = coefs [0] ; + ia1 = coefs [1] ; + ia2 = coefs [2] ; + ia3 = coefs [3] ; + + for (j = lim ; j < num ; j++) + { + LOOP_ALIGN + + top = out [j - lim] ; + pout = out + j - 1 ; + + ib0 = top - pout [0] ; + ib1 = top - pout [-1] ; + ib2 = top - pout [-2] ; + ib3 = top - pout [-3] ; + + sum1 = (denhalf - ia0 * ib0 - ia1 * ib1 - ia2 * ib2 - ia3 * ib3) >> denshift ; + + del = pc1 [j] ; + del0 = del ; + sg = sign_of_int (del) ; + del += top + sum1 ; + + out [j] = arith_shift_left (del, chanshift) >> chanshift ; + + if (sg > 0) + { + sgn = sign_of_int (ib3) ; + ia3 -= sgn ; + del0 -= (4 - 3) * ((sgn * ib3) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (ib2) ; + ia2 -= sgn ; + del0 -= (4 - 2) * ((sgn * ib2) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (ib1) ; + ia1 -= sgn ; + del0 -= (4 - 1) * ((sgn * ib1) >> denshift) ; + if (del0 <= 0) + continue ; + + ia0 -= sign_of_int (ib0) ; + } + else if (sg < 0) + { + // note: to avoid unnecessary negations, we flip the value of "sgn" + sgn = -sign_of_int (ib3) ; + ia3 -= sgn ; + del0 -= (4 - 3) * ((sgn * ib3) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (ib2) ; + ia2 -= sgn ; + del0 -= (4 - 2) * ((sgn * ib2) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (ib1) ; + ia1 -= sgn ; + del0 -= (4 - 1) * ((sgn * ib1) >> denshift) ; + if (del0 >= 0) + continue ; + + ia0 += sign_of_int (ib0) ; + } + } + + coefs [0] = ia0 ; + coefs [1] = ia1 ; + coefs [2] = ia2 ; + coefs [3] = ia3 ; + } + else if (numactive == 8) + { + register int16_t a4, a5, a6, a7 ; + register int32_t b4, b5, b6, b7 ; + + // optimization for numactive == 8 + a0 = coefs [0] ; + a1 = coefs [1] ; + a2 = coefs [2] ; + a3 = coefs [3] ; + a4 = coefs [4] ; + a5 = coefs [5] ; + a6 = coefs [6] ; + a7 = coefs [7] ; + + for (j = lim ; j < num ; j++) + { + LOOP_ALIGN + + top = out [j - lim] ; + pout = out + j - 1 ; + + b0 = top - (*pout--) ; + b1 = top - (*pout--) ; + b2 = top - (*pout--) ; + b3 = top - (*pout--) ; + b4 = top - (*pout--) ; + b5 = top - (*pout--) ; + b6 = top - (*pout--) ; + b7 = top - (*pout) ; + pout += 8 ; + + sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3 + - a4 * b4 - a5 * b5 - a6 * b6 - a7 * b7) >> denshift ; + + del = pc1 [j] ; + del0 = del ; + sg = sign_of_int (del) ; + del += top + sum1 ; + + out [j] = arith_shift_left (del, chanshift) >> chanshift ; + + if (sg > 0) + { + sgn = sign_of_int (b7) ; + a7 -= sgn ; + del0 -= 1 * ((sgn * b7) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b6) ; + a6 -= sgn ; + del0 -= 2 * ((sgn * b6) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b5) ; + a5 -= sgn ; + del0 -= 3 * ((sgn * b5) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b4) ; + a4 -= sgn ; + del0 -= 4 * ((sgn * b4) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b3) ; + a3 -= sgn ; + del0 -= 5 * ((sgn * b3) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b2) ; + a2 -= sgn ; + del0 -= 6 * ((sgn * b2) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b1) ; + a1 -= sgn ; + del0 -= 7 * ((sgn * b1) >> denshift) ; + if (del0 <= 0) + continue ; + + a0 -= sign_of_int (b0) ; + } + else if (sg < 0) + { + // note: to avoid unnecessary negations, we flip the value of "sgn" + sgn = -sign_of_int (b7) ; + a7 -= sgn ; + del0 -= 1 * ((sgn * b7) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b6) ; + a6 -= sgn ; + del0 -= 2 * ((sgn * b6) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b5) ; + a5 -= sgn ; + del0 -= 3 * ((sgn * b5) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b4) ; + a4 -= sgn ; + del0 -= 4 * ((sgn * b4) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b3) ; + a3 -= sgn ; + del0 -= 5 * ((sgn * b3) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b2) ; + a2 -= sgn ; + del0 -= 6 * ((sgn * b2) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b1) ; + a1 -= sgn ; + del0 -= 7 * ((sgn * b1) >> denshift) ; + if (del0 >= 0) + continue ; + + a0 += sign_of_int (b0) ; + } + } + + coefs [0] = a0 ; + coefs [1] = a1 ; + coefs [2] = a2 ; + coefs [3] = a3 ; + coefs [4] = a4 ; + coefs [5] = a5 ; + coefs [6] = a6 ; + coefs [7] = a7 ; + } + else + { + // general case + for (j = lim ; j < num ; j++) + { + LOOP_ALIGN + + sum1 = 0 ; + pout = out + j - 1 ; + top = out [j-lim] ; + + for (k = 0 ; k < numactive ; k++) + sum1 += coefs [k] * (pout [-k] - top) ; + + del = pc1 [j] ; + del0 = del ; + sg = sign_of_int (del) ; + del += top + ((sum1 + denhalf) >> denshift) ; + out [j] = (del << chanshift) >> chanshift ; + + if (sg > 0) + { + for (k = (numactive - 1) ; k >= 0 ; k--) + { + dd = top - pout [-k] ; + sgn = sign_of_int (dd) ; + coefs [k] -= sgn ; + del0 -= (numactive - k) * ((sgn * dd) >> denshift) ; + if (del0 <= 0) + break ; + } + } + else if (sg < 0) + { + for (k = (numactive - 1) ; k >= 0 ; k--) + { + dd = top - pout [-k] ; + sgn = sign_of_int (dd) ; + coefs [k] += sgn ; + del0 -= (numactive - k) * ((-sgn * dd) >> denshift) ; + if (del0 >= 0) + break ; + } + } + } + } +} diff --git a/lib-src/libsndfile/src/ALAC/dp_enc.c b/lib-src/libsndfile/src/ALAC/dp_enc.c new file mode 100644 index 000000000..ad098a4f8 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/dp_enc.c @@ -0,0 +1,385 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: dp_enc.c + + Contains: Dynamic Predictor encode routines + + Copyright: (c) 2001-2011 Apple, Inc. +*/ + +#include + +#include "dplib.h" +#include "shift.h" + +#if __GNUC__ +#define ALWAYS_INLINE __attribute__ ((always_inline)) +#else +#define ALWAYS_INLINE +#endif + +#define LOOP_ALIGN + +void +init_coefs (int16_t * coefs, uint32_t denshift, int32_t numPairs) +{ + int32_t k ; + int32_t den = 1 << denshift ; + + coefs [0] = (AINIT * den) >> 4 ; + coefs [1] = (BINIT * den) >> 4 ; + coefs [2] = (CINIT * den) >> 4 ; + for (k = 3 ; k < numPairs ; k++) + coefs [k] = 0 ; +} + +void +copy_coefs (const int16_t * srcCoefs, int16_t * dstCoefs, int32_t numPairs) +{ + int32_t k ; + + for (k = 0 ; k < numPairs ; k++) + dstCoefs [k] = srcCoefs [k] ; +} + +static inline int32_t ALWAYS_INLINE sign_of_int (int32_t i) +{ + int32_t negishift ; + + negishift = ((uint32_t) - i) >> 31 ; + return negishift | (i >> 31) ; +} + +void +pc_block (int32_t * in, int32_t * pc1, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift) +{ + register int16_t a0, a1, a2, a3 ; + register int32_t b0, b1, b2, b3 ; + int32_t j, k, lim ; + int32_t * pin ; + int32_t sum1, dd ; + int32_t sg, sgn ; + int32_t top ; + int32_t del, del0 ; + uint32_t chanshift = 32 - chanbits ; + int32_t denhalf = 1 << (denshift - 1) ; + + pc1 [0] = in [0] ; + if (numactive == 0) + { + // just copy if numactive == 0 (but don't bother if in/out pointers the same) + if ((num > 1) && (in != pc1)) + memcpy (&pc1 [1], &in [1], (num - 1) * sizeof (int32_t)) ; + return ; + } + if (numactive == 31) + { + // short-circuit if numactive == 31 + for (j = 1 ; j < num ; j++) + { + del = in [j] - in [j-1] ; + pc1 [j] = (del << chanshift) >> chanshift ; + } + return ; + } + + for (j = 1 ; j <= numactive ; j++) + { + del = in [j] - in [j-1] ; + pc1 [j] = arith_shift_left (del, chanshift) >> chanshift ; + } + + lim = numactive + 1 ; + + if (numactive == 4) + { + // optimization for numactive == 4 + a0 = coefs [0] ; + a1 = coefs [1] ; + a2 = coefs [2] ; + a3 = coefs [3] ; + + for (j = lim ; j < num ; j++) + { + LOOP_ALIGN + + top = in [j - lim] ; + pin = in + j - 1 ; + + b0 = top - pin [0] ; + b1 = top - pin [-1] ; + b2 = top - pin [-2] ; + b3 = top - pin [-3] ; + + sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3) >> denshift ; + + del = in [j] - top - sum1 ; + del = arith_shift_left (del, chanshift) >> chanshift ; + pc1 [j] = del ; + del0 = del ; + + sg = sign_of_int (del) ; + if (sg > 0) + { + sgn = sign_of_int (b3) ; + a3 -= sgn ; + del0 -= (4 - 3) * ((sgn * b3) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b2) ; + a2 -= sgn ; + del0 -= (4 - 2) * ((sgn * b2) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b1) ; + a1 -= sgn ; + del0 -= (4 - 1) * ((sgn * b1) >> denshift) ; + if (del0 <= 0) + continue ; + + a0 -= sign_of_int (b0) ; + } + else if (sg < 0) + { + // note: to avoid unnecessary negations, we flip the value of "sgn" + sgn = -sign_of_int (b3) ; + a3 -= sgn ; + del0 -= (4 - 3) * ((sgn * b3) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b2) ; + a2 -= sgn ; + del0 -= (4 - 2) * ((sgn * b2) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b1) ; + a1 -= sgn ; + del0 -= (4 - 1) * ((sgn * b1) >> denshift) ; + if (del0 >= 0) + continue ; + + a0 += sign_of_int (b0) ; + } + } + + coefs [0] = a0 ; + coefs [1] = a1 ; + coefs [2] = a2 ; + coefs [3] = a3 ; + } + else if (numactive == 8) + { + // optimization for numactive == 8 + register int16_t a4, a5, a6, a7 ; + register int32_t b4, b5, b6, b7 ; + + a0 = coefs [0] ; + a1 = coefs [1] ; + a2 = coefs [2] ; + a3 = coefs [3] ; + a4 = coefs [4] ; + a5 = coefs [5] ; + a6 = coefs [6] ; + a7 = coefs [7] ; + + for (j = lim ; j < num ; j++) + { + LOOP_ALIGN + + top = in [j - lim] ; + pin = in + j - 1 ; + + b0 = top - (*pin--) ; + b1 = top - (*pin--) ; + b2 = top - (*pin--) ; + b3 = top - (*pin--) ; + b4 = top - (*pin--) ; + b5 = top - (*pin--) ; + b6 = top - (*pin--) ; + b7 = top - (*pin) ; + pin += 8 ; + + sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3 + - a4 * b4 - a5 * b5 - a6 * b6 - a7 * b7) >> denshift ; + + del = in [j] - top - sum1 ; + del = arith_shift_left (del, chanshift) >> chanshift ; + pc1 [j] = del ; + del0 = del ; + + sg = sign_of_int (del) ; + if (sg > 0) + { + sgn = sign_of_int (b7) ; + a7 -= sgn ; + del0 -= 1 * ((sgn * b7) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b6) ; + a6 -= sgn ; + del0 -= 2 * ((sgn * b6) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b5) ; + a5 -= sgn ; + del0 -= 3 * ((sgn * b5) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b4) ; + a4 -= sgn ; + del0 -= 4 * ((sgn * b4) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b3) ; + a3 -= sgn ; + del0 -= 5 * ((sgn * b3) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b2) ; + a2 -= sgn ; + del0 -= 6 * ((sgn * b2) >> denshift) ; + if (del0 <= 0) + continue ; + + sgn = sign_of_int (b1) ; + a1 -= sgn ; + del0 -= 7 * ((sgn * b1) >> denshift) ; + if (del0 <= 0) + continue ; + + a0 -= sign_of_int (b0) ; + } + else if (sg < 0) + { + // note: to avoid unnecessary negations, we flip the value of "sgn" + sgn = -sign_of_int (b7) ; + a7 -= sgn ; + del0 -= 1 * ((sgn * b7) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b6) ; + a6 -= sgn ; + del0 -= 2 * ((sgn * b6) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b5) ; + a5 -= sgn ; + del0 -= 3 * ((sgn * b5) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b4) ; + a4 -= sgn ; + del0 -= 4 * ((sgn * b4) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b3) ; + a3 -= sgn ; + del0 -= 5 * ((sgn * b3) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b2) ; + a2 -= sgn ; + del0 -= 6 * ((sgn * b2) >> denshift) ; + if (del0 >= 0) + continue ; + + sgn = -sign_of_int (b1) ; + a1 -= sgn ; + del0 -= 7 * ((sgn * b1) >> denshift) ; + if (del0 >= 0) + continue ; + + a0 += sign_of_int (b0) ; + } + } + + coefs [0] = a0 ; + coefs [1] = a1 ; + coefs [2] = a2 ; + coefs [3] = a3 ; + coefs [4] = a4 ; + coefs [5] = a5 ; + coefs [6] = a6 ; + coefs [7] = a7 ; + } + else + { +//pc_block_general: + // general case + for (j = lim ; j < num ; j++) + { + LOOP_ALIGN + + top = in [j - lim] ; + pin = in + j - 1 ; + + sum1 = 0 ; + for (k = 0 ; k < numactive ; k++) + sum1 -= coefs [k] * (top - pin [-k]) ; + + del = in [j] - top - ((sum1 + denhalf) >> denshift) ; + del = (del << chanshift) >> chanshift ; + pc1 [j] = del ; + del0 = del ; + + sg = sign_of_int (del) ; + if (sg > 0) + { + for (k = (numactive - 1) ; k >= 0 ; k--) + { + dd = top - pin [-k] ; + sgn = sign_of_int (dd) ; + coefs [k] -= sgn ; + del0 -= (numactive - k) * ((sgn * dd) >> denshift) ; + if (del0 <= 0) + break ; + } + } + else if (sg < 0) + { + for (k = (numactive - 1) ; k >= 0 ; k--) + { + dd = top - pin [-k] ; + sgn = sign_of_int (dd) ; + coefs [k] += sgn ; + del0 -= (numactive - k) * ((-sgn * dd) >> denshift) ; + if (del0 >= 0) + break ; + } + } + } + } +} diff --git a/lib-src/libsndfile/src/ALAC/dplib.h b/lib-src/libsndfile/src/ALAC/dplib.h new file mode 100644 index 000000000..43ae721d5 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/dplib.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: dplib.h + + Contains: Dynamic Predictor routines + + Copyright: Copyright (C) 2001-2011 Apple, Inc. +*/ + +#ifndef __DPLIB_H__ +#define __DPLIB_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +// defines + +#define DENSHIFT_MAX 15 +#define DENSHIFT_DEFAULT 9 +#define AINIT 38 +#define BINIT (-29) +#define CINIT (-2) +#define NUMCOEPAIRS 16 + +// prototypes + +void init_coefs (int16_t * coefs, uint32_t denshift, int32_t numPairs) ; +void copy_coefs (const int16_t * srcCoefs, int16_t * dstCoefs, int32_t numPairs) ; + +// NOTE: these routines read at least "numactive" samples so the i/o buffers must be at least that big + +void pc_block (int32_t * in, int32_t * pc, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift) ; +void unpc_block (const int32_t * pc, int32_t * out, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift) ; + +#ifdef __cplusplus +} +#endif + +#endif /* __DPLIB_H__ */ diff --git a/lib-src/libsndfile/src/ALAC/matrix_dec.c b/lib-src/libsndfile/src/ALAC/matrix_dec.c new file mode 100644 index 000000000..6d0b40153 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/matrix_dec.c @@ -0,0 +1,330 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2012-2014 Erik de Castro Lopo + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: matrix_dec.c + + Contains: ALAC mixing/matrixing decode routines. + + Copyright: (c) 2004-2011 Apple, Inc. +*/ + +#include "matrixlib.h" +#include "ALACAudioTypes.h" +#include "shift.h" + +// up to 24-bit "offset" macros for the individual bytes of a 20/24-bit word +#if TARGET_RT_BIG_ENDIAN + #define LBYTE 2 + #define MBYTE 1 + #define HBYTE 0 +#else + #define LBYTE 0 + #define MBYTE 1 + #define HBYTE 2 +#endif + +/* + There is no plain middle-side option ; instead there are various mixing + modes including middle-side, each lossless, as embodied in the mix () + and unmix () functions. These functions exploit a generalized middle-side + transformation: + + u := [(rL + (m-r)R)/m] ; + v := L - R ; + + where [ ] denotes integer floor. The (lossless) inverse is + + L = u + v - [rV/m] ; + R = L - v ; +*/ + +// 16-bit routines + +void +unmix16 (const int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres) +{ + int32_t j ; + + if (mixres != 0) + { + /* matrixed stereo */ + for (j = 0 ; j < numSamples ; j++) + { + int32_t l, r ; + + l = u [j] + v [j] - ((mixres * v [j]) >> mixbits) ; + r = l - v [j] ; + + out [0] = arith_shift_left (l, 16) ; + out [1] = arith_shift_left (r, 16) ; + out += stride ; + } + } + else + { + /* Conventional separated stereo. */ + for (j = 0 ; j < numSamples ; j++) + { + out [0] = u [j] << 16 ; + out [1] = v [j] << 16 ; + out += stride ; + } + } +} + +// 20-bit routines +// - the 20 bits of data are left-justified in 3 bytes of storage but right-aligned for input/output predictor buffers + +void +unmix20 (const int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres) +{ + int32_t j ; + + if (mixres != 0) + { + /* matrixed stereo */ + for (j = 0 ; j < numSamples ; j++) + { + int32_t l, r ; + + l = u [j] + v [j] - ((mixres * v [j]) >> mixbits) ; + r = l - v [j] ; + + out [0] = arith_shift_left (l, 12) ; + out [1] = arith_shift_left (r, 12) ; + out += stride ; + } + } + else + { + /* Conventional separated stereo. */ + for (j = 0 ; j < numSamples ; j++) + { + out [0] = arith_shift_left (u [j], 12) ; + out [1] = arith_shift_left (v [j], 12) ; + out += stride ; + } + } +} + +// 24-bit routines +// - the 24 bits of data are right-justified in the input/output predictor buffers + +void +unmix24 (const int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted) +{ + int32_t shift = bytesShifted * 8 ; + int32_t l, r ; + int32_t j, k ; + + if (mixres != 0) + { + /* matrixed stereo */ + if (bytesShifted != 0) + { + for (j = 0, k = 0 ; j < numSamples ; j++, k += 2) + { + l = u [j] + v [j] - ((mixres * v [j]) >> mixbits) ; + r = l - v [j] ; + + l = arith_shift_left (l, shift) | (uint32_t) shiftUV [k + 0] ; + r = arith_shift_left (r, shift) | (uint32_t) shiftUV [k + 1] ; + + out [0] = arith_shift_left (l, 8) ; + out [1] = arith_shift_left (r, 8) ; + out += stride ; + } + } + else + { + for (j = 0 ; j < numSamples ; j++) + { + l = u [j] + v [j] - ((mixres * v [j]) >> mixbits) ; + r = l - v [j] ; + + out [0] = l << 8 ; + out [1] = r << 8 ; + out += stride ; + } + } + } + else + { + /* Conventional separated stereo. */ + if (bytesShifted != 0) + { + for (j = 0, k = 0 ; j < numSamples ; j++, k += 2) + { + l = u [j] ; + r = v [j] ; + + l = (l << shift) | (uint32_t) shiftUV [k + 0] ; + r = (r << shift) | (uint32_t) shiftUV [k + 1] ; + + out [0] = l << 8 ; + out [1] = r << 8 ; + out += stride ; + } + } + else + { + for (j = 0 ; j < numSamples ; j++) + { + out [0] = u [j] << 8 ; + out [1] = v [j] << 8 ; + out += stride ; + } + } + } +} + +// 32-bit routines +// - note that these really expect the internal data width to be < 32 but the arrays are 32-bit +// - otherwise, the calculations might overflow into the 33rd bit and be lost +// - therefore, these routines deal with the specified "unused lower" bytes in the "shift" buffers + +void +unmix32 (const int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted) +{ + int32_t shift = bytesShifted * 8 ; + int32_t l, r ; + int32_t j, k ; + + if (mixres != 0) + { + //Assert (bytesShifted != 0) ; + + /* matrixed stereo with shift */ + for (j = 0, k = 0 ; j < numSamples ; j++, k += 2) + { + int32_t lt, rt ; + + lt = u [j] ; + rt = v [j] ; + + l = lt + rt - ((mixres * rt) >> mixbits) ; + r = l - rt ; + + out [0] = arith_shift_left (l, shift) | (uint32_t) shiftUV [k + 0] ; + out [1] = arith_shift_left (r, shift) | (uint32_t) shiftUV [k + 1] ; + out += stride ; + } + } + else + { + if (bytesShifted == 0) + { + /* interleaving w/o shift */ + for (j = 0 ; j < numSamples ; j++) + { + out [0] = u [j] ; + out [1] = v [j] ; + out += stride ; + } + } + else + { + /* interleaving with shift */ + for (j = 0, k = 0 ; j < numSamples ; j++, k += 2) + { + out [0] = (u [j] << shift) | (uint32_t) shiftUV [k + 0] ; + out [1] = (v [j] << shift) | (uint32_t) shiftUV [k + 1] ; + out += stride ; + } + } + } +} + +// 20/24-bit <-> 32-bit helper routines (not really matrixing but convenient to put here) + +void +copyPredictorTo24 (const int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples) +{ + int32_t j ; + + for (j = 0 ; j < numSamples ; j++) + { + out [0] = in [j] << 8 ; + out += stride ; + } +} + +void +copyPredictorTo24Shift (const int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted) +{ + int32_t shiftVal = bytesShifted * 8 ; + int32_t j ; + + //Assert (bytesShifted != 0) ; + + for (j = 0 ; j < numSamples ; j++) + { + int32_t val = in [j] ; + + val = arith_shift_left (val, shiftVal) | (uint32_t) shift [j] ; + out [0] = arith_shift_left (val, 8) ; + out += stride ; + } +} + +void +copyPredictorTo20 (const int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples) +{ + int32_t j ; + + // 32-bit predictor values are right-aligned but 20-bit output values should be left-aligned + // in the 24-bit output buffer + for (j = 0 ; j < numSamples ; j++) + { + out [0] = arith_shift_left (in [j], 12) ; + out += stride ; + } +} + +void +copyPredictorTo32 (const int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples) +{ + int32_t i, j ; + + // this is only a subroutine to abstract the "iPod can only output 16-bit data" problem + for (i = 0, j = 0 ; i < numSamples ; i++, j += stride) + out [j] = arith_shift_left (in [i], 8) ; +} + +void +copyPredictorTo32Shift (const int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted) +{ + int32_t * op = out ; + uint32_t shiftVal = bytesShifted * 8 ; + int32_t j ; + + //Assert (bytesShifted != 0) ; + + // this is only a subroutine to abstract the "iPod can only output 16-bit data" problem + for (j = 0 ; j < numSamples ; j++) + { + op [0] = arith_shift_left (in [j], shiftVal) | (uint32_t) shift [j] ; + op += stride ; + } +} diff --git a/lib-src/libsndfile/src/ALAC/matrix_enc.c b/lib-src/libsndfile/src/ALAC/matrix_enc.c new file mode 100644 index 000000000..b50f83b78 --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/matrix_enc.c @@ -0,0 +1,275 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2012-2014 Erik de Castro Lopo + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: matrix_enc.c + + Contains: ALAC mixing/matrixing encode routines. + + Copyright: (c) 2004-2011 Apple, Inc. +*/ + +#include "matrixlib.h" +#include "ALACAudioTypes.h" + +/* + There is no plain middle-side option ; instead there are various mixing + modes including middle-side, each lossless, as embodied in the mix () + and unmix () functions. These functions exploit a generalized middle-side + transformation: + + u := [(rL + (m-r)R)/m] ; + v := L - R ; + + where [ ] denotes integer floor. The (lossless) inverse is + + L = u + v - [rV/m] ; + R = L - v ; +*/ + +// 16-bit routines + +void +mix16 (const int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres) +{ + int32_t j ; + + if (mixres != 0) + { + int32_t mod = 1 << mixbits ; + int32_t m2 ; + + /* matrixed stereo */ + m2 = mod - mixres ; + for (j = 0 ; j < numSamples ; j++) + { + int32_t l, r ; + + l = in [0] >> 16 ; + r = in [1] >> 16 ; + in += stride ; + u [j] = (mixres * l + m2 * r) >> mixbits ; + v [j] = l - r ; + } + } + else + { + /* Conventional separated stereo. */ + for (j = 0 ; j < numSamples ; j++) + { + u [j] = in [0] >> 16 ; + v [j] = in [1] >> 16 ; + in += stride ; + } + } +} + +// 20-bit routines +// - the 20 bits of data are left-justified in 3 bytes of storage but right-aligned for input/output predictor buffers + +void +mix20 (const int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres) +{ + int32_t l, r ; + int32_t j ; + + if (mixres != 0) + { + /* matrixed stereo */ + int32_t mod = 1 << mixbits ; + int32_t m2 = mod - mixres ; + + for (j = 0 ; j < numSamples ; j++) + { + l = in [0] >> 12 ; + r = in [1] >> 12 ; + in += stride ; + + u [j] = (mixres * l + m2 * r) >> mixbits ; + v [j] = l - r ; + } + } + else + { + /* Conventional separated stereo. */ + for (j = 0 ; j < numSamples ; j++) + { + u [j] = in [0] >> 12 ; + v [j] = in [1] >> 12 ; + in += stride ; + } + } +} + +// 24-bit routines +// - the 24 bits of data are right-justified in the input/output predictor buffers + +void +mix24 (const int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted) +{ + int32_t l, r ; + int32_t shift = bytesShifted * 8 ; + uint32_t mask = (1ul << shift) - 1 ; + int32_t j, k ; + + if (mixres != 0) + { + /* matrixed stereo */ + int32_t mod = 1 << mixbits ; + int32_t m2 = mod - mixres ; + + if (bytesShifted != 0) + { + for (j = 0, k = 0 ; j < numSamples ; j++, k += 2) + { + l = in [0] >> 8 ; + r = in [1] >> 8 ; + in += stride ; + + shiftUV [k + 0] = (uint16_t) (l & mask) ; + shiftUV [k + 1] = (uint16_t) (r & mask) ; + + l >>= shift ; + r >>= shift ; + + u [j] = (mixres * l + m2 * r) >> mixbits ; + v [j] = l - r ; + } + } + else + { + for (j = 0 ; j < numSamples ; j++) + { + l = in [0] >> 8 ; + r = in [1] >> 8 ; + in += stride ; + + u [j] = (mixres * l + m2 * r) >> mixbits ; + v [j] = l - r ; + } + } + } + else + { + /* Conventional separated stereo. */ + if (bytesShifted != 0) + { + for (j = 0, k = 0 ; j < numSamples ; j++, k += 2) + { + l = in [0] >> 8 ; + r = in [1] >> 8 ; + in += stride ; + + shiftUV [k + 0] = (uint16_t) (l & mask) ; + shiftUV [k + 1] = (uint16_t) (r & mask) ; + + l >>= shift ; + r >>= shift ; + + u [j] = l ; + v [j] = r ; + } + } + else + { + for (j = 0 ; j < numSamples ; j++) + { + l = in [0] >> 8 ; + r = in [1] >> 8 ; + in += stride ; + } + } + } +} + +// 32-bit routines +// - note that these really expect the internal data width to be < 32 but the arrays are 32-bit +// - otherwise, the calculations might overflow into the 33rd bit and be lost +// - therefore, these routines deal with the specified "unused lower" bytes in the "shift" buffers + +void +mix32 (const int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted) +{ + int32_t shift = bytesShifted * 8 ; + uint32_t mask = (1ul << shift) - 1 ; + int32_t l, r ; + int32_t j, k ; + + if (mixres != 0) + { + int32_t mod = 1 << mixbits ; + int32_t m2 ; + + //Assert (bytesShifted != 0) ; + + /* matrixed stereo with shift */ + m2 = mod - mixres ; + for (j = 0, k = 0 ; j < numSamples ; j++, k += 2) + { + l = in [0] ; + r = in [1] ; + in += stride ; + + shiftUV [k + 0] = (uint16_t) (l & mask) ; + shiftUV [k + 1] = (uint16_t) (r & mask) ; + + l >>= shift ; + r >>= shift ; + + u [j] = (mixres * l + m2 * r) >> mixbits ; + v [j] = l - r ; + } + } + else + { + if (bytesShifted == 0) + { + /* de-interleaving w/o shift */ + for (j = 0 ; j < numSamples ; j++) + { + u [j] = in [0] ; + v [j] = in [1] ; + in += stride ; + } + } + else + { + /* de-interleaving with shift */ + for (j = 0, k = 0 ; j < numSamples ; j++, k += 2) + { + l = in [0] ; + r = in [1] ; + in += stride ; + + shiftUV [k + 0] = (uint16_t) (l & mask) ; + shiftUV [k + 1] = (uint16_t) (r & mask) ; + + l >>= shift ; + r >>= shift ; + + u [j] = l ; + v [j] = r ; + } + } + } +} diff --git a/lib-src/libsndfile/src/ALAC/matrixlib.h b/lib-src/libsndfile/src/ALAC/matrixlib.h new file mode 100644 index 000000000..d9be5feca --- /dev/null +++ b/lib-src/libsndfile/src/ALAC/matrixlib.h @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2012-2014 Erik de Castro Lopo + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License") ; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +/* + File: matrixlib.h + + Contains: ALAC mixing/matrixing routines to/from 32-bit predictor buffers. + + Copyright: Copyright (C) 2004 to 2011 Apple, Inc. +*/ + +#ifndef __MATRIXLIB_H +#define __MATRIXLIB_H + +#pragma once + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +// 16-bit routines +void mix16 (const int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres) ; +void unmix16 (const int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres) ; + +// 20-bit routines +void mix20 (const int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres) ; +void unmix20 (const int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres) ; + +// 24-bit routines +// - 24-bit data sometimes compresses better by shifting off the bottom byte so these routines deal with +// the specified "unused lower bytes" in the combined "shift" buffer +void mix24 (const int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted) ; +void unmix24 (const int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted) ; + +// 32-bit routines +// - note that these really expect the internal data width to be < 32-bit but the arrays are 32-bit +// - otherwise, the calculations might overflow into the 33rd bit and be lost +// - therefore, these routines deal with the specified "unused lower" bytes in the combined "shift" buffer +void mix32 (const int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted) ; +void unmix32 (const int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted) ; + +// 20/24/32-bit <-> 32-bit helper routines (not really matrixing but convenient to put here) +void copy20ToPredictor (const int32_t * in, uint32_t stride, int32_t * out, int32_t numSamples) ; +void copy24ToPredictor (const int32_t * in, uint32_t stride, int32_t * out, int32_t numSamples) ; + +void copyPredictorTo24 (const int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples) ; +void copyPredictorTo24Shift (const int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted) ; +void copyPredictorTo20 (const int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples) ; + +void copyPredictorTo32 (const int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples) ; +void copyPredictorTo32Shift (const int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted) ; + +#ifdef __cplusplus +} +#endif + +#endif /* __MATRIXLIB_H */ diff --git a/lib-src/libsndfile/src/macbinary3.c b/lib-src/libsndfile/src/ALAC/shift.h similarity index 64% rename from lib-src/libsndfile/src/macbinary3.c rename to lib-src/libsndfile/src/ALAC/shift.h index 184cc18fc..7c2d6f69a 100644 --- a/lib-src/libsndfile/src/macbinary3.c +++ b/lib-src/libsndfile/src/ALAC/shift.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 2003-2011 Erik de Castro Lopo +** Copyright (C) 2014 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -16,30 +16,14 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "sfconfig.h" - -#include -#include - -#include "sndfile.h" -#include "sfendian.h" -#include "common.h" - -#if (OS_IS_MACOSX == 1) - -int -macbinary3_open (SF_PRIVATE * UNUSED (psf)) -{ - return 0 ; -} /* macbinary3_open */ - +#if __GNUC__ +#define ALWAYS_INLINE __attribute__ ((always_inline)) #else +#define ALWAYS_INLINE +#endif -int -macbinary3_open (SF_PRIVATE * UNUSED (psf)) -{ - return 0 ; -} /* macbinary3_open */ - -#endif /* OS_IS_MACOSX */ +static inline int32_t ALWAYS_INLINE +arith_shift_left (int32_t x, int shift) +{ return (int32_t) (((uint32_t) x) << shift) ; +} /* arith_shift_left */ diff --git a/lib-src/libsndfile/src/G72x/Makefile.am b/lib-src/libsndfile/src/G72x/Makefile.am deleted file mode 100644 index 62a0aa112..000000000 --- a/lib-src/libsndfile/src/G72x/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = README README.original ChangeLog - -noinst_HEADERS = g72x.h g72x_priv.h -noinst_LTLIBRARIES = libg72x.la - -noinst_PROGRAMS = g72x_test - -CFILES = g72x.c g721.c g723_16.c g723_24.c g723_40.c - -libg72x_la_SOURCES = $(CFILES) $(noinst_HEADERS) - -g72x_test_SOURCES = g72x_test.c -g72x_test_LDADD = ./libg72x.la -lm - -check: g72x_test$(EXEEXT) - ./g72x_test$(EXEEXT) all - -# Disable autoheader. -AUTOHEADER=echo - diff --git a/lib-src/libsndfile/src/G72x/Makefile.in b/lib-src/libsndfile/src/G72x/Makefile.in deleted file mode 100644 index 6d5671833..000000000 --- a/lib-src/libsndfile/src/G72x/Makefile.in +++ /dev/null @@ -1,675 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -noinst_PROGRAMS = g72x_test$(EXEEXT) -subdir = src/G72x -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/Cfg/depcomp $(noinst_HEADERS) ChangeLog README -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libg72x_la_LIBADD = -am__objects_1 = g72x.lo g721.lo g723_16.lo g723_24.lo g723_40.lo -am__objects_2 = -am_libg72x_la_OBJECTS = $(am__objects_1) $(am__objects_2) -libg72x_la_OBJECTS = $(am_libg72x_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -PROGRAMS = $(noinst_PROGRAMS) -am_g72x_test_OBJECTS = g72x_test.$(OBJEXT) -g72x_test_OBJECTS = $(am_g72x_test_OBJECTS) -g72x_test_DEPENDENCIES = ./libg72x.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -depcomp = $(SHELL) $(top_srcdir)/Cfg/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libg72x_la_SOURCES) $(g72x_test_SOURCES) -DIST_SOURCES = $(libg72x_la_SOURCES) $(g72x_test_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -HEADERS = $(noinst_HEADERS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ - -# Disable autoheader. -AUTOHEADER = echo -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = README README.original ChangeLog -noinst_HEADERS = g72x.h g72x_priv.h -noinst_LTLIBRARIES = libg72x.la -CFILES = g72x.c g721.c g723_16.c g723_24.c g723_40.c -libg72x_la_SOURCES = $(CFILES) $(noinst_HEADERS) -g72x_test_SOURCES = g72x_test.c -g72x_test_LDADD = ./libg72x.la -lm -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/G72x/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/G72x/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libg72x.la: $(libg72x_la_OBJECTS) $(libg72x_la_DEPENDENCIES) $(EXTRA_libg72x_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libg72x_la_OBJECTS) $(libg72x_la_LIBADD) $(LIBS) - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -g72x_test$(EXEEXT): $(g72x_test_OBJECTS) $(g72x_test_DEPENDENCIES) $(EXTRA_g72x_test_DEPENDENCIES) - @rm -f g72x_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(g72x_test_OBJECTS) $(g72x_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g721.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g723_16.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g723_24.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g723_40.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g72x.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g72x_test.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - - -check: g72x_test$(EXEEXT) - ./g72x_test$(EXEEXT) all - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/src/G72x/g721.c b/lib-src/libsndfile/src/G72x/g721.c index d305ba8f0..826d42c49 100644 --- a/lib-src/libsndfile/src/G72x/g721.c +++ b/lib-src/libsndfile/src/G72x/g721.c @@ -29,7 +29,7 @@ * * Description: * - * g721_encoder(), g721_decoder() + * g721_encoder (), g721_decoder () * * These routines comprise an implementation of the CCITT G.721 ADPCM * coding algorithm. Essentially, this implementation is identical to @@ -52,69 +52,69 @@ #include "g72x.h" #include "g72x_priv.h" -static short qtab_721[7] = {-124, 80, 178, 246, 300, 349, 400}; +static short qtab_721 [7] = { -124, 80, 178, 246, 300, 349, 400 } ; /* * Maps G.721 code word to reconstructed scale factor normalized log * magnitude values. */ -static short _dqlntab[16] = {-2048, 4, 135, 213, 273, 323, 373, 425, - 425, 373, 323, 273, 213, 135, 4, -2048}; +static short _dqlntab [16] = { -2048, 4, 135, 213, 273, 323, 373, 425, + 425, 373, 323, 273, 213, 135, 4, -2048 } ; /* Maps G.721 code word to log of scale factor multiplier. */ -static short _witab[16] = {-12, 18, 41, 64, 112, 198, 355, 1122, - 1122, 355, 198, 112, 64, 41, 18, -12}; +static short _witab [16] = { -12, 18, 41, 64, 112, 198, 355, 1122, + 1122, 355, 198, 112, 64, 41, 18, -12 } ; /* * Maps G.721 code words to a set of values whose long and short * term averages are computed and then compared to give an indication * how stationary (steady state) the signal is. */ -static short _fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00, - 0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0}; +static short _fitab [16] = { 0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00, + 0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0 } ; /* - * g721_encoder() + * g721_encoder () * * Encodes the input vale of linear PCM, A-law or u-law data sl and returns * the resulting code. -1 is returned for unknown input coding value. */ int -g721_encoder( +g721_encoder ( int sl, G72x_STATE *state_ptr) { - short sezi, se, sez; /* ACCUM */ - short d; /* SUBTA */ - short sr; /* ADDB */ - short y; /* MIX */ - short dqsez; /* ADDC */ - short dq, i; + short sezi, se, sez ; /* ACCUM */ + short d ; /* SUBTA */ + short sr ; /* ADDB */ + short y ; /* MIX */ + short dqsez ; /* ADDC */ + short dq, i ; /* linearize input sample to 14-bit PCM */ - sl >>= 2; /* 14-bit dynamic range */ + sl >>= 2 ; /* 14-bit dynamic range */ - sezi = predictor_zero(state_ptr); - sez = sezi >> 1; - se = (sezi + predictor_pole(state_ptr)) >> 1; /* estimated signal */ + sezi = predictor_zero (state_ptr) ; + sez = sezi >> 1 ; + se = (sezi + predictor_pole (state_ptr)) >> 1 ; /* estimated signal */ - d = sl - se; /* estimation difference */ + d = sl - se ; /* estimation difference */ /* quantize the prediction difference */ - y = step_size(state_ptr); /* quantizer step size */ - i = quantize(d, y, qtab_721, 7); /* i = ADPCM code */ + y = step_size (state_ptr) ; /* quantizer step size */ + i = quantize (d, y, qtab_721, 7) ; /* i = ADPCM code */ - dq = reconstruct(i & 8, _dqlntab[i], y); /* quantized est diff */ + dq = reconstruct (i & 8, _dqlntab [i], y) ; /* quantized est diff */ - sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq; /* reconst. signal */ + sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq ; /* reconst. signal */ - dqsez = sr + sez - se; /* pole prediction diff. */ + dqsez = sr + sez - se ; /* pole prediction diff. */ - update(4, y, _witab[i] << 5, _fitab[i], dq, sr, dqsez, state_ptr); + update (4, y, arith_shift_left (_witab [i], 5), _fitab [i], dq, sr, dqsez, state_ptr) ; - return (i); + return i ; } /* - * g721_decoder() + * g721_decoder () * * Description: * @@ -123,33 +123,33 @@ g721_encoder( * return -1 for unknown out_coding value. */ int -g721_decoder( +g721_decoder ( int i, G72x_STATE *state_ptr) { - short sezi, sei, sez, se; /* ACCUM */ - short y; /* MIX */ - short sr; /* ADDB */ - short dq; - short dqsez; + short sezi, sei, sez, se ; /* ACCUM */ + short y ; /* MIX */ + short sr ; /* ADDB */ + short dq ; + short dqsez ; - i &= 0x0f; /* mask to get proper bits */ - sezi = predictor_zero(state_ptr); - sez = sezi >> 1; - sei = sezi + predictor_pole(state_ptr); - se = sei >> 1; /* se = estimated signal */ + i &= 0x0f ; /* mask to get proper bits */ + sezi = predictor_zero (state_ptr) ; + sez = sezi >> 1 ; + sei = sezi + predictor_pole (state_ptr) ; + se = sei >> 1 ; /* se = estimated signal */ - y = step_size(state_ptr); /* dynamic quantizer step size */ + y = step_size (state_ptr) ; /* dynamic quantizer step size */ - dq = reconstruct(i & 0x08, _dqlntab[i], y); /* quantized diff. */ + dq = reconstruct (i & 0x08, _dqlntab [i], y) ; /* quantized diff. */ - sr = (dq < 0) ? (se - (dq & 0x3FFF)) : se + dq; /* reconst. signal */ + sr = (dq < 0) ? (se - (dq & 0x3FFF)) : se + dq ; /* reconst. signal */ - dqsez = sr - se + sez; /* pole prediction diff. */ + dqsez = sr - se + sez ; /* pole prediction diff. */ - update(4, y, _witab[i] << 5, _fitab[i], dq, sr, dqsez, state_ptr); + update (4, y, arith_shift_left (_witab [i], 5), _fitab [i], dq, sr, dqsez, state_ptr) ; /* sr was 14-bit dynamic range */ - return (sr << 2); + return arith_shift_left (sr, 2) ; } diff --git a/lib-src/libsndfile/src/G72x/g723_16.c b/lib-src/libsndfile/src/G72x/g723_16.c index ae90b6c43..c377e6319 100644 --- a/lib-src/libsndfile/src/G72x/g723_16.c +++ b/lib-src/libsndfile/src/G72x/g723_16.c @@ -34,7 +34,7 @@ * * Description: * - * g723_16_encoder(), g723_16_decoder() + * g723_16_encoder (), g723_16_decoder () * * These routines comprise an implementation of the CCITT G.726 16 Kbps * ADPCM coding algorithm. Essentially, this implementation is identical to @@ -50,14 +50,14 @@ * Maps G.723_16 code word to reconstructed scale factor normalized log * magnitude values. Comes from Table 11/G.726 */ -static short _dqlntab[4] = { 116, 365, 365, 116}; +static short _dqlntab [4] = { 116, 365, 365, 116 } ; /* Maps G.723_16 code word to log of scale factor multiplier. * - * _witab[4] is actually {-22 , 439, 439, -22}, but FILTD wants it - * as WI << 5 (multiplied by 32), so we'll do that here + * _witab [4] is actually {-22 , 439, 439, -22}, but FILTD wants it + * as WI << 5 (multiplied by 32), so we'll do that here */ -static short _witab[4] = {-704, 14048, 14048, -704}; +static short _witab [4] = { -704, 14048, 14048, -704 } ; /* * Maps G.723_16 code words to a set of values whose long and short @@ -66,97 +66,97 @@ static short _witab[4] = {-704, 14048, 14048, -704}; */ /* Comes from FUNCTF */ -static short _fitab[4] = {0, 0xE00, 0xE00, 0}; +static short _fitab [4] = { 0, 0xE00, 0xE00, 0 } ; /* Comes from quantizer decision level tables (Table 7/G.726) */ -static short qtab_723_16[1] = {261}; +static short qtab_723_16 [1] = { 261 } ; /* - * g723_16_encoder() + * g723_16_encoder () * * Encodes a linear PCM, A-law or u-law input sample and returns its 2-bit code. * Returns -1 if invalid input coding value. */ int -g723_16_encoder( - int sl, - G72x_STATE *state_ptr) +g723_16_encoder ( + int sl, + G72x_STATE *state_ptr) { - short sei, sezi, se, sez; /* ACCUM */ - short d; /* SUBTA */ - short y; /* MIX */ - short sr; /* ADDB */ - short dqsez; /* ADDC */ - short dq, i; + short sei, sezi, se, sez ; /* ACCUM */ + short d ; /* SUBTA */ + short y ; /* MIX */ + short sr ; /* ADDB */ + short dqsez ; /* ADDC */ + short dq, i ; - /* linearize input sample to 14-bit PCM */ - sl >>= 2; /* sl of 14-bit dynamic range */ + /* linearize input sample to 14-bit PCM */ + sl >>= 2 ; /* sl of 14-bit dynamic range */ - sezi = predictor_zero(state_ptr); - sez = sezi >> 1; - sei = sezi + predictor_pole(state_ptr); - se = sei >> 1; /* se = estimated signal */ + sezi = predictor_zero (state_ptr) ; + sez = sezi >> 1 ; + sei = sezi + predictor_pole (state_ptr) ; + se = sei >> 1 ; /* se = estimated signal */ - d = sl - se; /* d = estimation diff. */ + d = sl - se ; /* d = estimation diff. */ - /* quantize prediction difference d */ - y = step_size(state_ptr); /* quantizer step size */ - i = quantize(d, y, qtab_723_16, 1); /* i = ADPCM code */ + /* quantize prediction difference d */ + y = step_size (state_ptr) ; /* quantizer step size */ + i = quantize (d, y, qtab_723_16, 1) ; /* i = ADPCM code */ - /* Since quantize() only produces a three level output - * (1, 2, or 3), we must create the fourth one on our own - */ - if (i == 3) /* i code for the zero region */ - if ((d & 0x8000) == 0) /* If d > 0, i=3 isn't right... */ - i = 0; - - dq = reconstruct(i & 2, _dqlntab[i], y); /* quantized diff. */ + /* Since quantize () only produces a three level output + * (1, 2, or 3), we must create the fourth one on our own + */ + if (i == 3) /* i code for the zero region */ + if ((d & 0x8000) == 0) /* If d > 0, i=3 isn't right... */ + i = 0 ; - sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq; /* reconstructed signal */ + dq = reconstruct (i & 2, _dqlntab [i], y) ; /* quantized diff. */ - dqsez = sr + sez - se; /* pole prediction diff. */ + sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq ; /* reconstructed signal */ - update(2, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr); + dqsez = sr + sez - se ; /* pole prediction diff. */ - return (i); + update (2, y, _witab [i], _fitab [i], dq, sr, dqsez, state_ptr) ; + + return i ; } /* - * g723_16_decoder() + * g723_16_decoder () * * Decodes a 2-bit CCITT G.723_16 ADPCM code and returns * the resulting 16-bit linear PCM, A-law or u-law sample value. * -1 is returned if the output coding is unknown. */ int -g723_16_decoder( - int i, - G72x_STATE *state_ptr) +g723_16_decoder ( + int i, + G72x_STATE *state_ptr) { - short sezi, sei, sez, se; /* ACCUM */ - short y; /* MIX */ - short sr; /* ADDB */ - short dq; - short dqsez; + short sezi, sei, sez, se ; /* ACCUM */ + short y ; /* MIX */ + short sr ; /* ADDB */ + short dq ; + short dqsez ; - i &= 0x03; /* mask to get proper bits */ - sezi = predictor_zero(state_ptr); - sez = sezi >> 1; - sei = sezi + predictor_pole(state_ptr); - se = sei >> 1; /* se = estimated signal */ + i &= 0x03 ; /* mask to get proper bits */ + sezi = predictor_zero (state_ptr) ; + sez = sezi >> 1 ; + sei = sezi + predictor_pole (state_ptr) ; + se = sei >> 1 ; /* se = estimated signal */ - y = step_size(state_ptr); /* adaptive quantizer step size */ - dq = reconstruct(i & 0x02, _dqlntab[i], y); /* unquantize pred diff */ + y = step_size (state_ptr) ; /* adaptive quantizer step size */ + dq = reconstruct (i & 0x02, _dqlntab [i], y) ; /* unquantize pred diff */ - sr = (dq < 0) ? (se - (dq & 0x3FFF)) : (se + dq); /* reconst. signal */ + sr = (dq < 0) ? (se - (dq & 0x3FFF)) : (se + dq) ; /* reconst. signal */ - dqsez = sr - se + sez; /* pole prediction diff. */ + dqsez = sr - se + sez ; /* pole prediction diff. */ - update(2, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr); + update (2, y, _witab [i], _fitab [i], dq, sr, dqsez, state_ptr) ; - /* sr was of 14-bit dynamic range */ - return (sr << 2); + /* sr was of 14-bit dynamic range */ + return (sr << 2) ; } diff --git a/lib-src/libsndfile/src/G72x/g723_24.c b/lib-src/libsndfile/src/G72x/g723_24.c index 02b6c24a0..9cc2f6d50 100644 --- a/lib-src/libsndfile/src/G72x/g723_24.c +++ b/lib-src/libsndfile/src/G72x/g723_24.c @@ -29,7 +29,7 @@ * * Description: * - * g723_24_encoder(), g723_24_decoder() + * g723_24_encoder (), g723_24_decoder () * * These routines comprise an implementation of the CCITT G.723 24 Kbps * ADPCM coding algorithm. Essentially, this implementation is identical to @@ -45,95 +45,95 @@ * Maps G.723_24 code word to reconstructed scale factor normalized log * magnitude values. */ -static short _dqlntab[8] = {-2048, 135, 273, 373, 373, 273, 135, -2048}; +static short _dqlntab [8] = { -2048, 135, 273, 373, 373, 273, 135, -2048 } ; /* Maps G.723_24 code word to log of scale factor multiplier. */ -static short _witab[8] = {-128, 960, 4384, 18624, 18624, 4384, 960, -128}; +static short _witab [8] = { -128, 960, 4384, 18624, 18624, 4384, 960, -128 } ; /* * Maps G.723_24 code words to a set of values whose long and short * term averages are computed and then compared to give an indication * how stationary (steady state) the signal is. */ -static short _fitab[8] = {0, 0x200, 0x400, 0xE00, 0xE00, 0x400, 0x200, 0}; +static short _fitab [8] = { 0, 0x200, 0x400, 0xE00, 0xE00, 0x400, 0x200, 0 } ; -static short qtab_723_24[3] = {8, 218, 331}; +static short qtab_723_24 [3] = { 8, 218, 331 } ; /* - * g723_24_encoder() + * g723_24_encoder () * * Encodes a linear PCM, A-law or u-law input sample and returns its 3-bit code. * Returns -1 if invalid input coding value. */ int -g723_24_encoder( +g723_24_encoder ( int sl, G72x_STATE *state_ptr) { - short sei, sezi, se, sez; /* ACCUM */ - short d; /* SUBTA */ - short y; /* MIX */ - short sr; /* ADDB */ - short dqsez; /* ADDC */ - short dq, i; + short sei, sezi, se, sez ; /* ACCUM */ + short d ; /* SUBTA */ + short y ; /* MIX */ + short sr ; /* ADDB */ + short dqsez ; /* ADDC */ + short dq, i ; /* linearize input sample to 14-bit PCM */ - sl >>= 2; /* sl of 14-bit dynamic range */ + sl >>= 2 ; /* sl of 14-bit dynamic range */ - sezi = predictor_zero(state_ptr); - sez = sezi >> 1; - sei = sezi + predictor_pole(state_ptr); - se = sei >> 1; /* se = estimated signal */ + sezi = predictor_zero (state_ptr) ; + sez = sezi >> 1 ; + sei = sezi + predictor_pole (state_ptr) ; + se = sei >> 1 ; /* se = estimated signal */ - d = sl - se; /* d = estimation diff. */ + d = sl - se ; /* d = estimation diff. */ /* quantize prediction difference d */ - y = step_size(state_ptr); /* quantizer step size */ - i = quantize(d, y, qtab_723_24, 3); /* i = ADPCM code */ - dq = reconstruct(i & 4, _dqlntab[i], y); /* quantized diff. */ + y = step_size (state_ptr) ; /* quantizer step size */ + i = quantize (d, y, qtab_723_24, 3) ; /* i = ADPCM code */ + dq = reconstruct (i & 4, _dqlntab [i], y) ; /* quantized diff. */ - sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq; /* reconstructed signal */ + sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq ; /* reconstructed signal */ - dqsez = sr + sez - se; /* pole prediction diff. */ + dqsez = sr + sez - se ; /* pole prediction diff. */ - update(3, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr); + update (3, y, _witab [i], _fitab [i], dq, sr, dqsez, state_ptr) ; - return (i); + return i ; } /* - * g723_24_decoder() + * g723_24_decoder () * * Decodes a 3-bit CCITT G.723_24 ADPCM code and returns * the resulting 16-bit linear PCM, A-law or u-law sample value. * -1 is returned if the output coding is unknown. */ int -g723_24_decoder( +g723_24_decoder ( int i, G72x_STATE *state_ptr) { - short sezi, sei, sez, se; /* ACCUM */ - short y; /* MIX */ - short sr; /* ADDB */ - short dq; - short dqsez; + short sezi, sei, sez, se ; /* ACCUM */ + short y ; /* MIX */ + short sr ; /* ADDB */ + short dq ; + short dqsez ; - i &= 0x07; /* mask to get proper bits */ - sezi = predictor_zero(state_ptr); - sez = sezi >> 1; - sei = sezi + predictor_pole(state_ptr); - se = sei >> 1; /* se = estimated signal */ + i &= 0x07 ; /* mask to get proper bits */ + sezi = predictor_zero (state_ptr) ; + sez = sezi >> 1 ; + sei = sezi + predictor_pole (state_ptr) ; + se = sei >> 1 ; /* se = estimated signal */ - y = step_size(state_ptr); /* adaptive quantizer step size */ - dq = reconstruct(i & 0x04, _dqlntab[i], y); /* unquantize pred diff */ + y = step_size (state_ptr) ; /* adaptive quantizer step size */ + dq = reconstruct (i & 0x04, _dqlntab [i], y) ; /* unquantize pred diff */ - sr = (dq < 0) ? (se - (dq & 0x3FFF)) : (se + dq); /* reconst. signal */ + sr = (dq < 0) ? (se - (dq & 0x3FFF)) : (se + dq) ; /* reconst. signal */ - dqsez = sr - se + sez; /* pole prediction diff. */ + dqsez = sr - se + sez ; /* pole prediction diff. */ - update(3, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr); + update (3, y, _witab [i], _fitab [i], dq, sr, dqsez, state_ptr) ; - return (sr << 2); /* sr was of 14-bit dynamic range */ + return arith_shift_left (sr, 2) ; /* sr was of 14-bit dynamic range */ } diff --git a/lib-src/libsndfile/src/G72x/g723_40.c b/lib-src/libsndfile/src/G72x/g723_40.c index d52039534..f7f8f7427 100644 --- a/lib-src/libsndfile/src/G72x/g723_40.c +++ b/lib-src/libsndfile/src/G72x/g723_40.c @@ -29,7 +29,7 @@ * * Description: * - * g723_40_encoder(), g723_40_decoder() + * g723_40_encoder (), g723_40_decoder () * * These routines comprise an implementation of the CCITT G.723 40Kbps * ADPCM coding algorithm. Essentially, this implementation is identical to @@ -53,32 +53,32 @@ * Maps G.723_40 code word to ructeconstructed scale factor normalized log * magnitude values. */ -static short _dqlntab[32] = {-2048, -66, 28, 104, 169, 224, 274, 318, +static short _dqlntab [32] = { -2048, -66, 28, 104, 169, 224, 274, 318, 358, 395, 429, 459, 488, 514, 539, 566, 566, 539, 514, 488, 459, 429, 395, 358, - 318, 274, 224, 169, 104, 28, -66, -2048}; + 318, 274, 224, 169, 104, 28, -66, -2048 } ; /* Maps G.723_40 code word to log of scale factor multiplier. */ -static short _witab[32] = {448, 448, 768, 1248, 1280, 1312, 1856, 3200, +static short _witab [32] = { 448, 448, 768, 1248, 1280, 1312, 1856, 3200, 4512, 5728, 7008, 8960, 11456, 14080, 16928, 22272, 22272, 16928, 14080, 11456, 8960, 7008, 5728, 4512, - 3200, 1856, 1312, 1280, 1248, 768, 448, 448}; + 3200, 1856, 1312, 1280, 1248, 768, 448, 448 } ; /* * Maps G.723_40 code words to a set of values whose long and short * term averages are computed and then compared to give an indication * how stationary (steady state) the signal is. */ -static short _fitab[32] = {0, 0, 0, 0, 0, 0x200, 0x200, 0x200, +static short _fitab [32] = { 0, 0, 0, 0, 0, 0x200, 0x200, 0x200, 0x200, 0x200, 0x400, 0x600, 0x800, 0xA00, 0xC00, 0xC00, 0xC00, 0xC00, 0xA00, 0x800, 0x600, 0x400, 0x200, 0x200, - 0x200, 0x200, 0x200, 0, 0, 0, 0, 0}; + 0x200, 0x200, 0x200, 0, 0, 0, 0, 0 } ; -static short qtab_723_40[15] = {-122, -16, 68, 139, 198, 250, 298, 339, - 378, 413, 445, 475, 502, 528, 553}; +static short qtab_723_40 [15] = { -122, -16, 68, 139, 198, 250, 298, 339, + 378, 413, 445, 475, 502, 528, 553 } ; /* - * g723_40_encoder() + * g723_40_encoder () * * Encodes a 16-bit linear PCM, A-law or u-law input sample and retuens * the resulting 5-bit CCITT G.723 40Kbps code. @@ -86,40 +86,40 @@ static short qtab_723_40[15] = {-122, -16, 68, 139, 198, 250, 298, 339, */ int g723_40_encoder (int sl, G72x_STATE *state_ptr) { - short sei, sezi, se, sez; /* ACCUM */ - short d; /* SUBTA */ - short y; /* MIX */ - short sr; /* ADDB */ - short dqsez; /* ADDC */ - short dq, i; + short sei, sezi, se, sez ; /* ACCUM */ + short d ; /* SUBTA */ + short y ; /* MIX */ + short sr ; /* ADDB */ + short dqsez ; /* ADDC */ + short dq, i ; /* linearize input sample to 14-bit PCM */ - sl >>= 2; /* sl of 14-bit dynamic range */ + sl >>= 2 ; /* sl of 14-bit dynamic range */ - sezi = predictor_zero(state_ptr); - sez = sezi >> 1; - sei = sezi + predictor_pole(state_ptr); - se = sei >> 1; /* se = estimated signal */ + sezi = predictor_zero (state_ptr) ; + sez = sezi >> 1 ; + sei = sezi + predictor_pole (state_ptr) ; + se = sei >> 1 ; /* se = estimated signal */ - d = sl - se; /* d = estimation difference */ + d = sl - se ; /* d = estimation difference */ /* quantize prediction difference */ - y = step_size(state_ptr); /* adaptive quantizer step size */ - i = quantize(d, y, qtab_723_40, 15); /* i = ADPCM code */ + y = step_size (state_ptr) ; /* adaptive quantizer step size */ + i = quantize (d, y, qtab_723_40, 15) ; /* i = ADPCM code */ - dq = reconstruct(i & 0x10, _dqlntab[i], y); /* quantized diff */ + dq = reconstruct (i & 0x10, _dqlntab [i], y) ; /* quantized diff */ - sr = (dq < 0) ? se - (dq & 0x7FFF) : se + dq; /* reconstructed signal */ + sr = (dq < 0) ? se - (dq & 0x7FFF) : se + dq ; /* reconstructed signal */ - dqsez = sr + sez - se; /* dqsez = pole prediction diff. */ + dqsez = sr + sez - se ; /* dqsez = pole prediction diff. */ - update(5, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr); + update (5, y, _witab [i], _fitab [i], dq, sr, dqsez, state_ptr) ; - return (i); + return i ; } /* - * g723_40_decoder() + * g723_40_decoder () * * Decodes a 5-bit CCITT G.723 40Kbps code and returns * the resulting 16-bit linear PCM, A-law or u-law sample value. @@ -127,27 +127,27 @@ int g723_40_encoder (int sl, G72x_STATE *state_ptr) */ int g723_40_decoder (int i, G72x_STATE *state_ptr) { - short sezi, sei, sez, se; /* ACCUM */ + short sezi, sei, sez, se ; /* ACCUM */ short y ; /* MIX */ - short sr; /* ADDB */ - short dq; - short dqsez; + short sr ; /* ADDB */ + short dq ; + short dqsez ; - i &= 0x1f; /* mask to get proper bits */ - sezi = predictor_zero(state_ptr); - sez = sezi >> 1; - sei = sezi + predictor_pole(state_ptr); - se = sei >> 1; /* se = estimated signal */ + i &= 0x1f ; /* mask to get proper bits */ + sezi = predictor_zero (state_ptr) ; + sez = sezi >> 1 ; + sei = sezi + predictor_pole (state_ptr) ; + se = sei >> 1 ; /* se = estimated signal */ - y = step_size(state_ptr); /* adaptive quantizer step size */ - dq = reconstruct(i & 0x10, _dqlntab[i], y); /* estimation diff. */ + y = step_size (state_ptr) ; /* adaptive quantizer step size */ + dq = reconstruct (i & 0x10, _dqlntab [i], y) ; /* estimation diff. */ - sr = (dq < 0) ? (se - (dq & 0x7FFF)) : (se + dq); /* reconst. signal */ + sr = (dq < 0) ? (se - (dq & 0x7FFF)) : (se + dq) ; /* reconst. signal */ - dqsez = sr - se + sez; /* pole prediction diff. */ + dqsez = sr - se + sez ; /* pole prediction diff. */ - update(5, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr); + update (5, y, _witab [i], _fitab [i], dq, sr, dqsez, state_ptr) ; - return (sr << 2); /* sr was of 14-bit dynamic range */ + return arith_shift_left (sr, 2) ; /* sr was of 14-bit dynamic range */ } diff --git a/lib-src/libsndfile/src/G72x/g72x.c b/lib-src/libsndfile/src/G72x/g72x.c index 3fae81aa8..2d6469cf1 100644 --- a/lib-src/libsndfile/src/G72x/g72x.c +++ b/lib-src/libsndfile/src/G72x/g72x.c @@ -48,26 +48,26 @@ short power2 [15] = } ; /* - * quan() + * quan () * * quantizes the input val against the table of size short integers. - * It returns i if table[i - 1] <= val < table[i]. + * It returns i if table [i - 1] <= val < table [i]. * * Using linear search for simple coding. */ static int quan (int val, short *table, int size) { - int i; + int i ; - for (i = 0; i < size; i++) + for (i = 0 ; i < size ; i++) if (val < *table++) - break; - return (i); + break ; + return i ; } /* - * fmult() + * fmult () * * returns the integer product of the 14-bit integer "an" and * "floating point" representation (4-bit exponent, 6-bit mantessa) "srn". @@ -75,15 +75,15 @@ int quan (int val, short *table, int size) static int fmult (int an, int srn) { - short anmag, anexp, anmant; - short wanexp, wanmant; - short retval; + short anmag, anexp, anmant ; + short wanexp, wanmant ; + short retval ; - anmag = (an > 0) ? an : ((-an) & 0x1FFF); - anexp = quan(anmag, power2, 15) - 6; + anmag = (an > 0) ? an : ((-an) & 0x1FFF) ; + anexp = quan (anmag, power2, 15) - 6 ; anmant = (anmag == 0) ? 32 : - (anexp >= 0) ? anmag >> anexp : anmag << -anexp; - wanexp = anexp + ((srn >> 6) & 0xF) - 13; + (anexp >= 0) ? anmag >> anexp : anmag << -anexp ; + wanexp = anexp + ((srn >> 6) & 0xF) - 13 ; /* ** The original was : @@ -94,10 +94,9 @@ int fmult (int an, int srn) wanmant = (anmant * (srn & 0x3F)) >> 4 ; - retval = (wanexp >= 0) ? ((wanmant << wanexp) & 0x7FFF) : - (wanmant >> -wanexp); + retval = (wanexp >= 0) ? ((wanmant << wanexp) & 0x7FFF) : (wanmant >> -wanexp) ; - return (((an ^ srn) < 0) ? -retval : retval); + return (((an ^ srn) < 0) ? -retval : retval) ; } static G72x_STATE * g72x_state_new (void) @@ -105,7 +104,7 @@ static G72x_STATE * g72x_state_new (void) } /* - * private_init_state() + * private_init_state () * * This routine initializes and/or resets the G72x_PRIVATE structure * pointed to by 'state_ptr'. @@ -113,23 +112,23 @@ static G72x_STATE * g72x_state_new (void) */ void private_init_state (G72x_STATE *state_ptr) { - int cnta; + int cnta ; - state_ptr->yl = 34816; - state_ptr->yu = 544; - state_ptr->dms = 0; - state_ptr->dml = 0; - state_ptr->ap = 0; - for (cnta = 0; cnta < 2; cnta++) { - state_ptr->a[cnta] = 0; - state_ptr->pk[cnta] = 0; - state_ptr->sr[cnta] = 32; - } - for (cnta = 0; cnta < 6; cnta++) { - state_ptr->b[cnta] = 0; - state_ptr->dq[cnta] = 32; - } - state_ptr->td = 0; + state_ptr->yl = 34816 ; + state_ptr->yu = 544 ; + state_ptr->dms = 0 ; + state_ptr->dml = 0 ; + state_ptr->ap = 0 ; + for (cnta = 0 ; cnta < 2 ; cnta++) + { state_ptr->a [cnta] = 0 ; + state_ptr->pk [cnta] = 0 ; + state_ptr->sr [cnta] = 32 ; + } + for (cnta = 0 ; cnta < 6 ; cnta++) + { state_ptr->b [cnta] = 0 ; + state_ptr->dq [cnta] = 32 ; + } + state_ptr->td = 0 ; } /* private_init_state */ struct g72x_state * g72x_reader_init (int codec, int *blocksize, int *samplesperblock) @@ -264,60 +263,60 @@ int g72x_encode_block (G72x_STATE *pstate, short *samples, unsigned char *block) } /* g72x_encode_block */ /* - * predictor_zero() + * predictor_zero () * * computes the estimated signal from 6-zero predictor. * */ -int predictor_zero (G72x_STATE *state_ptr) +int predictor_zero (G72x_STATE *state_ptr) { - int i; - int sezi; + int i ; + int sezi ; - sezi = fmult(state_ptr->b[0] >> 2, state_ptr->dq[0]); - for (i = 1; i < 6; i++) /* ACCUM */ - sezi += fmult(state_ptr->b[i] >> 2, state_ptr->dq[i]); - return (sezi); + sezi = fmult (state_ptr->b [0] >> 2, state_ptr->dq [0]) ; + for (i = 1 ; i < 6 ; i++) /* ACCUM */ + sezi += fmult (state_ptr->b [i] >> 2, state_ptr->dq [i]) ; + return sezi ; } /* - * predictor_pole() + * predictor_pole () * * computes the estimated signal from 2-pole predictor. * */ -int predictor_pole(G72x_STATE *state_ptr) +int predictor_pole (G72x_STATE *state_ptr) { - return (fmult(state_ptr->a[1] >> 2, state_ptr->sr[1]) + - fmult(state_ptr->a[0] >> 2, state_ptr->sr[0])); + return (fmult (state_ptr->a [1] >> 2, state_ptr->sr [1]) + + fmult (state_ptr->a [0] >> 2, state_ptr->sr [0])) ; } /* - * step_size() + * step_size () * * computes the quantization step size of the adaptive quantizer. * */ -int step_size (G72x_STATE *state_ptr) +int step_size (G72x_STATE *state_ptr) { - int y; - int dif; - int al; + int y ; + int dif ; + int al ; if (state_ptr->ap >= 256) - return (state_ptr->yu); + return (state_ptr->yu) ; else { - y = state_ptr->yl >> 6; - dif = state_ptr->yu - y; - al = state_ptr->ap >> 2; + y = state_ptr->yl >> 6 ; + dif = state_ptr->yu - y ; + al = state_ptr->ap >> 2 ; if (dif > 0) - y += (dif * al) >> 6; + y += (dif * al) >> 6 ; else if (dif < 0) - y += (dif * al + 0x3F) >> 6; - return (y); + y += (dif * al + 0x3F) >> 6 ; + return y ; } } /* - * quantize() + * quantize () * * Given a raw sample, 'd', of the difference signal and a * quantization step size scale factor, 'y', this routine returns the @@ -325,87 +324,87 @@ int step_size (G72x_STATE *state_ptr) * size scale factor division operation is done in the log base 2 domain * as a subtraction. */ -int quantize( +int quantize ( int d, /* Raw difference signal sample */ int y, /* Step size multiplier */ short *table, /* quantization table */ int size) /* table size of short integers */ { - short dqm; /* Magnitude of 'd' */ - short expon; /* Integer part of base 2 log of 'd' */ - short mant; /* Fractional part of base 2 log */ - short dl; /* Log of magnitude of 'd' */ - short dln; /* Step size scale factor normalized log */ - int i; + short dqm ; /* Magnitude of 'd' */ + short expon ; /* Integer part of base 2 log of 'd' */ + short mant ; /* Fractional part of base 2 log */ + short dl ; /* Log of magnitude of 'd' */ + short dln ; /* Step size scale factor normalized log */ + int i ; /* * LOG * * Compute base 2 log of 'd', and store in 'dl'. */ - dqm = abs(d); - expon = quan(dqm >> 1, power2, 15); - mant = ((dqm << 7) >> expon) & 0x7F; /* Fractional portion. */ - dl = (expon << 7) + mant; + dqm = abs (d) ; + expon = quan (dqm >> 1, power2, 15) ; + mant = ((dqm << 7) >> expon) & 0x7F ; /* Fractional portion. */ + dl = (expon << 7) + mant ; /* * SUBTB * * "Divide" by step size multiplier. */ - dln = dl - (y >> 2); + dln = dl - (y >> 2) ; /* * QUAN * * Obtain codword i for 'd'. */ - i = quan(dln, table, size); + i = quan (dln, table, size) ; if (d < 0) /* take 1's complement of i */ - return ((size << 1) + 1 - i); + return ((size << 1) + 1 - i) ; else if (i == 0) /* take 1's complement of 0 */ - return ((size << 1) + 1); /* new in 1988 */ - else - return (i); + return ((size << 1) + 1) ; /* new in 1988 */ + + return i ; } /* - * reconstruct() + * reconstruct () * * Returns reconstructed difference signal 'dq' obtained from * codeword 'i' and quantization step size scale factor 'y'. * Multiplication is performed in log base 2 domain as addition. */ int -reconstruct( +reconstruct ( int sign, /* 0 for non-negative value */ int dqln, /* G.72x codeword */ int y) /* Step size multiplier */ { - short dql; /* Log of 'dq' magnitude */ - short dex; /* Integer part of log */ - short dqt; - short dq; /* Reconstructed difference signal sample */ + short dql ; /* Log of 'dq' magnitude */ + short dex ; /* Integer part of log */ + short dqt ; + short dq ; /* Reconstructed difference signal sample */ - dql = dqln + (y >> 2); /* ADDA */ + dql = dqln + (y >> 2) ; /* ADDA */ - if (dql < 0) { - return ((sign) ? -0x8000 : 0); - } else { /* ANTILOG */ - dex = (dql >> 7) & 15; - dqt = 128 + (dql & 127); - dq = (dqt << 7) >> (14 - dex); - return ((sign) ? (dq - 0x8000) : dq); - } + if (dql < 0) + return ((sign) ? -0x8000 : 0) ; + else /* ANTILOG */ + { dex = (dql >> 7) & 15 ; + dqt = 128 + (dql & 127) ; + dq = (dqt << 7) >> (14 - dex) ; + return ((sign) ? (dq - 0x8000) : dq) ; + } } /* - * update() + * update () * * updates the state variables for each output code */ void -update( +update ( int code_size, /* distinguish 723_40 with others */ int y, /* quantizer step size */ int wi, /* scale factor multiplier */ @@ -415,32 +414,32 @@ update( int dqsez, /* difference from 2-pole predictor */ G72x_STATE *state_ptr) /* coder state pointer */ { - int cnt; - short mag, expon; /* Adaptive predictor, FLOAT A */ - short a2p = 0; /* LIMC */ - short a1ul; /* UPA1 */ - short pks1; /* UPA2 */ - short fa1; - char tr; /* tone/transition detector */ - short ylint, thr2, dqthr; - short ylfrac, thr1; - short pk0; + int cnt ; + short mag, expon ; /* Adaptive predictor, FLOAT A */ + short a2p = 0 ; /* LIMC */ + short a1ul ; /* UPA1 */ + short pks1 ; /* UPA2 */ + short fa1 ; + char tr ; /* tone/transition detector */ + short ylint, thr2, dqthr ; + short ylfrac, thr1 ; + short pk0 ; - pk0 = (dqsez < 0) ? 1 : 0; /* needed in updating predictor poles */ + pk0 = (dqsez < 0) ? 1 : 0 ; /* needed in updating predictor poles */ - mag = dq & 0x7FFF; /* prediction difference magnitude */ + mag = dq & 0x7FFF ; /* prediction difference magnitude */ /* TRANS */ - ylint = state_ptr->yl >> 15; /* exponent part of yl */ - ylfrac = (state_ptr->yl >> 10) & 0x1F; /* fractional part of yl */ - thr1 = (32 + ylfrac) << ylint; /* threshold */ - thr2 = (ylint > 9) ? 31 << 10 : thr1; /* limit thr2 to 31 << 10 */ - dqthr = (thr2 + (thr2 >> 1)) >> 1; /* dqthr = 0.75 * thr2 */ + ylint = state_ptr->yl >> 15 ; /* exponent part of yl */ + ylfrac = (state_ptr->yl >> 10) & 0x1F ; /* fractional part of yl */ + thr1 = (32 + ylfrac) << ylint ; /* threshold */ + thr2 = (ylint > 9) ? 31 << 10 : thr1 ; /* limit thr2 to 31 << 10 */ + dqthr = (thr2 + (thr2 >> 1)) >> 1 ; /* dqthr = 0.75 * thr2 */ if (state_ptr->td == 0) /* signal supposed voice */ - tr = 0; + tr = 0 ; else if (mag <= dqthr) /* supposed data, but small mag */ - tr = 0; /* treated as voice */ + tr = 0 ; /* treated as voice */ else /* signal is data (modem) */ - tr = 1; + tr = 1 ; /* * Quantizer scale factor adaptation. @@ -448,151 +447,153 @@ update( /* FUNCTW & FILTD & DELAY */ /* update non-steady state step size multiplier */ - state_ptr->yu = y + ((wi - y) >> 5); + state_ptr->yu = y + ((wi - y) >> 5) ; /* LIMB */ if (state_ptr->yu < 544) /* 544 <= yu <= 5120 */ - state_ptr->yu = 544; + state_ptr->yu = 544 ; else if (state_ptr->yu > 5120) - state_ptr->yu = 5120; + state_ptr->yu = 5120 ; /* FILTE & DELAY */ /* update steady state step size multiplier */ - state_ptr->yl += state_ptr->yu + ((-state_ptr->yl) >> 6); + state_ptr->yl += state_ptr->yu + ((-state_ptr->yl) >> 6) ; /* * Adaptive predictor coefficients. */ if (tr == 1) { /* reset a's and b's for modem signal */ - state_ptr->a[0] = 0; - state_ptr->a[1] = 0; - state_ptr->b[0] = 0; - state_ptr->b[1] = 0; - state_ptr->b[2] = 0; - state_ptr->b[3] = 0; - state_ptr->b[4] = 0; - state_ptr->b[5] = 0; - } else { /* update a's and b's */ - pks1 = pk0 ^ state_ptr->pk[0]; /* UPA2 */ + state_ptr->a [0] = 0 ; + state_ptr->a [1] = 0 ; + state_ptr->b [0] = 0 ; + state_ptr->b [1] = 0 ; + state_ptr->b [2] = 0 ; + state_ptr->b [3] = 0 ; + state_ptr->b [4] = 0 ; + state_ptr->b [5] = 0 ; + } + else /* update a's and b's */ + { pks1 = pk0 ^ state_ptr->pk [0] ; /* UPA2 */ - /* update predictor pole a[1] */ - a2p = state_ptr->a[1] - (state_ptr->a[1] >> 7); - if (dqsez != 0) { - fa1 = (pks1) ? state_ptr->a[0] : -state_ptr->a[0]; + /* update predictor pole a [1] */ + a2p = state_ptr->a [1] - (state_ptr->a [1] >> 7) ; + if (dqsez != 0) + { fa1 = (pks1) ? state_ptr->a [0] : -state_ptr->a [0] ; if (fa1 < -8191) /* a2p = function of fa1 */ - a2p -= 0x100; + a2p -= 0x100 ; else if (fa1 > 8191) - a2p += 0xFF; + a2p += 0xFF ; else - a2p += fa1 >> 5; + a2p += fa1 >> 5 ; - if (pk0 ^ state_ptr->pk[1]) + if (pk0 ^ state_ptr->pk [1]) { /* LIMC */ if (a2p <= -12160) - a2p = -12288; + a2p = -12288 ; else if (a2p >= 12416) - a2p = 12288; + a2p = 12288 ; else - a2p -= 0x80; + a2p -= 0x80 ; } else if (a2p <= -12416) - a2p = -12288; + a2p = -12288 ; else if (a2p >= 12160) - a2p = 12288; + a2p = 12288 ; else - a2p += 0x80; + a2p += 0x80 ; } /* TRIGB & DELAY */ - state_ptr->a[1] = a2p; + state_ptr->a [1] = a2p ; /* UPA1 */ - /* update predictor pole a[0] */ - state_ptr->a[0] -= state_ptr->a[0] >> 8; + /* update predictor pole a [0] */ + state_ptr->a [0] -= state_ptr->a [0] >> 8 ; if (dqsez != 0) { if (pks1 == 0) - state_ptr->a[0] += 192; + state_ptr->a [0] += 192 ; else - state_ptr->a[0] -= 192; + state_ptr->a [0] -= 192 ; } ; /* LIMD */ - a1ul = 15360 - a2p; - if (state_ptr->a[0] < -a1ul) - state_ptr->a[0] = -a1ul; - else if (state_ptr->a[0] > a1ul) - state_ptr->a[0] = a1ul; + a1ul = 15360 - a2p ; + if (state_ptr->a [0] < -a1ul) + state_ptr->a [0] = -a1ul ; + else if (state_ptr->a [0] > a1ul) + state_ptr->a [0] = a1ul ; - /* UPB : update predictor zeros b[6] */ - for (cnt = 0; cnt < 6; cnt++) { - if (code_size == 5) /* for 40Kbps G.723 */ - state_ptr->b[cnt] -= state_ptr->b[cnt] >> 9; + /* UPB : update predictor zeros b [6] */ + for (cnt = 0 ; cnt < 6 ; cnt++) + { if (code_size == 5) /* for 40Kbps G.723 */ + state_ptr->b [cnt] -= state_ptr->b [cnt] >> 9 ; else /* for G.721 and 24Kbps G.723 */ - state_ptr->b[cnt] -= state_ptr->b[cnt] >> 8; - if (dq & 0x7FFF) { /* XOR */ - if ((dq ^ state_ptr->dq[cnt]) >= 0) - state_ptr->b[cnt] += 128; + state_ptr->b [cnt] -= state_ptr->b [cnt] >> 8 ; + if (dq & 0x7FFF) /* XOR */ + { if ((dq ^ state_ptr->dq [cnt]) >= 0) + state_ptr->b [cnt] += 128 ; else - state_ptr->b[cnt] -= 128; + state_ptr->b [cnt] -= 128 ; + } } } - } - for (cnt = 5; cnt > 0; cnt--) - state_ptr->dq[cnt] = state_ptr->dq[cnt-1]; - /* FLOAT A : convert dq[0] to 4-bit exp, 6-bit mantissa f.p. */ - if (mag == 0) { - state_ptr->dq[0] = (dq >= 0) ? 0x20 : 0xFC20; - } else { - expon = quan(mag, power2, 15); - state_ptr->dq[0] = (dq >= 0) ? - (expon << 6) + ((mag << 6) >> expon) : - (expon << 6) + ((mag << 6) >> expon) - 0x400; - } + for (cnt = 5 ; cnt > 0 ; cnt--) + state_ptr->dq [cnt] = state_ptr->dq [cnt - 1] ; + /* FLOAT A : convert dq [0] to 4-bit exp, 6-bit mantissa f.p. */ + if (mag == 0) + state_ptr->dq [0] = (dq >= 0) ? 0x20 : 0xFC20 ; + else + { expon = quan (mag, power2, 15) ; + state_ptr->dq [0] = (dq >= 0) ? + (expon << 6) + ((mag << 6) >> expon) : + (expon << 6) + ((mag << 6) >> expon) - 0x400 ; + } - state_ptr->sr[1] = state_ptr->sr[0]; + state_ptr->sr [1] = state_ptr->sr [0] ; /* FLOAT B : convert sr to 4-bit exp., 6-bit mantissa f.p. */ - if (sr == 0) { - state_ptr->sr[0] = 0x20; - } else if (sr > 0) { - expon = quan(sr, power2, 15); - state_ptr->sr[0] = (expon << 6) + ((sr << 6) >> expon); - } else if (sr > -32768) { - mag = -sr; - expon = quan(mag, power2, 15); - state_ptr->sr[0] = (expon << 6) + ((mag << 6) >> expon) - 0x400; - } else - state_ptr->sr[0] = (short) 0xFC20; + if (sr == 0) + state_ptr->sr [0] = 0x20 ; + else if (sr > 0) + { expon = quan (sr, power2, 15) ; + state_ptr->sr [0] = (expon << 6) + ((sr << 6) >> expon) ; + } + else if (sr > -32768) + { mag = -sr ; + expon = quan (mag, power2, 15) ; + state_ptr->sr [0] = (expon << 6) + ((mag << 6) >> expon) - 0x400 ; + } + else + state_ptr->sr [0] = (short) 0xFC20 ; /* DELAY A */ - state_ptr->pk[1] = state_ptr->pk[0]; - state_ptr->pk[0] = pk0; + state_ptr->pk [1] = state_ptr->pk [0] ; + state_ptr->pk [0] = pk0 ; /* TONE */ if (tr == 1) /* this sample has been treated as data */ - state_ptr->td = 0; /* next one will be treated as voice */ + state_ptr->td = 0 ; /* next one will be treated as voice */ else if (a2p < -11776) /* small sample-to-sample correlation */ - state_ptr->td = 1; /* signal may be data */ + state_ptr->td = 1 ; /* signal may be data */ else /* signal is voice */ - state_ptr->td = 0; + state_ptr->td = 0 ; /* * Adaptation speed control. */ - state_ptr->dms += (fi - state_ptr->dms) >> 5; /* FILTA */ - state_ptr->dml += (((fi << 2) - state_ptr->dml) >> 7); /* FILTB */ + state_ptr->dms += (fi - state_ptr->dms) >> 5 ; /* FILTA */ + state_ptr->dml += (((fi << 2) - state_ptr->dml) >> 7) ; /* FILTB */ if (tr == 1) - state_ptr->ap = 256; + state_ptr->ap = 256 ; else if (y < 1536) /* SUBTC */ - state_ptr->ap += (0x200 - state_ptr->ap) >> 4; + state_ptr->ap += (0x200 - state_ptr->ap) >> 4 ; else if (state_ptr->td == 1) - state_ptr->ap += (0x200 - state_ptr->ap) >> 4; - else if (abs((state_ptr->dms << 2) - state_ptr->dml) >= - (state_ptr->dml >> 3)) - state_ptr->ap += (0x200 - state_ptr->ap) >> 4; + state_ptr->ap += (0x200 - state_ptr->ap) >> 4 ; + else if (abs ((state_ptr->dms << 2) - state_ptr->dml) >= (state_ptr->dml >> 3)) + state_ptr->ap += (0x200 - state_ptr->ap) >> 4 ; else - state_ptr->ap += (-state_ptr->ap) >> 4; + state_ptr->ap += (-state_ptr->ap) >> 4 ; return ; } /* update */ @@ -602,7 +603,7 @@ update( static int unpack_bytes (int bits, int blocksize, const unsigned char * block, short * samples) -{ unsigned int in_buffer = 0 ; +{ unsigned int in_buffer = 0 ; unsigned char in_byte ; int k, in_bits = 0, bindex = 0 ; @@ -610,12 +611,12 @@ unpack_bytes (int bits, int blocksize, const unsigned char * block, short * samp { if (in_bits < bits) { in_byte = block [bindex++] ; - in_buffer |= (in_byte << in_bits); - in_bits += 8; + in_buffer |= (in_byte << in_bits) ; + in_bits += 8 ; } - samples [k] = in_buffer & ((1 << bits) - 1); - in_buffer >>= bits; - in_bits -= bits; + samples [k] = in_buffer & ((1 << bits) - 1) ; + in_buffer >>= bits ; + in_bits -= bits ; } ; return k ; diff --git a/lib-src/libsndfile/src/G72x/g72x_priv.h b/lib-src/libsndfile/src/G72x/g72x_priv.h index 867c64b38..e418fb758 100644 --- a/lib-src/libsndfile/src/G72x/g72x_priv.h +++ b/lib-src/libsndfile/src/G72x/g72x_priv.h @@ -42,29 +42,29 @@ */ struct g72x_state -{ long yl; /* Locked or steady state step size multiplier. */ - short yu; /* Unlocked or non-steady state step size multiplier. */ - short dms; /* Short term energy estimate. */ - short dml; /* Long term energy estimate. */ - short ap; /* Linear weighting coefficient of 'yl' and 'yu'. */ +{ long yl ; /* Locked or steady state step size multiplier. */ + short yu ; /* Unlocked or non-steady state step size multiplier. */ + short dms ; /* Short term energy estimate. */ + short dml ; /* Long term energy estimate. */ + short ap ; /* Linear weighting coefficient of 'yl' and 'yu'. */ - short a[2]; /* Coefficients of pole portion of prediction filter. */ - short b[6]; /* Coefficients of zero portion of prediction filter. */ - short pk[2]; /* + short a [2] ; /* Coefficients of pole portion of prediction filter. */ + short b [6] ; /* Coefficients of zero portion of prediction filter. */ + short pk [2] ; /* ** Signs of previous two samples of a partially ** reconstructed signal. **/ - short dq[6]; /* + short dq [6] ; /* ** Previous 6 samples of the quantized difference ** signal represented in an internal floating point ** format. **/ - short sr[2]; /* + short sr [2] ; /* ** Previous 2 samples of the quantized difference ** signal represented in an internal floating point ** format. */ - char td; /* delayed tone detect, new in 1988 version */ + char td ; /* delayed tone detect, new in 1988 version */ /* The following struct members were added for libsndfile. The original ** code worked by calling a set of functions on a sample by sample basis @@ -80,30 +80,48 @@ struct g72x_state typedef struct g72x_state G72x_STATE ; -int predictor_zero (G72x_STATE *state_ptr); +int predictor_zero (G72x_STATE *state_ptr) ; -int predictor_pole (G72x_STATE *state_ptr); +int predictor_pole (G72x_STATE *state_ptr) ; -int step_size (G72x_STATE *state_ptr); +int step_size (G72x_STATE *state_ptr) ; -int quantize (int d, int y, short *table, int size); +int quantize (int d, int y, short *table, int size) ; -int reconstruct (int sign, int dqln, int y); +int reconstruct (int sign, int dqln, int y) ; -void update (int code_size, int y, int wi, int fi, int dq, int sr, int dqsez, G72x_STATE *state_ptr); +void update (int code_size, int y, int wi, int fi, int dq, int sr, int dqsez, G72x_STATE *state_ptr) ; -int g721_encoder (int sample, G72x_STATE *state_ptr); -int g721_decoder (int code, G72x_STATE *state_ptr); +int g721_encoder (int sample, G72x_STATE *state_ptr) ; +int g721_decoder (int code, G72x_STATE *state_ptr) ; -int g723_16_encoder (int sample, G72x_STATE *state_ptr); -int g723_16_decoder (int code, G72x_STATE *state_ptr); +int g723_16_encoder (int sample, G72x_STATE *state_ptr) ; +int g723_16_decoder (int code, G72x_STATE *state_ptr) ; -int g723_24_encoder (int sample, G72x_STATE *state_ptr); -int g723_24_decoder (int code, G72x_STATE *state_ptr); +int g723_24_encoder (int sample, G72x_STATE *state_ptr) ; +int g723_24_decoder (int code, G72x_STATE *state_ptr) ; -int g723_40_encoder (int sample, G72x_STATE *state_ptr); -int g723_40_decoder (int code, G72x_STATE *state_ptr); +int g723_40_encoder (int sample, G72x_STATE *state_ptr) ; +int g723_40_decoder (int code, G72x_STATE *state_ptr) ; void private_init_state (G72x_STATE *state_ptr) ; +#if __GNUC__ +#define ALWAYS_INLINE __attribute__ ((always_inline)) +#else +#define ALWAYS_INLINE +#endif + +static inline int ALWAYS_INLINE +arith_shift_left (int x, int shift) +{ return (int) (((unsigned int) x) << shift) ; +} /* arith_shift_left */ + +static inline int ALWAYS_INLINE +arith_shift_right (int x, int shift) +{ if (x >= 0) + return x << shift ; + return ~ ((~x) << shift) ; +} /* arith_shift_right */ + #endif /* G72X_PRIVATE_H */ diff --git a/lib-src/libsndfile/src/G72x/g72x_test.c b/lib-src/libsndfile/src/G72x/g72x_test.c index 79cabce11..e8a976773 100644 --- a/lib-src/libsndfile/src/G72x/g72x_test.c +++ b/lib-src/libsndfile/src/G72x/g72x_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** 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 @@ -16,8 +16,14 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "sfconfig.h" + #include +#if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" +#endif #include #include #include @@ -29,7 +35,7 @@ #define M_PI 3.14159265358979323846264338 #endif -#define BUFFER_SIZE (1<<14) /* Should be (1<<14) */ +#define BUFFER_SIZE (1 << 14) #define SAMPLE_RATE 11025 @@ -55,7 +61,7 @@ main (int argc, char *argv []) exit (1) ; } ; - bDoAll=!strcmp (argv [1], "all"); + bDoAll = !strcmp (argv [1], "all") ; if (bDoAll || ! strcmp (argv [1], "g721")) { g721_test () ; @@ -169,7 +175,7 @@ error_function (double data, double orig, double margin) { double error ; if (fabs (orig) <= 500.0) - error = fabs (fabs (data) - fabs(orig)) / 2000.0 ; + error = fabs (fabs (data) - fabs (orig)) / 2000.0 ; else if (fabs (orig) <= 1000.0) error = fabs (data - orig) / 3000.0 ; else diff --git a/lib-src/libsndfile/src/GSM610/Makefile.am b/lib-src/libsndfile/src/GSM610/Makefile.am deleted file mode 100644 index a7358f283..000000000 --- a/lib-src/libsndfile/src/GSM610/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = README COPYRIGHT ChangeLog - -noinst_HEADERS = gsm.h config.h gsm610_priv.h -noinst_LTLIBRARIES = libgsm.la - -CFILES = add.c decode.c gsm_decode.c gsm_encode.c long_term.c preprocess.c \ - short_term.c code.c gsm_create.c gsm_destroy.c gsm_option.c lpc.c rpe.c table.c - -libgsm_la_SOURCES = $(CFILES) $(noinst_HEADERS) - -# Disable autoheader. -AUTOHEADER=echo - - diff --git a/lib-src/libsndfile/src/GSM610/Makefile.in b/lib-src/libsndfile/src/GSM610/Makefile.in deleted file mode 100644 index b4bce1a19..000000000 --- a/lib-src/libsndfile/src/GSM610/Makefile.in +++ /dev/null @@ -1,663 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = src/GSM610 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/Cfg/depcomp $(noinst_HEADERS) ChangeLog README -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libgsm_la_LIBADD = -am__objects_1 = add.lo decode.lo gsm_decode.lo gsm_encode.lo \ - long_term.lo preprocess.lo short_term.lo code.lo gsm_create.lo \ - gsm_destroy.lo gsm_option.lo lpc.lo rpe.lo table.lo -am__objects_2 = -am_libgsm_la_OBJECTS = $(am__objects_1) $(am__objects_2) -libgsm_la_OBJECTS = $(am_libgsm_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -depcomp = $(SHELL) $(top_srcdir)/Cfg/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libgsm_la_SOURCES) -DIST_SOURCES = $(libgsm_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -HEADERS = $(noinst_HEADERS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ - -# Disable autoheader. -AUTOHEADER = echo -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = README COPYRIGHT ChangeLog -noinst_HEADERS = gsm.h config.h gsm610_priv.h -noinst_LTLIBRARIES = libgsm.la -CFILES = add.c decode.c gsm_decode.c gsm_encode.c long_term.c preprocess.c \ - short_term.c code.c gsm_create.c gsm_destroy.c gsm_option.c lpc.c rpe.c table.c - -libgsm_la_SOURCES = $(CFILES) $(noinst_HEADERS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/GSM610/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/GSM610/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libgsm.la: $(libgsm_la_OBJECTS) $(libgsm_la_DEPENDENCIES) $(EXTRA_libgsm_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libgsm_la_OBJECTS) $(libgsm_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/code.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_create.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_destroy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_encode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_option.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/long_term.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lpc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preprocess.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpe.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/short_term.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/src/GSM610/add.c b/lib-src/libsndfile/src/GSM610/add.c index 6f4eb5cc5..c943eec7b 100644 --- a/lib-src/libsndfile/src/GSM610/add.c +++ b/lib-src/libsndfile/src/GSM610/add.c @@ -16,225 +16,228 @@ #define saturate(x) \ ((x) < MIN_WORD ? MIN_WORD : (x) > MAX_WORD ? MAX_WORD: (x)) -word gsm_add ( word a, word b) +int16_t gsm_add (int16_t a, int16_t b) { - longword sum = (longword)a + (longword)b; - return saturate(sum); + int32_t sum = (int32_t) a + (int32_t) b ; + return saturate (sum) ; } -word gsm_sub ( word a, word b) +int16_t gsm_sub (int16_t a, int16_t b) { - longword diff = (longword)a - (longword)b; - return saturate(diff); + int32_t diff = (int32_t) a - (int32_t) b ; + return saturate (diff) ; } -word gsm_mult ( word a, word b) +int16_t gsm_mult (int16_t a, int16_t b) { if (a == MIN_WORD && b == MIN_WORD) - return MAX_WORD; - - return SASR_L( (longword)a * (longword)b, 15 ); + return MAX_WORD ; + + return SASR_L ((int32_t) a * (int32_t) b, 15) ; } -word gsm_mult_r ( word a, word b) +int16_t gsm_mult_r (int16_t a, int16_t b) { - if (b == MIN_WORD && a == MIN_WORD) return MAX_WORD; - else { - longword prod = (longword)a * (longword)b + 16384; - prod >>= 15; - return prod & 0xFFFF; - } -} - -word gsm_abs (word a) -{ - return a < 0 ? (a == MIN_WORD ? MAX_WORD : -a) : a; -} - -longword gsm_L_mult (word a, word b) -{ - assert( a != MIN_WORD || b != MIN_WORD ); - return ((longword)a * (longword)b) << 1; -} - -longword gsm_L_add ( longword a, longword b) -{ - if (a < 0) { - if (b >= 0) return a + b; - else { - ulongword A = (ulongword)-(a + 1) + (ulongword)-(b + 1); - return A >= MAX_LONGWORD ? MIN_LONGWORD :-(longword)A-2; + if (b == MIN_WORD && a == MIN_WORD) + return MAX_WORD ; + else + { int32_t prod = (int32_t) a * (int32_t) b + 16384 ; + prod >>= 15 ; + return prod & 0xFFFF ; } - } - else if (b <= 0) return a + b; - else { - ulongword A = (ulongword)a + (ulongword)b; - return A > MAX_LONGWORD ? MAX_LONGWORD : A; - } } -longword gsm_L_sub ( longword a, longword b) +int16_t gsm_abs (int16_t a) { - if (a >= 0) { - if (b >= 0) return a - b; - else { - /* a>=0, b<0 */ - - ulongword A = (ulongword)a + -(b + 1); - return A >= MAX_LONGWORD ? MAX_LONGWORD : (A + 1); - } - } - else if (b <= 0) return a - b; - else { - /* a<0, b>0 */ - - ulongword A = (ulongword)-(a + 1) + b; - return A >= MAX_LONGWORD ? MIN_LONGWORD : -(longword)A - 1; - } + return a < 0 ? (a == MIN_WORD ? MAX_WORD : -a) : a ; } -static unsigned char const bitoff[ 256 ] = { - 8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; +int32_t gsm_L_mult (int16_t a, int16_t b) +{ + assert (a != MIN_WORD || b != MIN_WORD) ; + return ((int32_t) a * (int32_t) b) << 1 ; +} -word gsm_norm (longword a ) +int32_t gsm_L_add (int32_t a, int32_t b) +{ + if (a < 0) + { if (b >= 0) + return a + b ; + else + { uint32_t A = (uint32_t) - (a + 1) + (uint32_t) - (b + 1) ; + return A >= MAX_LONGWORD ? MIN_LONGWORD : - (int32_t) A - 2 ; + } + } + else if (b <= 0) + return a + b ; + else + { uint32_t A = (uint32_t) a + (uint32_t) b ; + return A > MAX_LONGWORD ? MAX_LONGWORD : A ; + } +} + +int32_t gsm_L_sub (int32_t a, int32_t b) +{ + if (a >= 0) + { if (b >= 0) + return a - b ; + else + { /* a>=0, b<0 */ + uint32_t A = (uint32_t) a + - (b + 1) ; + return A >= MAX_LONGWORD ? MAX_LONGWORD : (A + 1) ; + } + } + else if (b <= 0) + return a - b ; + else + { /* a<0, b>0 */ + uint32_t A = (uint32_t) - (a + 1) + b ; + return A >= MAX_LONGWORD ? MIN_LONGWORD : - (int32_t) A - 1 ; + } +} + +static unsigned char const bitoff [256] = { + 8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +} ; + +int16_t gsm_norm (int32_t a) /* * the number of left shifts needed to normalize the 32 bit * variable L_var1 for positive values on the interval * * with minimum of - * minimum of 1073741824 (01000000000000000000000000000000) and + * minimum of 1073741824 (01000000000000000000000000000000) and * maximum of 2147483647 (01111111111111111111111111111111) * * * and for negative values on the interval with * minimum of -2147483648 (-10000000000000000000000000000000) and - * maximum of -1073741824 ( -1000000000000000000000000000000). + * maximum of -1073741824 (-1000000000000000000000000000000). * * in order to normalize the result, the following - * operation must be done: L_norm_var1 = L_var1 << norm( L_var1 ); + * operation must be done: L_norm_var1 = L_var1 << norm (L_var1) ; * * (That's 'ffs', only from the left, not the right..) */ { - assert(a != 0); + assert (a != 0) ; - if (a < 0) { - if (a <= -1073741824) return 0; - a = ~a; - } + if (a < 0) + { if (a <= -1073741824) return 0 ; + a = ~a ; + } - return a & 0xffff0000 - ? ( a & 0xff000000 - ? -1 + bitoff[ 0xFF & (a >> 24) ] - : 7 + bitoff[ 0xFF & (a >> 16) ] ) - : ( a & 0xff00 - ? 15 + bitoff[ 0xFF & (a >> 8) ] - : 23 + bitoff[ 0xFF & a ] ); + return a & 0xffff0000 + ? (a & 0xff000000 + ? -1 + bitoff [0xFF & (a >> 24)] + : 7 + bitoff [0xFF & (a >> 16)]) + : (a & 0xff00 + ? 15 + bitoff [0xFF & (a >> 8)] + : 23 + bitoff [0xFF & a]) ; } -longword gsm_L_asl (longword a, int n) +int32_t gsm_L_asl (int32_t a, int n) { - if (n >= 32) return 0; - if (n <= -32) return -(a < 0); - if (n < 0) return gsm_L_asr(a, -n); - return a << n; + if (n >= 32) return 0 ; + if (n <= -32) return - (a < 0) ; + if (n < 0) return gsm_L_asr (a, -n) ; + return a << n ; } -word gsm_asr (word a, int n) +int16_t gsm_asr (int16_t a, int n) { - if (n >= 16) return -(a < 0); - if (n <= -16) return 0; - if (n < 0) return a << -n; + if (n >= 16) return - (a < 0) ; + if (n <= -16) return 0 ; + if (n < 0) return a << -n ; - return SASR_W (a, (word) n); + return SASR_W (a, (int16_t) n) ; } -word gsm_asl (word a, int n) +int16_t gsm_asl (int16_t a, int n) { - if (n >= 16) return 0; - if (n <= -16) return -(a < 0); - if (n < 0) return gsm_asr(a, -n); - return a << n; + if (n >= 16) return 0 ; + if (n <= -16) return - (a < 0) ; + if (n < 0) return gsm_asr (a, -n) ; + return a << n ; } -longword gsm_L_asr (longword a, int n) +int32_t gsm_L_asr (int32_t a, int n) { - if (n >= 32) return -(a < 0); - if (n <= -32) return 0; - if (n < 0) return a << -n; + if (n >= 32) return - (a < 0) ; + if (n <= -32) return 0 ; + if (n < 0) return a << -n ; - return SASR_L (a, (word) n); + return SASR_L (a, (int16_t) n) ; } /* -** word gsm_asr (word a, int n) +** int16_t gsm_asr (int16_t a, int n) ** { -** if (n >= 16) return -(a < 0); -** if (n <= -16) return 0; -** if (n < 0) return a << -n; -** +** if (n >= 16) return - (a < 0) ; +** if (n <= -16) return 0 ; +** if (n < 0) return a << -n ; +** ** # ifdef SASR_W -** return a >> n; +** return a >> n ; ** # else -** if (a >= 0) return a >> n; -** else return -(word)( -(uword)a >> n ); +** if (a >= 0) return a >> n ; +** else return - (int16_t) (- (uint16_t)a >> n) ; ** # endif ** } -** +** */ -/* +/* * (From p. 46, end of section 4.2.5) * * NOTE: The following lines gives [sic] one correct implementation - * of the div(num, denum) arithmetic operation. Compute div + * of the div (num, denum) arithmetic operation. Compute div * which is the integer division of num by denum: with denum - * >= num > 0 + * >= num > 0 */ -word gsm_div (word num, word denum) +int16_t gsm_div (int16_t num, int16_t denum) { - longword L_num = num; - longword L_denum = denum; - word div = 0; - int k = 15; + int32_t L_num = num ; + int32_t L_denum = denum ; + int16_t div = 0 ; + int k = 15 ; /* The parameter num sometimes becomes zero. - * Although this is explicitly guarded against in 4.2.5, - * we assume that the result should then be zero as well. - */ + * Although this is explicitly guarded against in 4.2.5, + * we assume that the result should then be zero as well. + */ - /* assert(num != 0); */ + /* assert (num != 0) ; */ - assert(num >= 0 && denum >= num); + assert (num >= 0 && denum >= num) ; if (num == 0) - return 0; + return 0 ; - while (k--) { - div <<= 1; - L_num <<= 1; + while (k--) + { div <<= 1 ; + L_num <<= 1 ; - if (L_num >= L_denum) { - L_num -= L_denum; - div++; + if (L_num >= L_denum) + { L_num -= L_denum ; + div++ ; + } } - } - return div; + return div ; } diff --git a/lib-src/libsndfile/src/GSM610/code.c b/lib-src/libsndfile/src/GSM610/code.c index 78cb853c1..991913bda 100644 --- a/lib-src/libsndfile/src/GSM610/code.c +++ b/lib-src/libsndfile/src/GSM610/code.c @@ -10,27 +10,27 @@ #include "gsm610_priv.h" -/* - * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER +/* + * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER */ void Gsm_Coder ( struct gsm_state * State, - word * s, /* [0..159] samples IN */ + int16_t * s, /* [0..159] samples IN */ /* * The RPE-LTD coder works on a frame by frame basis. The length of * the frame is equal to 160 samples. Some computations are done * once per frame to produce at the output of the coder the - * LARc[1..8] parameters which are the coded LAR coefficients and + * LARc [1..8] parameters which are the coded LAR coefficients and * also to realize the inverse filtering operation for the entire - * frame (160 samples of signal d[0..159]). These parts produce at + * frame (160 samples of signal d [0..159]). These parts produce at * the output of the coder: */ - word * LARc, /* [0..7] LAR coefficients OUT */ + int16_t * LARc, /* [0..7] LAR coefficients OUT */ /* * Procedure 4.2.11 to 4.2.18 are to be executed four times per @@ -38,50 +38,50 @@ void Gsm_Coder ( * 40 samples. These parts produce at the output of the coder: */ - word * Nc, /* [0..3] LTP lag OUT */ - word * bc, /* [0..3] coded LTP gain OUT */ - word * Mc, /* [0..3] RPE grid selection OUT */ - word * xmaxc,/* [0..3] Coded maximum amplitude OUT */ - word * xMc /* [13*4] normalized RPE samples OUT */ + int16_t *Nc, /* [0..3] LTP lag OUT */ + int16_t *bc, /* [0..3] coded LTP gain OUT */ + int16_t *Mc, /* [0..3] RPE grid selection OUT */ + int16_t *xmaxc, /* [0..3] Coded maximum amplitude OUT */ + int16_t *xMc /* [13*4] normalized RPE samples OUT */ ) { - int k; - word * dp = State->dp0 + 120; /* [ -120...-1 ] */ - word * dpp = dp; /* [ 0...39 ] */ + int k ; + int16_t *dp = State->dp0 + 120 ; /* [-120...-1] */ + int16_t *dpp = dp ; /* [0...39] */ - word so[160]; + int16_t so [160] ; - Gsm_Preprocess (State, s, so); - Gsm_LPC_Analysis (State, so, LARc); - Gsm_Short_Term_Analysis_Filter (State, LARc, so); + Gsm_Preprocess (State, s, so) ; + Gsm_LPC_Analysis (State, so, LARc) ; + Gsm_Short_Term_Analysis_Filter (State, LARc, so) ; - for (k = 0; k <= 3; k++, xMc += 13) { + for (k = 0 ; k <= 3 ; k++, xMc += 13) + { Gsm_Long_Term_Predictor (State, + so+k*40, /* d [0..39] IN */ + dp, /* dp [-120..-1] IN */ + State->e + 5, /* e [0..39] OUT */ + dpp, /* dpp [0..39] OUT */ + Nc++, + bc++) ; - Gsm_Long_Term_Predictor ( State, - so+k*40, /* d [0..39] IN */ - dp, /* dp [-120..-1] IN */ - State->e + 5, /* e [0..39] OUT */ - dpp, /* dpp [0..39] OUT */ - Nc++, - bc++); - - Gsm_RPE_Encoding ( /*-S,-*/ - State->e + 5, /* e ][0..39][ IN/OUT */ - xmaxc++, Mc++, xMc ); + Gsm_RPE_Encoding (/*-S,-*/ + State->e + 5, /* e ][0..39][IN/OUT */ + xmaxc++, Mc++, xMc) ; /* * Gsm_Update_of_reconstructed_short_time_residual_signal - * ( dpp, State->e + 5, dp ); + * (dpp, State->e + 5, dp) ; */ - { register int i; - for (i = 0; i <= 39; i++) - dp[ i ] = GSM_ADD( State->e[5 + i], dpp[i] ); + { + register int i ; + for (i = 0 ; i <= 39 ; i++) + dp [i] = GSM_ADD (State->e [5 + i], dpp [i]) ; } - dp += 40; - dpp += 40; + dp += 40 ; + dpp += 40 ; } - (void)memcpy( (char *)State->dp0, (char *)(State->dp0 + 160), - 120 * sizeof(*State->dp0) ); + memcpy ((char *) State->dp0, (char *) (State->dp0 + 160), + 120 * sizeof (*State->dp0)) ; } diff --git a/lib-src/libsndfile/src/GSM610/decode.c b/lib-src/libsndfile/src/GSM610/decode.c index 350df1296..2a0712f09 100644 --- a/lib-src/libsndfile/src/GSM610/decode.c +++ b/lib-src/libsndfile/src/GSM610/decode.c @@ -14,46 +14,45 @@ static void Postprocessing ( struct gsm_state * S, - register word * s) + register int16_t * s) { - register int k; - register word msr = S->msr; - register word tmp; + register int k ; + register int16_t msr = S->msr ; + register int16_t tmp ; - for (k = 160; k--; s++) { - tmp = GSM_MULT_R( msr, 28180 ); - msr = GSM_ADD(*s, tmp); /* Deemphasis */ - *s = GSM_ADD(msr, msr) & 0xFFF8; /* Truncation & Upscaling */ - } - S->msr = msr; + for (k = 160 ; k-- ; s++) + { tmp = GSM_MULT_R (msr, 28180) ; + msr = GSM_ADD (*s, tmp) ; /* Deemphasis */ + *s = GSM_ADD (msr, msr) & 0xFFF8 ; /* Truncation & Upscaling */ + } + S->msr = msr ; } void Gsm_Decoder ( struct gsm_state * S, - word * LARcr, /* [0..7] IN */ + int16_t * LARcr, /* [0..7] IN */ - word * Ncr, /* [0..3] IN */ - word * bcr, /* [0..3] IN */ - word * Mcr, /* [0..3] IN */ - word * xmaxcr, /* [0..3] IN */ - word * xMcr, /* [0..13*4] IN */ + int16_t * Ncr, /* [0..3] IN */ + int16_t * bcr, /* [0..3] IN */ + int16_t * Mcr, /* [0..3] IN */ + int16_t * xmaxcr, /* [0..3] IN */ + int16_t * xMcr, /* [0..13*4] IN */ - word * s) /* [0..159] OUT */ + int16_t * s) /* [0..159] OUT */ { - int j, k; - word erp[40], wt[160]; - word * drp = S->dp0 + 120; + int j, k ; + int16_t erp [40], wt [160] ; + int16_t *drp = S->dp0 + 120 ; - for (j=0; j <= 3; j++, xmaxcr++, bcr++, Ncr++, Mcr++, xMcr += 13) { + for (j = 0 ; j <= 3 ; j++, xmaxcr++, bcr++, Ncr++, Mcr++, xMcr += 13) + { Gsm_RPE_Decoding (/*-S,-*/ *xmaxcr, *Mcr, xMcr, erp) ; + Gsm_Long_Term_Synthesis_Filtering (S, *Ncr, *bcr, erp, drp) ; - Gsm_RPE_Decoding( /*-S,-*/ *xmaxcr, *Mcr, xMcr, erp ); - Gsm_Long_Term_Synthesis_Filtering( S, *Ncr, *bcr, erp, drp ); + for (k = 0 ; k <= 39 ; k++) wt [j * 40 + k] = drp [k] ; + } - for (k = 0; k <= 39; k++) wt[ j * 40 + k ] = drp[ k ]; - } - - Gsm_Short_Term_Synthesis_Filter( S, LARcr, wt, s ); - Postprocessing(S, s); + Gsm_Short_Term_Synthesis_Filter (S, LARcr, wt, s) ; + Postprocessing (S, s) ; } diff --git a/lib-src/libsndfile/src/GSM610/gsm.h b/lib-src/libsndfile/src/GSM610/gsm.h index 48aecc75a..6506a6581 100644 --- a/lib-src/libsndfile/src/GSM610/gsm.h +++ b/lib-src/libsndfile/src/GSM610/gsm.h @@ -13,12 +13,12 @@ * Interface */ -typedef struct gsm_state * gsm; -typedef short gsm_signal; /* signed 16 bit */ -typedef unsigned char gsm_byte; -typedef gsm_byte gsm_frame[33]; /* 33 * 8 bits */ +typedef struct gsm_state * gsm ; +typedef short gsm_signal ; /* signed 16 bit */ +typedef unsigned char gsm_byte ; +typedef gsm_byte gsm_frame [33] ; /* 33 * 8 bits */ -#define GSM_MAGIC 0xD /* 13 kbit/s RPE-LTP */ +#define GSM_MAGIC 0xD /* 13 kbit/s RPE-LTP */ #define GSM_PATCHLEVEL 10 #define GSM_MINOR 0 @@ -31,21 +31,21 @@ typedef gsm_byte gsm_frame[33]; /* 33 * 8 bits */ #define GSM_OPT_FRAME_INDEX 5 #define GSM_OPT_FRAME_CHAIN 6 -gsm gsm_create (void); +gsm gsm_create (void) ; /* Added for libsndfile : May 6, 2002 */ -void gsm_init (gsm); +void gsm_init (gsm) ; -void gsm_destroy (gsm); +void gsm_destroy (gsm) ; -int gsm_print (FILE *, gsm, gsm_byte *); -int gsm_option (gsm, int, int *); +int gsm_print (FILE *, gsm, gsm_byte *) ; +int gsm_option (gsm, int, int *) ; -void gsm_encode (gsm, gsm_signal *, gsm_byte *); -int gsm_decode (gsm, gsm_byte *, gsm_signal *); +void gsm_encode (gsm, gsm_signal *, gsm_byte *) ; +int gsm_decode (gsm, gsm_byte *, gsm_signal *) ; -int gsm_explode (gsm, gsm_byte *, gsm_signal *); -void gsm_implode (gsm, gsm_signal *, gsm_byte *); +int gsm_explode (gsm, gsm_byte *, gsm_signal *) ; +void gsm_implode (gsm, gsm_signal *, gsm_byte *) ; #endif /* GSM_H */ diff --git a/lib-src/libsndfile/src/GSM610/gsm610_priv.h b/lib-src/libsndfile/src/GSM610/gsm610_priv.h index e121c1c34..dc95e3a06 100644 --- a/lib-src/libsndfile/src/GSM610/gsm610_priv.h +++ b/lib-src/libsndfile/src/GSM610/gsm610_priv.h @@ -7,6 +7,8 @@ #ifndef PRIVATE_H #define PRIVATE_H +#include + /* Added by Erik de Castro Lopo */ #define USE_FLOAT_MUL #define FAST @@ -17,126 +19,137 @@ #endif /* Added by Erik de Castro Lopo */ - - -typedef short word; /* 16 bit signed int */ -typedef int longword; /* 32 bit signed int */ - -typedef unsigned short uword; /* unsigned word */ -typedef unsigned int ulongword; /* unsigned longword */ - struct gsm_state -{ word dp0[ 280 ] ; +{ int16_t dp0 [280] ; - word z1; /* preprocessing.c, Offset_com. */ - longword L_z2; /* Offset_com. */ - int mp; /* Preemphasis */ + int16_t z1 ; /* preprocessing.c, Offset_com. */ + int32_t L_z2 ; /* Offset_com. */ + int mp ; /* Preemphasis */ - word u[8] ; /* short_term_aly_filter.c */ - word LARpp[2][8] ; /* */ - word j; /* */ + int16_t u [8] ; /* short_term_aly_filter.c */ + int16_t LARpp [2][8] ; /* */ + int16_t j ; /* */ - word ltp_cut; /* long_term.c, LTP crosscorr. */ - word nrp; /* 40 */ /* long_term.c, synthesis */ - word v[9] ; /* short_term.c, synthesis */ - word msr; /* decoder.c, Postprocessing */ + int16_t ltp_cut ; /* long_term.c, LTP crosscorr. */ + int16_t nrp ; /* 40 */ /* long_term.c, synthesis */ + int16_t v [9] ; /* short_term.c, synthesis */ + int16_t msr ; /* decoder.c, Postprocessing */ - char verbose; /* only used if !NDEBUG */ - char fast; /* only used if FAST */ + char verbose ; /* only used if !NDEBUG */ + char fast ; /* only used if FAST */ - char wav_fmt; /* only used if WAV49 defined */ - unsigned char frame_index; /* odd/even chaining */ - unsigned char frame_chain; /* half-byte to carry forward */ + char wav_fmt ; /* only used if WAV49 defined */ + unsigned char frame_index ; /* odd/even chaining */ + unsigned char frame_chain ; /* half-byte to carry forward */ /* Moved here from code.c where it was defined as static */ - word e[50] ; + int16_t e [50] ; } ; typedef struct gsm_state GSM_STATE ; #define MIN_WORD (-32767 - 1) -#define MAX_WORD 32767 +#define MAX_WORD 32767 #define MIN_LONGWORD (-2147483647 - 1) -#define MAX_LONGWORD 2147483647 +#define MAX_LONGWORD 2147483647 /* Signed arithmetic shift right. */ -static inline word -SASR_W (word x, word by) -{ return (x >> by) ; -} /* SASR */ +static inline int16_t +SASR_W (int16_t x, int16_t by) +{ if (x >= 0) + return x >> by ; + return ~ ((~x) >> by) ; +} /* SASR_W */ -static inline longword -SASR_L (longword x, word by) -{ return (x >> by) ; -} /* SASR */ +static inline int32_t +SASR_L (int32_t x, int16_t by) +{ if (x >= 0) + return x >> by ; + return ~ ((~x) >> by) ; +} /* SASR_L */ + +/* Signed arithmetic shift left. */ +static inline int16_t +SASL_W (int16_t x, int16_t by) +{ if (x >= 0) + return x << by ; + return - ((-x) << by) ; +} /* SASR_W */ + +static inline int32_t +SASL_L (int32_t x, int16_t by) +{ if (x >= 0) + return x << by ; + return - ((-x) << by) ; +} /* SASR_L */ /* * Prototypes from add.c */ -word gsm_mult (word a, word b) ; -longword gsm_L_mult (word a, word b) ; -word gsm_mult_r (word a, word b) ; +int16_t gsm_mult (int16_t a, int16_t b) ; +int32_t gsm_L_mult (int16_t a, int16_t b) ; +int16_t gsm_mult_r (int16_t a, int16_t b) ; -word gsm_div (word num, word denum) ; +int16_t gsm_div (int16_t num, int16_t denum) ; -word gsm_add (word a, word b ) ; -longword gsm_L_add (longword a, longword b ) ; +int16_t gsm_add (int16_t a, int16_t b) ; +int32_t gsm_L_add (int32_t a, int32_t b) ; -word gsm_sub (word a, word b) ; -longword gsm_L_sub (longword a, longword b) ; +int16_t gsm_sub (int16_t a, int16_t b) ; +int32_t gsm_L_sub (int32_t a, int32_t b) ; -word gsm_abs (word a) ; +int16_t gsm_abs (int16_t a) ; -word gsm_norm (longword a ) ; +int16_t gsm_norm (int32_t a) ; -longword gsm_L_asl (longword a, int n) ; -word gsm_asl (word a, int n) ; +int32_t gsm_L_asl (int32_t a, int n) ; +int16_t gsm_asl (int16_t a, int n) ; -longword gsm_L_asr (longword a, int n) ; -word gsm_asr (word a, int n) ; +int32_t gsm_L_asr (int32_t a, int n) ; +int16_t gsm_asr (int16_t a, int n) ; /* * Inlined functions from add.h */ -static inline longword -GSM_MULT_R (word a, word b) -{ return (((longword) (a)) * ((longword) (b)) + 16384) >> 15 ; +static inline int32_t +GSM_MULT_R (int16_t a, int16_t b) +{ return (((int32_t) (a)) * ((int32_t) (b)) + 16384) >> 15 ; } /* GSM_MULT_R */ -static inline longword -GSM_MULT (word a, word b) -{ return (((longword) (a)) * ((longword) (b))) >> 15 ; +static inline int32_t +GSM_MULT (int16_t a, int16_t b) +{ return (((int32_t) (a)) * ((int32_t) (b))) >> 15 ; } /* GSM_MULT */ -static inline longword -GSM_L_MULT (word a, word b) -{ return ((longword) (a)) * ((longword) (b)) << 1 ; +static inline int32_t +GSM_L_MULT (int16_t a, int16_t b) +{ return ((int32_t) (a)) * ((int32_t) (b)) << 1 ; } /* GSM_L_MULT */ -static inline longword -GSM_L_ADD (longword a, longword b) -{ ulongword utmp ; +static inline int32_t +GSM_L_ADD (int32_t a, int32_t b) +{ uint32_t utmp ; if (a < 0 && b < 0) - { utmp = (ulongword)-((a) + 1) + (ulongword)-((b) + 1) ; - return (utmp >= (ulongword) MAX_LONGWORD) ? MIN_LONGWORD : -(longword)utmp-2 ; + { utmp = (uint32_t) - ((a) + 1) + (uint32_t) - ((b) + 1) ; + return (utmp >= (uint32_t) MAX_LONGWORD) ? MIN_LONGWORD : - (int32_t) utmp - 2 ; } ; if (a > 0 && b > 0) - { utmp = (ulongword) a + (ulongword) b ; - return (utmp >= (ulongword) MAX_LONGWORD) ? MAX_LONGWORD : utmp ; + { utmp = (uint32_t) a + (uint32_t) b ; + return (utmp >= (uint32_t) MAX_LONGWORD) ? MAX_LONGWORD : utmp ; } ; return a + b ; } /* GSM_L_ADD */ -static inline longword -GSM_ADD (word a, word b) -{ longword ltmp ; +static inline int32_t +GSM_ADD (int16_t a, int16_t b) +{ int32_t ltmp ; - ltmp = ((longword) a) + ((longword) b) ; + ltmp = ((int32_t) a) + ((int32_t) b) ; if (ltmp >= MAX_WORD) return MAX_WORD ; @@ -146,11 +159,11 @@ GSM_ADD (word a, word b) return ltmp ; } /* GSM_ADD */ -static inline longword -GSM_SUB (word a, word b) -{ longword ltmp ; +static inline int32_t +GSM_SUB (int16_t a, int16_t b) +{ int32_t ltmp ; - ltmp = ((longword) a) - ((longword) b) ; + ltmp = ((int32_t) a) - ((int32_t) b) ; if (ltmp >= MAX_WORD) ltmp = MAX_WORD ; @@ -160,8 +173,8 @@ GSM_SUB (word a, word b) return ltmp ; } /* GSM_SUB */ -static inline word -GSM_ABS (word a) +static inline int16_t +GSM_ABS (int16_t a) { if (a > 0) return a ; @@ -176,124 +189,145 @@ GSM_ABS (word a) */ void Gsm_Coder ( struct gsm_state * S, - word * s, /* [0..159] samples IN */ - word * LARc, /* [0..7] LAR coefficients OUT */ - word * Nc, /* [0..3] LTP lag OUT */ - word * bc, /* [0..3] coded LTP gain OUT */ - word * Mc, /* [0..3] RPE grid selection OUT */ - word * xmaxc,/* [0..3] Coded maximum amplitude OUT */ - word * xMc) ;/* [13*4] normalized RPE samples OUT */ + int16_t * s, /* [0..159] samples IN */ + int16_t * LARc, /* [0..7] LAR coefficients OUT */ + int16_t * Nc, /* [0..3] LTP lag OUT */ + int16_t * bc, /* [0..3] coded LTP gain OUT */ + int16_t * Mc, /* [0..3] RPE grid selection OUT */ + int16_t * xmaxc, /* [0..3] Coded maximum amplitude OUT */ + int16_t * xMc) ; /* [13*4] normalized RPE samples OUT */ void Gsm_Long_Term_Predictor ( /* 4x for 160 samples */ struct gsm_state * S, - word * d, /* [0..39] residual signal IN */ - word * dp, /* [-120..-1] d' IN */ - word * e, /* [0..40] OUT */ - word * dpp, /* [0..40] OUT */ - word * Nc, /* correlation lag OUT */ - word * bc) ; /* gain factor OUT */ + int16_t * d, /* [0..39] residual signal IN */ + int16_t * dp, /* [-120..-1] d' IN */ + int16_t * e, /* [0..40] OUT */ + int16_t * dpp, /* [0..40] OUT */ + int16_t * Nc, /* correlation lag OUT */ + int16_t * bc) ; /* gain factor OUT */ void Gsm_LPC_Analysis ( struct gsm_state * S, - word * s, /* 0..159 signals IN/OUT */ - word * LARc) ; /* 0..7 LARc's OUT */ + int16_t * s, /* 0..159 signals IN/OUT */ + int16_t * LARc) ; /* 0..7 LARc's OUT */ void Gsm_Preprocess ( struct gsm_state * S, - word * s, word * so) ; + int16_t * s, int16_t * so) ; void Gsm_Encoding ( struct gsm_state * S, - word * e, - word * ep, - word * xmaxc, - word * Mc, - word * xMc) ; + int16_t * e, + int16_t * ep, + int16_t * xmaxc, + int16_t * Mc, + int16_t * xMc) ; void Gsm_Short_Term_Analysis_Filter ( struct gsm_state * S, - word * LARc, /* coded log area ratio [0..7] IN */ - word * d) ; /* st res. signal [0..159] IN/OUT */ + int16_t * LARc, /* coded log area ratio [0..7] IN */ + int16_t * d) ; /* st res. signal [0..159] IN/OUT */ void Gsm_Decoder ( struct gsm_state * S, - word * LARcr, /* [0..7] IN */ - word * Ncr, /* [0..3] IN */ - word * bcr, /* [0..3] IN */ - word * Mcr, /* [0..3] IN */ - word * xmaxcr, /* [0..3] IN */ - word * xMcr, /* [0..13*4] IN */ - word * s) ; /* [0..159] OUT */ + int16_t * LARcr, /* [0..7] IN */ + int16_t * Ncr, /* [0..3] IN */ + int16_t * bcr, /* [0..3] IN */ + int16_t * Mcr, /* [0..3] IN */ + int16_t * xmaxcr, /* [0..3] IN */ + int16_t * xMcr, /* [0..13*4] IN */ + int16_t * s) ; /* [0..159] OUT */ void Gsm_Decoding ( struct gsm_state * S, - word xmaxcr, - word Mcr, - word * xMcr, /* [0..12] IN */ - word * erp) ; /* [0..39] OUT */ + int16_t xmaxcr, + int16_t Mcr, + int16_t * xMcr, /* [0..12] IN */ + int16_t * erp) ; /* [0..39] OUT */ void Gsm_Long_Term_Synthesis_Filtering ( struct gsm_state* S, - word Ncr, - word bcr, - word * erp, /* [0..39] IN */ - word * drp) ; /* [-120..-1] IN, [0..40] OUT */ + int16_t Ncr, + int16_t bcr, + int16_t * erp, /* [0..39] IN */ + int16_t * drp) ; /* [-120..-1] IN, [0..40] OUT */ void Gsm_RPE_Decoding ( /*-struct gsm_state *S,-*/ - word xmaxcr, - word Mcr, - word * xMcr, /* [0..12], 3 bits IN */ - word * erp) ; /* [0..39] OUT */ + int16_t xmaxcr, + int16_t Mcr, + int16_t * xMcr, /* [0..12], 3 bits IN */ + int16_t * erp) ; /* [0..39] OUT */ void Gsm_RPE_Encoding ( /*-struct gsm_state * S,-*/ - word * e, /* -5..-1][0..39][40..44 IN/OUT */ - word * xmaxc, /* OUT */ - word * Mc, /* OUT */ - word * xMc) ; /* [0..12] OUT */ + int16_t * e, /* -5..-1][0..39][40..44 IN/OUT */ + int16_t * xmaxc, /* OUT */ + int16_t * Mc, /* OUT */ + int16_t * xMc) ; /* [0..12] OUT */ void Gsm_Short_Term_Synthesis_Filter ( struct gsm_state * S, - word * LARcr, /* log area ratios [0..7] IN */ - word * drp, /* received d [0...39] IN */ - word * s) ; /* signal s [0..159] OUT */ + int16_t * LARcr, /* log area ratios [0..7] IN */ + int16_t * drp, /* received d [0...39] IN */ + int16_t * s) ; /* signal s [0..159] OUT */ void Gsm_Update_of_reconstructed_short_time_residual_signal ( - word * dpp, /* [0...39] IN */ - word * ep, /* [0...39] IN */ - word * dp) ; /* [-120...-1] IN/OUT */ + int16_t * dpp, /* [0...39] IN */ + int16_t * ep, /* [0...39] IN */ + int16_t * dp) ; /* [-120...-1] IN/OUT */ /* * Tables from table.c */ #ifndef GSM_TABLE_C -extern word gsm_A [8], gsm_B [8], gsm_MIC [8], gsm_MAC [8] ; -extern word gsm_INVA [8] ; -extern word gsm_DLB [4], gsm_QLB [4] ; -extern word gsm_H [11] ; -extern word gsm_NRFAC [8] ; -extern word gsm_FAC [8] ; +extern int16_t gsm_A [8], gsm_B [8], gsm_MIC [8], gsm_MAC [8] ; +extern int16_t gsm_INVA [8] ; +extern int16_t gsm_DLB [4], gsm_QLB [4] ; +extern int16_t gsm_H [11] ; +extern int16_t gsm_NRFAC [8] ; +extern int16_t gsm_FAC [8] ; #endif /* GSM_TABLE_C */ + +#if __GNUC__ +#define ALWAYS_INLINE __attribute__ ((always_inline)) +#else +#define ALWAYS_INLINE +#endif + + +static inline int32_t ALWAYS_INLINE +arith_shift_left (int32_t x, int shift) +{ return (int32_t) (((uint32_t) x) << shift) ; +} /* arith_shift_left */ + +static inline int32_t ALWAYS_INLINE +arith_shift_right (int32_t x, int shift) +{ if (x >= 0) + return x << shift ; + return ~ ((~x) << shift) ; +} /* arith_shift_right */ + + /* * Debugging */ #ifdef NDEBUG -# define gsm_debug_words(a, b, c, d) /* nil */ -# define gsm_debug_longwords(a, b, c, d) /* nil */ -# define gsm_debug_word(a, b) /* nil */ -# define gsm_debug_longword(a, b) /* nil */ +# define gsm_debug_int16_ts(a, b, c, d) /* nil */ +# define gsm_debug_int32_ts(a, b, c, d) /* nil */ +# define gsm_debug_int16_t(a, b) /* nil */ +# define gsm_debug_int32_t(a, b) /* nil */ #else /* !NDEBUG => DEBUG */ - void gsm_debug_words (char * name, int, int, word *) ; - void gsm_debug_longwords (char * name, int, int, longword *) ; - void gsm_debug_longword (char * name, longword) ; - void gsm_debug_word (char * name, word) ; + void gsm_debug_int16_ts (char * name, int, int, int16_t *) ; + void gsm_debug_int32_ts (char * name, int, int, int32_t *) ; + void gsm_debug_int32_t (char * name, int32_t) ; + void gsm_debug_int16_t (char * name, int16_t) ; #endif /* !NDEBUG */ diff --git a/lib-src/libsndfile/src/GSM610/gsm_create.c b/lib-src/libsndfile/src/GSM610/gsm_create.c index 2bb430776..05425dd7a 100644 --- a/lib-src/libsndfile/src/GSM610/gsm_create.c +++ b/lib-src/libsndfile/src/GSM610/gsm_create.c @@ -17,15 +17,15 @@ gsm gsm_create (void) { - gsm r; + gsm r ; - r = malloc (sizeof(struct gsm_state)); - if (!r) return r; - - memset((char *)r, 0, sizeof (struct gsm_state)); - r->nrp = 40; + r = malloc (sizeof (struct gsm_state)) ; + if (!r) return r ; - return r; + memset ((char *) r, 0, sizeof (struct gsm_state)) ; + r->nrp = 40 ; + + return r ; } /* Added for libsndfile : May 6, 2002. Not sure if it works. */ @@ -33,5 +33,5 @@ void gsm_init (gsm state) { memset (state, 0, sizeof (struct gsm_state)) ; state->nrp = 40 ; -} +} diff --git a/lib-src/libsndfile/src/GSM610/gsm_decode.c b/lib-src/libsndfile/src/GSM610/gsm_decode.c index b13308a80..04411be3f 100644 --- a/lib-src/libsndfile/src/GSM610/gsm_decode.c +++ b/lib-src/libsndfile/src/GSM610/gsm_decode.c @@ -10,350 +10,348 @@ int gsm_decode (gsm s, gsm_byte * c, gsm_signal * target) { - word LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4]; + int16_t LARc [8], Nc [4], Mc [4], bc [4], xmaxc [4], xmc [13 * 4] ; #ifdef WAV49 - if (s->wav_fmt) { + if (s->wav_fmt) + { uint16_t sr = 0 ; - uword sr = 0; + s->frame_index = !s->frame_index ; + if (s->frame_index) + { sr = *c++ ; + LARc [0] = sr & 0x3f ; sr >>= 6 ; + sr |= (uint16_t) *c++ << 2 ; + LARc [1] = sr & 0x3f ; sr >>= 6 ; + sr |= (uint16_t) *c++ << 4 ; + LARc [2] = sr & 0x1f ; sr >>= 5 ; + LARc [3] = sr & 0x1f ; sr >>= 5 ; + sr |= (uint16_t) *c++ << 2 ; + LARc [4] = sr & 0xf ; sr >>= 4 ; + LARc [5] = sr & 0xf ; sr >>= 4 ; + sr |= (uint16_t) *c++ << 2 ; /* 5 */ + LARc [6] = sr & 0x7 ; sr >>= 3 ; + LARc [7] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 4 ; + Nc [0] = sr & 0x7f ; sr >>= 7 ; + bc [0] = sr & 0x3 ; sr >>= 2 ; + Mc [0] = sr & 0x3 ; sr >>= 2 ; + sr |= (uint16_t) *c++ << 1 ; + xmaxc [0] = sr & 0x3f ; sr >>= 6 ; + xmc [0] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [1] = sr & 0x7 ; sr >>= 3 ; + xmc [2] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [3] = sr & 0x7 ; sr >>= 3 ; + xmc [4] = sr & 0x7 ; sr >>= 3 ; + xmc [5] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; /* 10 */ + xmc [6] = sr & 0x7 ; sr >>= 3 ; + xmc [7] = sr & 0x7 ; sr >>= 3 ; + xmc [8] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [9] = sr & 0x7 ; sr >>= 3 ; + xmc [10] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [11] = sr & 0x7 ; sr >>= 3 ; + xmc [12] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 4 ; + Nc [1] = sr & 0x7f ; sr >>= 7 ; + bc [1] = sr & 0x3 ; sr >>= 2 ; + Mc [1] = sr & 0x3 ; sr >>= 2 ; + sr |= (uint16_t) *c++ << 1 ; + xmaxc [1] = sr & 0x3f ; sr >>= 6 ; + xmc [13] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; /* 15 */ + xmc [14] = sr & 0x7 ; sr >>= 3 ; + xmc [15] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [16] = sr & 0x7 ; sr >>= 3 ; + xmc [17] = sr & 0x7 ; sr >>= 3 ; + xmc [18] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [19] = sr & 0x7 ; sr >>= 3 ; + xmc [20] = sr & 0x7 ; sr >>= 3 ; + xmc [21] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [22] = sr & 0x7 ; sr >>= 3 ; + xmc [23] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [24] = sr & 0x7 ; sr >>= 3 ; + xmc [25] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 4 ; /* 20 */ + Nc [2] = sr & 0x7f ; sr >>= 7 ; + bc [2] = sr & 0x3 ; sr >>= 2 ; + Mc [2] = sr & 0x3 ; sr >>= 2 ; + sr |= (uint16_t) *c++ << 1 ; + xmaxc [2] = sr & 0x3f ; sr >>= 6 ; + xmc [26] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [27] = sr & 0x7 ; sr >>= 3 ; + xmc [28] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [29] = sr & 0x7 ; sr >>= 3 ; + xmc [30] = sr & 0x7 ; sr >>= 3 ; + xmc [31] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [32] = sr & 0x7 ; sr >>= 3 ; + xmc [33] = sr & 0x7 ; sr >>= 3 ; + xmc [34] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; /* 25 */ + xmc [35] = sr & 0x7 ; sr >>= 3 ; + xmc [36] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [37] = sr & 0x7 ; sr >>= 3 ; + xmc [38] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 4 ; + Nc [3] = sr & 0x7f ; sr >>= 7 ; + bc [3] = sr & 0x3 ; sr >>= 2 ; + Mc [3] = sr & 0x3 ; sr >>= 2 ; + sr |= (uint16_t) *c++ << 1 ; + xmaxc [3] = sr & 0x3f ; sr >>= 6 ; + xmc [39] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [40] = sr & 0x7 ; sr >>= 3 ; + xmc [41] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; /* 30 */ + xmc [42] = sr & 0x7 ; sr >>= 3 ; + xmc [43] = sr & 0x7 ; sr >>= 3 ; + xmc [44] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [45] = sr & 0x7 ; sr >>= 3 ; + xmc [46] = sr & 0x7 ; sr >>= 3 ; + xmc [47] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [48] = sr & 0x7 ; sr >>= 3 ; + xmc [49] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [50] = sr & 0x7 ; sr >>= 3 ; + xmc [51] = sr & 0x7 ; sr >>= 3 ; - s->frame_index = !s->frame_index; - if (s->frame_index) { - - sr = *c++; - LARc[0] = sr & 0x3f; sr >>= 6; - sr |= (uword)*c++ << 2; - LARc[1] = sr & 0x3f; sr >>= 6; - sr |= (uword)*c++ << 4; - LARc[2] = sr & 0x1f; sr >>= 5; - LARc[3] = sr & 0x1f; sr >>= 5; - sr |= (uword)*c++ << 2; - LARc[4] = sr & 0xf; sr >>= 4; - LARc[5] = sr & 0xf; sr >>= 4; - sr |= (uword)*c++ << 2; /* 5 */ - LARc[6] = sr & 0x7; sr >>= 3; - LARc[7] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 4; - Nc[0] = sr & 0x7f; sr >>= 7; - bc[0] = sr & 0x3; sr >>= 2; - Mc[0] = sr & 0x3; sr >>= 2; - sr |= (uword)*c++ << 1; - xmaxc[0] = sr & 0x3f; sr >>= 6; - xmc[0] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[1] = sr & 0x7; sr >>= 3; - xmc[2] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[3] = sr & 0x7; sr >>= 3; - xmc[4] = sr & 0x7; sr >>= 3; - xmc[5] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; /* 10 */ - xmc[6] = sr & 0x7; sr >>= 3; - xmc[7] = sr & 0x7; sr >>= 3; - xmc[8] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[9] = sr & 0x7; sr >>= 3; - xmc[10] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[11] = sr & 0x7; sr >>= 3; - xmc[12] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 4; - Nc[1] = sr & 0x7f; sr >>= 7; - bc[1] = sr & 0x3; sr >>= 2; - Mc[1] = sr & 0x3; sr >>= 2; - sr |= (uword)*c++ << 1; - xmaxc[1] = sr & 0x3f; sr >>= 6; - xmc[13] = sr & 0x7; sr >>= 3; - sr = *c++; /* 15 */ - xmc[14] = sr & 0x7; sr >>= 3; - xmc[15] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[16] = sr & 0x7; sr >>= 3; - xmc[17] = sr & 0x7; sr >>= 3; - xmc[18] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[19] = sr & 0x7; sr >>= 3; - xmc[20] = sr & 0x7; sr >>= 3; - xmc[21] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[22] = sr & 0x7; sr >>= 3; - xmc[23] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[24] = sr & 0x7; sr >>= 3; - xmc[25] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 4; /* 20 */ - Nc[2] = sr & 0x7f; sr >>= 7; - bc[2] = sr & 0x3; sr >>= 2; - Mc[2] = sr & 0x3; sr >>= 2; - sr |= (uword)*c++ << 1; - xmaxc[2] = sr & 0x3f; sr >>= 6; - xmc[26] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[27] = sr & 0x7; sr >>= 3; - xmc[28] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[29] = sr & 0x7; sr >>= 3; - xmc[30] = sr & 0x7; sr >>= 3; - xmc[31] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[32] = sr & 0x7; sr >>= 3; - xmc[33] = sr & 0x7; sr >>= 3; - xmc[34] = sr & 0x7; sr >>= 3; - sr = *c++; /* 25 */ - xmc[35] = sr & 0x7; sr >>= 3; - xmc[36] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[37] = sr & 0x7; sr >>= 3; - xmc[38] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 4; - Nc[3] = sr & 0x7f; sr >>= 7; - bc[3] = sr & 0x3; sr >>= 2; - Mc[3] = sr & 0x3; sr >>= 2; - sr |= (uword)*c++ << 1; - xmaxc[3] = sr & 0x3f; sr >>= 6; - xmc[39] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[40] = sr & 0x7; sr >>= 3; - xmc[41] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; /* 30 */ - xmc[42] = sr & 0x7; sr >>= 3; - xmc[43] = sr & 0x7; sr >>= 3; - xmc[44] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[45] = sr & 0x7; sr >>= 3; - xmc[46] = sr & 0x7; sr >>= 3; - xmc[47] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[48] = sr & 0x7; sr >>= 3; - xmc[49] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[50] = sr & 0x7; sr >>= 3; - xmc[51] = sr & 0x7; sr >>= 3; - - s->frame_chain = sr & 0xf; + s->frame_chain = sr & 0xf ; } else { - sr = s->frame_chain; - sr |= (uword)*c++ << 4; /* 1 */ - LARc[0] = sr & 0x3f; sr >>= 6; - LARc[1] = sr & 0x3f; sr >>= 6; - sr = *c++; - LARc[2] = sr & 0x1f; sr >>= 5; - sr |= (uword)*c++ << 3; - LARc[3] = sr & 0x1f; sr >>= 5; - LARc[4] = sr & 0xf; sr >>= 4; - sr |= (uword)*c++ << 2; - LARc[5] = sr & 0xf; sr >>= 4; - LARc[6] = sr & 0x7; sr >>= 3; - LARc[7] = sr & 0x7; sr >>= 3; - sr = *c++; /* 5 */ - Nc[0] = sr & 0x7f; sr >>= 7; - sr |= (uword)*c++ << 1; - bc[0] = sr & 0x3; sr >>= 2; - Mc[0] = sr & 0x3; sr >>= 2; - sr |= (uword)*c++ << 5; - xmaxc[0] = sr & 0x3f; sr >>= 6; - xmc[0] = sr & 0x7; sr >>= 3; - xmc[1] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[2] = sr & 0x7; sr >>= 3; - xmc[3] = sr & 0x7; sr >>= 3; - xmc[4] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[5] = sr & 0x7; sr >>= 3; - xmc[6] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; /* 10 */ - xmc[7] = sr & 0x7; sr >>= 3; - xmc[8] = sr & 0x7; sr >>= 3; - xmc[9] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[10] = sr & 0x7; sr >>= 3; - xmc[11] = sr & 0x7; sr >>= 3; - xmc[12] = sr & 0x7; sr >>= 3; - sr = *c++; - Nc[1] = sr & 0x7f; sr >>= 7; - sr |= (uword)*c++ << 1; - bc[1] = sr & 0x3; sr >>= 2; - Mc[1] = sr & 0x3; sr >>= 2; - sr |= (uword)*c++ << 5; - xmaxc[1] = sr & 0x3f; sr >>= 6; - xmc[13] = sr & 0x7; sr >>= 3; - xmc[14] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; /* 15 */ - xmc[15] = sr & 0x7; sr >>= 3; - xmc[16] = sr & 0x7; sr >>= 3; - xmc[17] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[18] = sr & 0x7; sr >>= 3; - xmc[19] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[20] = sr & 0x7; sr >>= 3; - xmc[21] = sr & 0x7; sr >>= 3; - xmc[22] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[23] = sr & 0x7; sr >>= 3; - xmc[24] = sr & 0x7; sr >>= 3; - xmc[25] = sr & 0x7; sr >>= 3; - sr = *c++; - Nc[2] = sr & 0x7f; sr >>= 7; - sr |= (uword)*c++ << 1; /* 20 */ - bc[2] = sr & 0x3; sr >>= 2; - Mc[2] = sr & 0x3; sr >>= 2; - sr |= (uword)*c++ << 5; - xmaxc[2] = sr & 0x3f; sr >>= 6; - xmc[26] = sr & 0x7; sr >>= 3; - xmc[27] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[28] = sr & 0x7; sr >>= 3; - xmc[29] = sr & 0x7; sr >>= 3; - xmc[30] = sr & 0x7; sr >>= 3; - sr = *c++; - xmc[31] = sr & 0x7; sr >>= 3; - xmc[32] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[33] = sr & 0x7; sr >>= 3; - xmc[34] = sr & 0x7; sr >>= 3; - xmc[35] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; /* 25 */ - xmc[36] = sr & 0x7; sr >>= 3; - xmc[37] = sr & 0x7; sr >>= 3; - xmc[38] = sr & 0x7; sr >>= 3; - sr = *c++; - Nc[3] = sr & 0x7f; sr >>= 7; - sr |= (uword)*c++ << 1; - bc[3] = sr & 0x3; sr >>= 2; - Mc[3] = sr & 0x3; sr >>= 2; - sr |= (uword)*c++ << 5; - xmaxc[3] = sr & 0x3f; sr >>= 6; - xmc[39] = sr & 0x7; sr >>= 3; - xmc[40] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[41] = sr & 0x7; sr >>= 3; - xmc[42] = sr & 0x7; sr >>= 3; - xmc[43] = sr & 0x7; sr >>= 3; - sr = *c++; /* 30 */ - xmc[44] = sr & 0x7; sr >>= 3; - xmc[45] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 2; - xmc[46] = sr & 0x7; sr >>= 3; - xmc[47] = sr & 0x7; sr >>= 3; - xmc[48] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; - xmc[49] = sr & 0x7; sr >>= 3; - xmc[50] = sr & 0x7; sr >>= 3; - xmc[51] = sr & 0x7; sr >>= 3; + sr = s->frame_chain ; + sr |= (uint16_t) *c++ << 4 ; /* 1 */ + LARc [0] = sr & 0x3f ; sr >>= 6 ; + LARc [1] = sr & 0x3f ; sr >>= 6 ; + sr = *c++ ; + LARc [2] = sr & 0x1f ; sr >>= 5 ; + sr |= (uint16_t) *c++ << 3 ; + LARc [3] = sr & 0x1f ; sr >>= 5 ; + LARc [4] = sr & 0xf ; sr >>= 4 ; + sr |= (uint16_t) *c++ << 2 ; + LARc [5] = sr & 0xf ; sr >>= 4 ; + LARc [6] = sr & 0x7 ; sr >>= 3 ; + LARc [7] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; /* 5 */ + Nc [0] = sr & 0x7f ; sr >>= 7 ; + sr |= (uint16_t) *c++ << 1 ; + bc [0] = sr & 0x3 ; sr >>= 2 ; + Mc [0] = sr & 0x3 ; sr >>= 2 ; + sr |= (uint16_t) *c++ << 5 ; + xmaxc [0] = sr & 0x3f ; sr >>= 6 ; + xmc [0] = sr & 0x7 ; sr >>= 3 ; + xmc [1] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [2] = sr & 0x7 ; sr >>= 3 ; + xmc [3] = sr & 0x7 ; sr >>= 3 ; + xmc [4] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [5] = sr & 0x7 ; sr >>= 3 ; + xmc [6] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; /* 10 */ + xmc [7] = sr & 0x7 ; sr >>= 3 ; + xmc [8] = sr & 0x7 ; sr >>= 3 ; + xmc [9] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [10] = sr & 0x7 ; sr >>= 3 ; + xmc [11] = sr & 0x7 ; sr >>= 3 ; + xmc [12] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + Nc [1] = sr & 0x7f ; sr >>= 7 ; + sr |= (uint16_t) *c++ << 1 ; + bc [1] = sr & 0x3 ; sr >>= 2 ; + Mc [1] = sr & 0x3 ; sr >>= 2 ; + sr |= (uint16_t) *c++ << 5 ; + xmaxc [1] = sr & 0x3f ; sr >>= 6 ; + xmc [13] = sr & 0x7 ; sr >>= 3 ; + xmc [14] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; /* 15 */ + xmc [15] = sr & 0x7 ; sr >>= 3 ; + xmc [16] = sr & 0x7 ; sr >>= 3 ; + xmc [17] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [18] = sr & 0x7 ; sr >>= 3 ; + xmc [19] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [20] = sr & 0x7 ; sr >>= 3 ; + xmc [21] = sr & 0x7 ; sr >>= 3 ; + xmc [22] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [23] = sr & 0x7 ; sr >>= 3 ; + xmc [24] = sr & 0x7 ; sr >>= 3 ; + xmc [25] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + Nc [2] = sr & 0x7f ; sr >>= 7 ; + sr |= (uint16_t) *c++ << 1 ; /* 20 */ + bc [2] = sr & 0x3 ; sr >>= 2 ; + Mc [2] = sr & 0x3 ; sr >>= 2 ; + sr |= (uint16_t) *c++ << 5 ; + xmaxc [2] = sr & 0x3f ; sr >>= 6 ; + xmc [26] = sr & 0x7 ; sr >>= 3 ; + xmc [27] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [28] = sr & 0x7 ; sr >>= 3 ; + xmc [29] = sr & 0x7 ; sr >>= 3 ; + xmc [30] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + xmc [31] = sr & 0x7 ; sr >>= 3 ; + xmc [32] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [33] = sr & 0x7 ; sr >>= 3 ; + xmc [34] = sr & 0x7 ; sr >>= 3 ; + xmc [35] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; /* 25 */ + xmc [36] = sr & 0x7 ; sr >>= 3 ; + xmc [37] = sr & 0x7 ; sr >>= 3 ; + xmc [38] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; + Nc [3] = sr & 0x7f ; sr >>= 7 ; + sr |= (uint16_t) *c++ << 1 ; + bc [3] = sr & 0x3 ; sr >>= 2 ; + Mc [3] = sr & 0x3 ; sr >>= 2 ; + sr |= (uint16_t) *c++ << 5 ; + xmaxc [3] = sr & 0x3f ; sr >>= 6 ; + xmc [39] = sr & 0x7 ; sr >>= 3 ; + xmc [40] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [41] = sr & 0x7 ; sr >>= 3 ; + xmc [42] = sr & 0x7 ; sr >>= 3 ; + xmc [43] = sr & 0x7 ; sr >>= 3 ; + sr = *c++ ; /* 30 */ + xmc [44] = sr & 0x7 ; sr >>= 3 ; + xmc [45] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 2 ; + xmc [46] = sr & 0x7 ; sr >>= 3 ; + xmc [47] = sr & 0x7 ; sr >>= 3 ; + xmc [48] = sr & 0x7 ; sr >>= 3 ; + sr |= (uint16_t) *c++ << 1 ; + xmc [49] = sr & 0x7 ; sr >>= 3 ; + xmc [50] = sr & 0x7 ; sr >>= 3 ; + xmc [51] = sr & 0x7 ; sr >>= 3 ; } } else #endif { - /* GSM_MAGIC = (*c >> 4) & 0xF; */ + /* GSM_MAGIC = (*c >> 4) & 0xF ; */ - if (((*c >> 4) & 0x0F) != GSM_MAGIC) return -1; + if (((*c >> 4) & 0x0F) != GSM_MAGIC) return -1 ; - LARc[0] = (*c++ & 0xF) << 2; /* 1 */ - LARc[0] |= (*c >> 6) & 0x3; - LARc[1] = *c++ & 0x3F; - LARc[2] = (*c >> 3) & 0x1F; - LARc[3] = (*c++ & 0x7) << 2; - LARc[3] |= (*c >> 6) & 0x3; - LARc[4] = (*c >> 2) & 0xF; - LARc[5] = (*c++ & 0x3) << 2; - LARc[5] |= (*c >> 6) & 0x3; - LARc[6] = (*c >> 3) & 0x7; - LARc[7] = *c++ & 0x7; - Nc[0] = (*c >> 1) & 0x7F; - bc[0] = (*c++ & 0x1) << 1; - bc[0] |= (*c >> 7) & 0x1; - Mc[0] = (*c >> 5) & 0x3; - xmaxc[0] = (*c++ & 0x1F) << 1; - xmaxc[0] |= (*c >> 7) & 0x1; - xmc[0] = (*c >> 4) & 0x7; - xmc[1] = (*c >> 1) & 0x7; - xmc[2] = (*c++ & 0x1) << 2; - xmc[2] |= (*c >> 6) & 0x3; - xmc[3] = (*c >> 3) & 0x7; - xmc[4] = *c++ & 0x7; - xmc[5] = (*c >> 5) & 0x7; - xmc[6] = (*c >> 2) & 0x7; - xmc[7] = (*c++ & 0x3) << 1; /* 10 */ - xmc[7] |= (*c >> 7) & 0x1; - xmc[8] = (*c >> 4) & 0x7; - xmc[9] = (*c >> 1) & 0x7; - xmc[10] = (*c++ & 0x1) << 2; - xmc[10] |= (*c >> 6) & 0x3; - xmc[11] = (*c >> 3) & 0x7; - xmc[12] = *c++ & 0x7; - Nc[1] = (*c >> 1) & 0x7F; - bc[1] = (*c++ & 0x1) << 1; - bc[1] |= (*c >> 7) & 0x1; - Mc[1] = (*c >> 5) & 0x3; - xmaxc[1] = (*c++ & 0x1F) << 1; - xmaxc[1] |= (*c >> 7) & 0x1; - xmc[13] = (*c >> 4) & 0x7; - xmc[14] = (*c >> 1) & 0x7; - xmc[15] = (*c++ & 0x1) << 2; - xmc[15] |= (*c >> 6) & 0x3; - xmc[16] = (*c >> 3) & 0x7; - xmc[17] = *c++ & 0x7; - xmc[18] = (*c >> 5) & 0x7; - xmc[19] = (*c >> 2) & 0x7; - xmc[20] = (*c++ & 0x3) << 1; - xmc[20] |= (*c >> 7) & 0x1; - xmc[21] = (*c >> 4) & 0x7; - xmc[22] = (*c >> 1) & 0x7; - xmc[23] = (*c++ & 0x1) << 2; - xmc[23] |= (*c >> 6) & 0x3; - xmc[24] = (*c >> 3) & 0x7; - xmc[25] = *c++ & 0x7; - Nc[2] = (*c >> 1) & 0x7F; - bc[2] = (*c++ & 0x1) << 1; /* 20 */ - bc[2] |= (*c >> 7) & 0x1; - Mc[2] = (*c >> 5) & 0x3; - xmaxc[2] = (*c++ & 0x1F) << 1; - xmaxc[2] |= (*c >> 7) & 0x1; - xmc[26] = (*c >> 4) & 0x7; - xmc[27] = (*c >> 1) & 0x7; - xmc[28] = (*c++ & 0x1) << 2; - xmc[28] |= (*c >> 6) & 0x3; - xmc[29] = (*c >> 3) & 0x7; - xmc[30] = *c++ & 0x7; - xmc[31] = (*c >> 5) & 0x7; - xmc[32] = (*c >> 2) & 0x7; - xmc[33] = (*c++ & 0x3) << 1; - xmc[33] |= (*c >> 7) & 0x1; - xmc[34] = (*c >> 4) & 0x7; - xmc[35] = (*c >> 1) & 0x7; - xmc[36] = (*c++ & 0x1) << 2; - xmc[36] |= (*c >> 6) & 0x3; - xmc[37] = (*c >> 3) & 0x7; - xmc[38] = *c++ & 0x7; - Nc[3] = (*c >> 1) & 0x7F; - bc[3] = (*c++ & 0x1) << 1; - bc[3] |= (*c >> 7) & 0x1; - Mc[3] = (*c >> 5) & 0x3; - xmaxc[3] = (*c++ & 0x1F) << 1; - xmaxc[3] |= (*c >> 7) & 0x1; - xmc[39] = (*c >> 4) & 0x7; - xmc[40] = (*c >> 1) & 0x7; - xmc[41] = (*c++ & 0x1) << 2; - xmc[41] |= (*c >> 6) & 0x3; - xmc[42] = (*c >> 3) & 0x7; - xmc[43] = *c++ & 0x7; /* 30 */ - xmc[44] = (*c >> 5) & 0x7; - xmc[45] = (*c >> 2) & 0x7; - xmc[46] = (*c++ & 0x3) << 1; - xmc[46] |= (*c >> 7) & 0x1; - xmc[47] = (*c >> 4) & 0x7; - xmc[48] = (*c >> 1) & 0x7; - xmc[49] = (*c++ & 0x1) << 2; - xmc[49] |= (*c >> 6) & 0x3; - xmc[50] = (*c >> 3) & 0x7; - xmc[51] = *c & 0x7; /* 33 */ + LARc [0] = (*c++ & 0xF) << 2 ; /* 1 */ + LARc [0] |= (*c >> 6) & 0x3 ; + LARc [1] = *c++ & 0x3F ; + LARc [2] = (*c >> 3) & 0x1F ; + LARc [3] = (*c++ & 0x7) << 2 ; + LARc [3] |= (*c >> 6) & 0x3 ; + LARc [4] = (*c >> 2) & 0xF ; + LARc [5] = (*c++ & 0x3) << 2 ; + LARc [5] |= (*c >> 6) & 0x3 ; + LARc [6] = (*c >> 3) & 0x7 ; + LARc [7] = *c++ & 0x7 ; + Nc [0] = (*c >> 1) & 0x7F ; + bc [0] = (*c++ & 0x1) << 1 ; + bc [0] |= (*c >> 7) & 0x1 ; + Mc [0] = (*c >> 5) & 0x3 ; + xmaxc [0] = (*c++ & 0x1F) << 1 ; + xmaxc [0] |= (*c >> 7) & 0x1 ; + xmc [0] = (*c >> 4) & 0x7 ; + xmc [1] = (*c >> 1) & 0x7 ; + xmc [2] = (*c++ & 0x1) << 2 ; + xmc [2] |= (*c >> 6) & 0x3 ; + xmc [3] = (*c >> 3) & 0x7 ; + xmc [4] = *c++ & 0x7 ; + xmc [5] = (*c >> 5) & 0x7 ; + xmc [6] = (*c >> 2) & 0x7 ; + xmc [7] = (*c++ & 0x3) << 1 ; /* 10 */ + xmc [7] |= (*c >> 7) & 0x1 ; + xmc [8] = (*c >> 4) & 0x7 ; + xmc [9] = (*c >> 1) & 0x7 ; + xmc [10] = (*c++ & 0x1) << 2 ; + xmc [10] |= (*c >> 6) & 0x3 ; + xmc [11] = (*c >> 3) & 0x7 ; + xmc [12] = *c++ & 0x7 ; + Nc [1] = (*c >> 1) & 0x7F ; + bc [1] = (*c++ & 0x1) << 1 ; + bc [1] |= (*c >> 7) & 0x1 ; + Mc [1] = (*c >> 5) & 0x3 ; + xmaxc [1] = (*c++ & 0x1F) << 1 ; + xmaxc [1] |= (*c >> 7) & 0x1 ; + xmc [13] = (*c >> 4) & 0x7 ; + xmc [14] = (*c >> 1) & 0x7 ; + xmc [15] = (*c++ & 0x1) << 2 ; + xmc [15] |= (*c >> 6) & 0x3 ; + xmc [16] = (*c >> 3) & 0x7 ; + xmc [17] = *c++ & 0x7 ; + xmc [18] = (*c >> 5) & 0x7 ; + xmc [19] = (*c >> 2) & 0x7 ; + xmc [20] = (*c++ & 0x3) << 1 ; + xmc [20] |= (*c >> 7) & 0x1 ; + xmc [21] = (*c >> 4) & 0x7 ; + xmc [22] = (*c >> 1) & 0x7 ; + xmc [23] = (*c++ & 0x1) << 2 ; + xmc [23] |= (*c >> 6) & 0x3 ; + xmc [24] = (*c >> 3) & 0x7 ; + xmc [25] = *c++ & 0x7 ; + Nc [2] = (*c >> 1) & 0x7F ; + bc [2] = (*c++ & 0x1) << 1 ; /* 20 */ + bc [2] |= (*c >> 7) & 0x1 ; + Mc [2] = (*c >> 5) & 0x3 ; + xmaxc [2] = (*c++ & 0x1F) << 1 ; + xmaxc [2] |= (*c >> 7) & 0x1 ; + xmc [26] = (*c >> 4) & 0x7 ; + xmc [27] = (*c >> 1) & 0x7 ; + xmc [28] = (*c++ & 0x1) << 2 ; + xmc [28] |= (*c >> 6) & 0x3 ; + xmc [29] = (*c >> 3) & 0x7 ; + xmc [30] = *c++ & 0x7 ; + xmc [31] = (*c >> 5) & 0x7 ; + xmc [32] = (*c >> 2) & 0x7 ; + xmc [33] = (*c++ & 0x3) << 1 ; + xmc [33] |= (*c >> 7) & 0x1 ; + xmc [34] = (*c >> 4) & 0x7 ; + xmc [35] = (*c >> 1) & 0x7 ; + xmc [36] = (*c++ & 0x1) << 2 ; + xmc [36] |= (*c >> 6) & 0x3 ; + xmc [37] = (*c >> 3) & 0x7 ; + xmc [38] = *c++ & 0x7 ; + Nc [3] = (*c >> 1) & 0x7F ; + bc [3] = (*c++ & 0x1) << 1 ; + bc [3] |= (*c >> 7) & 0x1 ; + Mc [3] = (*c >> 5) & 0x3 ; + xmaxc [3] = (*c++ & 0x1F) << 1 ; + xmaxc [3] |= (*c >> 7) & 0x1 ; + xmc [39] = (*c >> 4) & 0x7 ; + xmc [40] = (*c >> 1) & 0x7 ; + xmc [41] = (*c++ & 0x1) << 2 ; + xmc [41] |= (*c >> 6) & 0x3 ; + xmc [42] = (*c >> 3) & 0x7 ; + xmc [43] = *c++ & 0x7 ; /* 30 */ + xmc [44] = (*c >> 5) & 0x7 ; + xmc [45] = (*c >> 2) & 0x7 ; + xmc [46] = (*c++ & 0x3) << 1 ; + xmc [46] |= (*c >> 7) & 0x1 ; + xmc [47] = (*c >> 4) & 0x7 ; + xmc [48] = (*c >> 1) & 0x7 ; + xmc [49] = (*c++ & 0x1) << 2 ; + xmc [49] |= (*c >> 6) & 0x3 ; + xmc [50] = (*c >> 3) & 0x7 ; + xmc [51] = *c & 0x7 ; /* 33 */ } - Gsm_Decoder(s, LARc, Nc, bc, Mc, xmaxc, xmc, target); + Gsm_Decoder (s, LARc, Nc, bc, Mc, xmaxc, xmc, target) ; - return 0; + return 0 ; } diff --git a/lib-src/libsndfile/src/GSM610/gsm_destroy.c b/lib-src/libsndfile/src/GSM610/gsm_destroy.c index 9b417116d..03bf7c350 100644 --- a/lib-src/libsndfile/src/GSM610/gsm_destroy.c +++ b/lib-src/libsndfile/src/GSM610/gsm_destroy.c @@ -13,12 +13,13 @@ # ifdef HAS_MALLOC_H # include # else - extern void free(); + extern void free () ; # endif #endif void gsm_destroy (gsm S) { - if (S) free((char *)S); + if (S) + free ((char *) S) ; } diff --git a/lib-src/libsndfile/src/GSM610/gsm_encode.c b/lib-src/libsndfile/src/GSM610/gsm_encode.c index 5c9e1ab33..5fd535150 100644 --- a/lib-src/libsndfile/src/GSM610/gsm_encode.c +++ b/lib-src/libsndfile/src/GSM610/gsm_encode.c @@ -9,332 +9,331 @@ void gsm_encode (gsm s, gsm_signal * source, gsm_byte * c) { - word LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4]; + int16_t LARc [8], Nc [4], Mc [4], bc [4], xmaxc [4], xmc [13 * 4] ; - Gsm_Coder(s, source, LARc, Nc, bc, Mc, xmaxc, xmc); + Gsm_Coder (s, source, LARc, Nc, bc, Mc, xmaxc, xmc) ; /* variable size GSM_MAGIC 4 - LARc[0] 6 - LARc[1] 6 - LARc[2] 5 - LARc[3] 5 - LARc[4] 4 - LARc[5] 4 - LARc[6] 3 - LARc[7] 3 + LARc [0] 6 + LARc [1] 6 + LARc [2] 5 + LARc [3] 5 + LARc [4] 4 + LARc [5] 4 + LARc [6] 3 + LARc [7] 3 - Nc[0] 7 - bc[0] 2 - Mc[0] 2 - xmaxc[0] 6 - xmc[0] 3 - xmc[1] 3 - xmc[2] 3 - xmc[3] 3 - xmc[4] 3 - xmc[5] 3 - xmc[6] 3 - xmc[7] 3 - xmc[8] 3 - xmc[9] 3 - xmc[10] 3 - xmc[11] 3 - xmc[12] 3 + Nc [0] 7 + bc [0] 2 + Mc [0] 2 + xmaxc [0] 6 + xmc [0] 3 + xmc [1] 3 + xmc [2] 3 + xmc [3] 3 + xmc [4] 3 + xmc [5] 3 + xmc [6] 3 + xmc [7] 3 + xmc [8] 3 + xmc [9] 3 + xmc [10] 3 + xmc [11] 3 + xmc [12] 3 - Nc[1] 7 - bc[1] 2 - Mc[1] 2 - xmaxc[1] 6 - xmc[13] 3 - xmc[14] 3 - xmc[15] 3 - xmc[16] 3 - xmc[17] 3 - xmc[18] 3 - xmc[19] 3 - xmc[20] 3 - xmc[21] 3 - xmc[22] 3 - xmc[23] 3 - xmc[24] 3 - xmc[25] 3 + Nc [1] 7 + bc [1] 2 + Mc [1] 2 + xmaxc [1] 6 + xmc [13] 3 + xmc [14] 3 + xmc [15] 3 + xmc [16] 3 + xmc [17] 3 + xmc [18] 3 + xmc [19] 3 + xmc [20] 3 + xmc [21] 3 + xmc [22] 3 + xmc [23] 3 + xmc [24] 3 + xmc [25] 3 - Nc[2] 7 - bc[2] 2 - Mc[2] 2 - xmaxc[2] 6 - xmc[26] 3 - xmc[27] 3 - xmc[28] 3 - xmc[29] 3 - xmc[30] 3 - xmc[31] 3 - xmc[32] 3 - xmc[33] 3 - xmc[34] 3 - xmc[35] 3 - xmc[36] 3 - xmc[37] 3 - xmc[38] 3 + Nc [2] 7 + bc [2] 2 + Mc [2] 2 + xmaxc [2] 6 + xmc [26] 3 + xmc [27] 3 + xmc [28] 3 + xmc [29] 3 + xmc [30] 3 + xmc [31] 3 + xmc [32] 3 + xmc [33] 3 + xmc [34] 3 + xmc [35] 3 + xmc [36] 3 + xmc [37] 3 + xmc [38] 3 - Nc[3] 7 - bc[3] 2 - Mc[3] 2 - xmaxc[3] 6 - xmc[39] 3 - xmc[40] 3 - xmc[41] 3 - xmc[42] 3 - xmc[43] 3 - xmc[44] 3 - xmc[45] 3 - xmc[46] 3 - xmc[47] 3 - xmc[48] 3 - xmc[49] 3 - xmc[50] 3 - xmc[51] 3 + Nc [3] 7 + bc [3] 2 + Mc [3] 2 + xmaxc [3] 6 + xmc [39] 3 + xmc [40] 3 + xmc [41] 3 + xmc [42] 3 + xmc [43] 3 + xmc [44] 3 + xmc [45] 3 + xmc [46] 3 + xmc [47] 3 + xmc [48] 3 + xmc [49] 3 + xmc [50] 3 + xmc [51] 3 */ #ifdef WAV49 - if (s->wav_fmt) { - s->frame_index = !s->frame_index; - if (s->frame_index) { + if (s->wav_fmt) + { s->frame_index = !s->frame_index ; + if (s->frame_index) + { uint16_t sr ; - uword sr; - - sr = 0; - sr = sr >> 6 | LARc[0] << 10; - sr = sr >> 6 | LARc[1] << 10; - *c++ = sr >> 4; - sr = sr >> 5 | LARc[2] << 11; - *c++ = sr >> 7; - sr = sr >> 5 | LARc[3] << 11; - sr = sr >> 4 | LARc[4] << 12; - *c++ = sr >> 6; - sr = sr >> 4 | LARc[5] << 12; - sr = sr >> 3 | LARc[6] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | LARc[7] << 13; - sr = sr >> 7 | Nc[0] << 9; - *c++ = sr >> 5; - sr = sr >> 2 | bc[0] << 14; - sr = sr >> 2 | Mc[0] << 14; - sr = sr >> 6 | xmaxc[0] << 10; - *c++ = sr >> 3; - sr = sr >> 3 | xmc[0] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[1] << 13; - sr = sr >> 3 | xmc[2] << 13; - sr = sr >> 3 | xmc[3] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[4] << 13; - sr = sr >> 3 | xmc[5] << 13; - sr = sr >> 3 | xmc[6] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[7] << 13; - sr = sr >> 3 | xmc[8] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[9] << 13; - sr = sr >> 3 | xmc[10] << 13; - sr = sr >> 3 | xmc[11] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[12] << 13; - sr = sr >> 7 | Nc[1] << 9; - *c++ = sr >> 5; - sr = sr >> 2 | bc[1] << 14; - sr = sr >> 2 | Mc[1] << 14; - sr = sr >> 6 | xmaxc[1] << 10; - *c++ = sr >> 3; - sr = sr >> 3 | xmc[13] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[14] << 13; - sr = sr >> 3 | xmc[15] << 13; - sr = sr >> 3 | xmc[16] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[17] << 13; - sr = sr >> 3 | xmc[18] << 13; - sr = sr >> 3 | xmc[19] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[20] << 13; - sr = sr >> 3 | xmc[21] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[22] << 13; - sr = sr >> 3 | xmc[23] << 13; - sr = sr >> 3 | xmc[24] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[25] << 13; - sr = sr >> 7 | Nc[2] << 9; - *c++ = sr >> 5; - sr = sr >> 2 | bc[2] << 14; - sr = sr >> 2 | Mc[2] << 14; - sr = sr >> 6 | xmaxc[2] << 10; - *c++ = sr >> 3; - sr = sr >> 3 | xmc[26] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[27] << 13; - sr = sr >> 3 | xmc[28] << 13; - sr = sr >> 3 | xmc[29] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[30] << 13; - sr = sr >> 3 | xmc[31] << 13; - sr = sr >> 3 | xmc[32] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[33] << 13; - sr = sr >> 3 | xmc[34] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[35] << 13; - sr = sr >> 3 | xmc[36] << 13; - sr = sr >> 3 | xmc[37] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[38] << 13; - sr = sr >> 7 | Nc[3] << 9; - *c++ = sr >> 5; - sr = sr >> 2 | bc[3] << 14; - sr = sr >> 2 | Mc[3] << 14; - sr = sr >> 6 | xmaxc[3] << 10; - *c++ = sr >> 3; - sr = sr >> 3 | xmc[39] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[40] << 13; - sr = sr >> 3 | xmc[41] << 13; - sr = sr >> 3 | xmc[42] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[43] << 13; - sr = sr >> 3 | xmc[44] << 13; - sr = sr >> 3 | xmc[45] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[46] << 13; - sr = sr >> 3 | xmc[47] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[48] << 13; - sr = sr >> 3 | xmc[49] << 13; - sr = sr >> 3 | xmc[50] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[51] << 13; - sr = sr >> 4; - *c = sr >> 8; - s->frame_chain = *c; + sr = 0 ; + sr = sr >> 6 | LARc [0] << 10 ; + sr = sr >> 6 | LARc [1] << 10 ; + *c++ = sr >> 4 ; + sr = sr >> 5 | LARc [2] << 11 ; + *c++ = sr >> 7 ; + sr = sr >> 5 | LARc [3] << 11 ; + sr = sr >> 4 | LARc [4] << 12 ; + *c++ = sr >> 6 ; + sr = sr >> 4 | LARc [5] << 12 ; + sr = sr >> 3 | LARc [6] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | LARc [7] << 13 ; + sr = sr >> 7 | Nc [0] << 9 ; + *c++ = sr >> 5 ; + sr = sr >> 2 | bc [0] << 14 ; + sr = sr >> 2 | Mc [0] << 14 ; + sr = sr >> 6 | xmaxc [0] << 10 ; + *c++ = sr >> 3 ; + sr = sr >> 3 | xmc [0] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [1] << 13 ; + sr = sr >> 3 | xmc [2] << 13 ; + sr = sr >> 3 | xmc [3] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [4] << 13 ; + sr = sr >> 3 | xmc [5] << 13 ; + sr = sr >> 3 | xmc [6] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [7] << 13 ; + sr = sr >> 3 | xmc [8] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [9] << 13 ; + sr = sr >> 3 | xmc [10] << 13 ; + sr = sr >> 3 | xmc [11] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [12] << 13 ; + sr = sr >> 7 | Nc [1] << 9 ; + *c++ = sr >> 5 ; + sr = sr >> 2 | bc [1] << 14 ; + sr = sr >> 2 | Mc [1] << 14 ; + sr = sr >> 6 | xmaxc [1] << 10 ; + *c++ = sr >> 3 ; + sr = sr >> 3 | xmc [13] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [14] << 13 ; + sr = sr >> 3 | xmc [15] << 13 ; + sr = sr >> 3 | xmc [16] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [17] << 13 ; + sr = sr >> 3 | xmc [18] << 13 ; + sr = sr >> 3 | xmc [19] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [20] << 13 ; + sr = sr >> 3 | xmc [21] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [22] << 13 ; + sr = sr >> 3 | xmc [23] << 13 ; + sr = sr >> 3 | xmc [24] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [25] << 13 ; + sr = sr >> 7 | Nc [2] << 9 ; + *c++ = sr >> 5 ; + sr = sr >> 2 | bc [2] << 14 ; + sr = sr >> 2 | Mc [2] << 14 ; + sr = sr >> 6 | xmaxc [2] << 10 ; + *c++ = sr >> 3 ; + sr = sr >> 3 | xmc [26] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [27] << 13 ; + sr = sr >> 3 | xmc [28] << 13 ; + sr = sr >> 3 | xmc [29] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [30] << 13 ; + sr = sr >> 3 | xmc [31] << 13 ; + sr = sr >> 3 | xmc [32] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [33] << 13 ; + sr = sr >> 3 | xmc [34] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [35] << 13 ; + sr = sr >> 3 | xmc [36] << 13 ; + sr = sr >> 3 | xmc [37] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [38] << 13 ; + sr = sr >> 7 | Nc [3] << 9 ; + *c++ = sr >> 5 ; + sr = sr >> 2 | bc [3] << 14 ; + sr = sr >> 2 | Mc [3] << 14 ; + sr = sr >> 6 | xmaxc [3] << 10 ; + *c++ = sr >> 3 ; + sr = sr >> 3 | xmc [39] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [40] << 13 ; + sr = sr >> 3 | xmc [41] << 13 ; + sr = sr >> 3 | xmc [42] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [43] << 13 ; + sr = sr >> 3 | xmc [44] << 13 ; + sr = sr >> 3 | xmc [45] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [46] << 13 ; + sr = sr >> 3 | xmc [47] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [48] << 13 ; + sr = sr >> 3 | xmc [49] << 13 ; + sr = sr >> 3 | xmc [50] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [51] << 13 ; + sr = sr >> 4 ; + *c = sr >> 8 ; + s->frame_chain = *c ; } else { - uword sr; + uint16_t sr ; - sr = 0; - sr = sr >> 4 | s->frame_chain << 12; - sr = sr >> 6 | LARc[0] << 10; - *c++ = sr >> 6; - sr = sr >> 6 | LARc[1] << 10; - *c++ = sr >> 8; - sr = sr >> 5 | LARc[2] << 11; - sr = sr >> 5 | LARc[3] << 11; - *c++ = sr >> 6; - sr = sr >> 4 | LARc[4] << 12; - sr = sr >> 4 | LARc[5] << 12; - *c++ = sr >> 6; - sr = sr >> 3 | LARc[6] << 13; - sr = sr >> 3 | LARc[7] << 13; - *c++ = sr >> 8; - sr = sr >> 7 | Nc[0] << 9; - sr = sr >> 2 | bc[0] << 14; - *c++ = sr >> 7; - sr = sr >> 2 | Mc[0] << 14; - sr = sr >> 6 | xmaxc[0] << 10; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[0] << 13; - sr = sr >> 3 | xmc[1] << 13; - sr = sr >> 3 | xmc[2] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[3] << 13; - sr = sr >> 3 | xmc[4] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[5] << 13; - sr = sr >> 3 | xmc[6] << 13; - sr = sr >> 3 | xmc[7] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[8] << 13; - sr = sr >> 3 | xmc[9] << 13; - sr = sr >> 3 | xmc[10] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[11] << 13; - sr = sr >> 3 | xmc[12] << 13; - *c++ = sr >> 8; - sr = sr >> 7 | Nc[1] << 9; - sr = sr >> 2 | bc[1] << 14; - *c++ = sr >> 7; - sr = sr >> 2 | Mc[1] << 14; - sr = sr >> 6 | xmaxc[1] << 10; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[13] << 13; - sr = sr >> 3 | xmc[14] << 13; - sr = sr >> 3 | xmc[15] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[16] << 13; - sr = sr >> 3 | xmc[17] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[18] << 13; - sr = sr >> 3 | xmc[19] << 13; - sr = sr >> 3 | xmc[20] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[21] << 13; - sr = sr >> 3 | xmc[22] << 13; - sr = sr >> 3 | xmc[23] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[24] << 13; - sr = sr >> 3 | xmc[25] << 13; - *c++ = sr >> 8; - sr = sr >> 7 | Nc[2] << 9; - sr = sr >> 2 | bc[2] << 14; - *c++ = sr >> 7; - sr = sr >> 2 | Mc[2] << 14; - sr = sr >> 6 | xmaxc[2] << 10; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[26] << 13; - sr = sr >> 3 | xmc[27] << 13; - sr = sr >> 3 | xmc[28] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[29] << 13; - sr = sr >> 3 | xmc[30] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[31] << 13; - sr = sr >> 3 | xmc[32] << 13; - sr = sr >> 3 | xmc[33] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[34] << 13; - sr = sr >> 3 | xmc[35] << 13; - sr = sr >> 3 | xmc[36] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[37] << 13; - sr = sr >> 3 | xmc[38] << 13; - *c++ = sr >> 8; - sr = sr >> 7 | Nc[3] << 9; - sr = sr >> 2 | bc[3] << 14; - *c++ = sr >> 7; - sr = sr >> 2 | Mc[3] << 14; - sr = sr >> 6 | xmaxc[3] << 10; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[39] << 13; - sr = sr >> 3 | xmc[40] << 13; - sr = sr >> 3 | xmc[41] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[42] << 13; - sr = sr >> 3 | xmc[43] << 13; - *c++ = sr >> 8; - sr = sr >> 3 | xmc[44] << 13; - sr = sr >> 3 | xmc[45] << 13; - sr = sr >> 3 | xmc[46] << 13; - *c++ = sr >> 7; - sr = sr >> 3 | xmc[47] << 13; - sr = sr >> 3 | xmc[48] << 13; - sr = sr >> 3 | xmc[49] << 13; - *c++ = sr >> 6; - sr = sr >> 3 | xmc[50] << 13; - sr = sr >> 3 | xmc[51] << 13; - *c++ = sr >> 8; + sr = 0 ; + sr = sr >> 4 | s->frame_chain << 12 ; + sr = sr >> 6 | LARc [0] << 10 ; + *c++ = sr >> 6 ; + sr = sr >> 6 | LARc [1] << 10 ; + *c++ = sr >> 8 ; + sr = sr >> 5 | LARc [2] << 11 ; + sr = sr >> 5 | LARc [3] << 11 ; + *c++ = sr >> 6 ; + sr = sr >> 4 | LARc [4] << 12 ; + sr = sr >> 4 | LARc [5] << 12 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | LARc [6] << 13 ; + sr = sr >> 3 | LARc [7] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 7 | Nc [0] << 9 ; + sr = sr >> 2 | bc [0] << 14 ; + *c++ = sr >> 7 ; + sr = sr >> 2 | Mc [0] << 14 ; + sr = sr >> 6 | xmaxc [0] << 10 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [0] << 13 ; + sr = sr >> 3 | xmc [1] << 13 ; + sr = sr >> 3 | xmc [2] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [3] << 13 ; + sr = sr >> 3 | xmc [4] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [5] << 13 ; + sr = sr >> 3 | xmc [6] << 13 ; + sr = sr >> 3 | xmc [7] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [8] << 13 ; + sr = sr >> 3 | xmc [9] << 13 ; + sr = sr >> 3 | xmc [10] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [11] << 13 ; + sr = sr >> 3 | xmc [12] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 7 | Nc [1] << 9 ; + sr = sr >> 2 | bc [1] << 14 ; + *c++ = sr >> 7 ; + sr = sr >> 2 | Mc [1] << 14 ; + sr = sr >> 6 | xmaxc [1] << 10 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [13] << 13 ; + sr = sr >> 3 | xmc [14] << 13 ; + sr = sr >> 3 | xmc [15] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [16] << 13 ; + sr = sr >> 3 | xmc [17] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [18] << 13 ; + sr = sr >> 3 | xmc [19] << 13 ; + sr = sr >> 3 | xmc [20] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [21] << 13 ; + sr = sr >> 3 | xmc [22] << 13 ; + sr = sr >> 3 | xmc [23] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [24] << 13 ; + sr = sr >> 3 | xmc [25] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 7 | Nc [2] << 9 ; + sr = sr >> 2 | bc [2] << 14 ; + *c++ = sr >> 7 ; + sr = sr >> 2 | Mc [2] << 14 ; + sr = sr >> 6 | xmaxc [2] << 10 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [26] << 13 ; + sr = sr >> 3 | xmc [27] << 13 ; + sr = sr >> 3 | xmc [28] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [29] << 13 ; + sr = sr >> 3 | xmc [30] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [31] << 13 ; + sr = sr >> 3 | xmc [32] << 13 ; + sr = sr >> 3 | xmc [33] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [34] << 13 ; + sr = sr >> 3 | xmc [35] << 13 ; + sr = sr >> 3 | xmc [36] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [37] << 13 ; + sr = sr >> 3 | xmc [38] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 7 | Nc [3] << 9 ; + sr = sr >> 2 | bc [3] << 14 ; + *c++ = sr >> 7 ; + sr = sr >> 2 | Mc [3] << 14 ; + sr = sr >> 6 | xmaxc [3] << 10 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [39] << 13 ; + sr = sr >> 3 | xmc [40] << 13 ; + sr = sr >> 3 | xmc [41] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [42] << 13 ; + sr = sr >> 3 | xmc [43] << 13 ; + *c++ = sr >> 8 ; + sr = sr >> 3 | xmc [44] << 13 ; + sr = sr >> 3 | xmc [45] << 13 ; + sr = sr >> 3 | xmc [46] << 13 ; + *c++ = sr >> 7 ; + sr = sr >> 3 | xmc [47] << 13 ; + sr = sr >> 3 | xmc [48] << 13 ; + sr = sr >> 3 | xmc [49] << 13 ; + *c++ = sr >> 6 ; + sr = sr >> 3 | xmc [50] << 13 ; + sr = sr >> 3 | xmc [51] << 13 ; + *c++ = sr >> 8 ; } } @@ -343,106 +342,106 @@ void gsm_encode (gsm s, gsm_signal * source, gsm_byte * c) #endif /* WAV49 */ { - *c++ = ((GSM_MAGIC & 0xF) << 4) /* 1 */ - | ((LARc[0] >> 2) & 0xF); - *c++ = ((LARc[0] & 0x3) << 6) - | (LARc[1] & 0x3F); - *c++ = ((LARc[2] & 0x1F) << 3) - | ((LARc[3] >> 2) & 0x7); - *c++ = ((LARc[3] & 0x3) << 6) - | ((LARc[4] & 0xF) << 2) - | ((LARc[5] >> 2) & 0x3); - *c++ = ((LARc[5] & 0x3) << 6) - | ((LARc[6] & 0x7) << 3) - | (LARc[7] & 0x7); - *c++ = ((Nc[0] & 0x7F) << 1) - | ((bc[0] >> 1) & 0x1); - *c++ = ((bc[0] & 0x1) << 7) - | ((Mc[0] & 0x3) << 5) - | ((xmaxc[0] >> 1) & 0x1F); - *c++ = ((xmaxc[0] & 0x1) << 7) - | ((xmc[0] & 0x7) << 4) - | ((xmc[1] & 0x7) << 1) - | ((xmc[2] >> 2) & 0x1); - *c++ = ((xmc[2] & 0x3) << 6) - | ((xmc[3] & 0x7) << 3) - | (xmc[4] & 0x7); - *c++ = ((xmc[5] & 0x7) << 5) /* 10 */ - | ((xmc[6] & 0x7) << 2) - | ((xmc[7] >> 1) & 0x3); - *c++ = ((xmc[7] & 0x1) << 7) - | ((xmc[8] & 0x7) << 4) - | ((xmc[9] & 0x7) << 1) - | ((xmc[10] >> 2) & 0x1); - *c++ = ((xmc[10] & 0x3) << 6) - | ((xmc[11] & 0x7) << 3) - | (xmc[12] & 0x7); - *c++ = ((Nc[1] & 0x7F) << 1) - | ((bc[1] >> 1) & 0x1); - *c++ = ((bc[1] & 0x1) << 7) - | ((Mc[1] & 0x3) << 5) - | ((xmaxc[1] >> 1) & 0x1F); - *c++ = ((xmaxc[1] & 0x1) << 7) - | ((xmc[13] & 0x7) << 4) - | ((xmc[14] & 0x7) << 1) - | ((xmc[15] >> 2) & 0x1); - *c++ = ((xmc[15] & 0x3) << 6) - | ((xmc[16] & 0x7) << 3) - | (xmc[17] & 0x7); - *c++ = ((xmc[18] & 0x7) << 5) - | ((xmc[19] & 0x7) << 2) - | ((xmc[20] >> 1) & 0x3); - *c++ = ((xmc[20] & 0x1) << 7) - | ((xmc[21] & 0x7) << 4) - | ((xmc[22] & 0x7) << 1) - | ((xmc[23] >> 2) & 0x1); - *c++ = ((xmc[23] & 0x3) << 6) - | ((xmc[24] & 0x7) << 3) - | (xmc[25] & 0x7); - *c++ = ((Nc[2] & 0x7F) << 1) /* 20 */ - | ((bc[2] >> 1) & 0x1); - *c++ = ((bc[2] & 0x1) << 7) - | ((Mc[2] & 0x3) << 5) - | ((xmaxc[2] >> 1) & 0x1F); - *c++ = ((xmaxc[2] & 0x1) << 7) - | ((xmc[26] & 0x7) << 4) - | ((xmc[27] & 0x7) << 1) - | ((xmc[28] >> 2) & 0x1); - *c++ = ((xmc[28] & 0x3) << 6) - | ((xmc[29] & 0x7) << 3) - | (xmc[30] & 0x7); - *c++ = ((xmc[31] & 0x7) << 5) - | ((xmc[32] & 0x7) << 2) - | ((xmc[33] >> 1) & 0x3); - *c++ = ((xmc[33] & 0x1) << 7) - | ((xmc[34] & 0x7) << 4) - | ((xmc[35] & 0x7) << 1) - | ((xmc[36] >> 2) & 0x1); - *c++ = ((xmc[36] & 0x3) << 6) - | ((xmc[37] & 0x7) << 3) - | (xmc[38] & 0x7); - *c++ = ((Nc[3] & 0x7F) << 1) - | ((bc[3] >> 1) & 0x1); - *c++ = ((bc[3] & 0x1) << 7) - | ((Mc[3] & 0x3) << 5) - | ((xmaxc[3] >> 1) & 0x1F); - *c++ = ((xmaxc[3] & 0x1) << 7) - | ((xmc[39] & 0x7) << 4) - | ((xmc[40] & 0x7) << 1) - | ((xmc[41] >> 2) & 0x1); - *c++ = ((xmc[41] & 0x3) << 6) /* 30 */ - | ((xmc[42] & 0x7) << 3) - | (xmc[43] & 0x7); - *c++ = ((xmc[44] & 0x7) << 5) - | ((xmc[45] & 0x7) << 2) - | ((xmc[46] >> 1) & 0x3); - *c++ = ((xmc[46] & 0x1) << 7) - | ((xmc[47] & 0x7) << 4) - | ((xmc[48] & 0x7) << 1) - | ((xmc[49] >> 2) & 0x1); - *c++ = ((xmc[49] & 0x3) << 6) - | ((xmc[50] & 0x7) << 3) - | (xmc[51] & 0x7); + *c++ = ((GSM_MAGIC & 0xF) << 4) /* 1 */ + | ((LARc [0] >> 2) & 0xF) ; + *c++ = ((LARc [0] & 0x3) << 6) + | (LARc [1] & 0x3F) ; + *c++ = ((LARc [2] & 0x1F) << 3) + | ((LARc [3] >> 2) & 0x7) ; + *c++ = ((LARc [3] & 0x3) << 6) + | ((LARc [4] & 0xF) << 2) + | ((LARc [5] >> 2) & 0x3) ; + *c++ = ((LARc [5] & 0x3) << 6) + | ((LARc [6] & 0x7) << 3) + | (LARc [7] & 0x7) ; + *c++ = ((Nc [0] & 0x7F) << 1) + | ((bc [0] >> 1) & 0x1) ; + *c++ = ((bc [0] & 0x1) << 7) + | ((Mc [0] & 0x3) << 5) + | ((xmaxc [0] >> 1) & 0x1F) ; + *c++ = ((xmaxc [0] & 0x1) << 7) + | ((xmc [0] & 0x7) << 4) + | ((xmc [1] & 0x7) << 1) + | ((xmc [2] >> 2) & 0x1) ; + *c++ = ((xmc [2] & 0x3) << 6) + | ((xmc [3] & 0x7) << 3) + | (xmc [4] & 0x7) ; + *c++ = ((xmc [5] & 0x7) << 5) /* 10 */ + | ((xmc [6] & 0x7) << 2) + | ((xmc [7] >> 1) & 0x3) ; + *c++ = ((xmc [7] & 0x1) << 7) + | ((xmc [8] & 0x7) << 4) + | ((xmc [9] & 0x7) << 1) + | ((xmc [10] >> 2) & 0x1) ; + *c++ = ((xmc [10] & 0x3) << 6) + | ((xmc [11] & 0x7) << 3) + | (xmc [12] & 0x7) ; + *c++ = ((Nc [1] & 0x7F) << 1) + | ((bc [1] >> 1) & 0x1) ; + *c++ = ((bc [1] & 0x1) << 7) + | ((Mc [1] & 0x3) << 5) + | ((xmaxc [1] >> 1) & 0x1F) ; + *c++ = ((xmaxc [1] & 0x1) << 7) + | ((xmc [13] & 0x7) << 4) + | ((xmc [14] & 0x7) << 1) + | ((xmc [15] >> 2) & 0x1) ; + *c++ = ((xmc [15] & 0x3) << 6) + | ((xmc [16] & 0x7) << 3) + | (xmc [17] & 0x7) ; + *c++ = ((xmc [18] & 0x7) << 5) + | ((xmc [19] & 0x7) << 2) + | ((xmc [20] >> 1) & 0x3) ; + *c++ = ((xmc [20] & 0x1) << 7) + | ((xmc [21] & 0x7) << 4) + | ((xmc [22] & 0x7) << 1) + | ((xmc [23] >> 2) & 0x1) ; + *c++ = ((xmc [23] & 0x3) << 6) + | ((xmc [24] & 0x7) << 3) + | (xmc [25] & 0x7) ; + *c++ = ((Nc [2] & 0x7F) << 1) /* 20 */ + | ((bc [2] >> 1) & 0x1) ; + *c++ = ((bc [2] & 0x1) << 7) + | ((Mc [2] & 0x3) << 5) + | ((xmaxc [2] >> 1) & 0x1F) ; + *c++ = ((xmaxc [2] & 0x1) << 7) + | ((xmc [26] & 0x7) << 4) + | ((xmc [27] & 0x7) << 1) + | ((xmc [28] >> 2) & 0x1) ; + *c++ = ((xmc [28] & 0x3) << 6) + | ((xmc [29] & 0x7) << 3) + | (xmc [30] & 0x7) ; + *c++ = ((xmc [31] & 0x7) << 5) + | ((xmc [32] & 0x7) << 2) + | ((xmc [33] >> 1) & 0x3) ; + *c++ = ((xmc [33] & 0x1) << 7) + | ((xmc [34] & 0x7) << 4) + | ((xmc [35] & 0x7) << 1) + | ((xmc [36] >> 2) & 0x1) ; + *c++ = ((xmc [36] & 0x3) << 6) + | ((xmc [37] & 0x7) << 3) + | (xmc [38] & 0x7) ; + *c++ = ((Nc [3] & 0x7F) << 1) + | ((bc [3] >> 1) & 0x1) ; + *c++ = ((bc [3] & 0x1) << 7) + | ((Mc [3] & 0x3) << 5) + | ((xmaxc [3] >> 1) & 0x1F) ; + *c++ = ((xmaxc [3] & 0x1) << 7) + | ((xmc [39] & 0x7) << 4) + | ((xmc [40] & 0x7) << 1) + | ((xmc [41] >> 2) & 0x1) ; + *c++ = ((xmc [41] & 0x3) << 6) /* 30 */ + | ((xmc [42] & 0x7) << 3) + | (xmc [43] & 0x7) ; + *c++ = ((xmc [44] & 0x7) << 5) + | ((xmc [45] & 0x7) << 2) + | ((xmc [46] >> 1) & 0x3) ; + *c++ = ((xmc [46] & 0x1) << 7) + | ((xmc [47] & 0x7) << 4) + | ((xmc [48] & 0x7) << 1) + | ((xmc [49] >> 2) & 0x1) ; + *c++ = ((xmc [49] & 0x3) << 6) + | ((xmc [50] & 0x7) << 3) + | (xmc [51] & 0x7) ; } } diff --git a/lib-src/libsndfile/src/GSM610/gsm_option.c b/lib-src/libsndfile/src/GSM610/gsm_option.c index 0139c353f..208768338 100644 --- a/lib-src/libsndfile/src/GSM610/gsm_option.c +++ b/lib-src/libsndfile/src/GSM610/gsm_option.c @@ -10,57 +10,57 @@ int gsm_option (gsm r, int opt, int * val) { - int result = -1; + int result = -1 ; switch (opt) { case GSM_OPT_LTP_CUT: #ifdef LTP_CUT - result = r->ltp_cut; - if (val) r->ltp_cut = *val; + result = r->ltp_cut ; + if (val) r->ltp_cut = *val ; #endif - break; + break ; case GSM_OPT_VERBOSE: #ifndef NDEBUG - result = r->verbose; - if (val) r->verbose = *val; + result = r->verbose ; + if (val) r->verbose = *val ; #endif - break; + break ; case GSM_OPT_FAST: -#if defined(FAST) && defined(USE_FLOAT_MUL) - result = r->fast; - if (val) r->fast = !!*val; +#if defined (FAST) && defined (USE_FLOAT_MUL) + result = r->fast ; + if (val) r->fast = !!*val ; #endif - break; + break ; case GSM_OPT_FRAME_CHAIN: #ifdef WAV49 - result = r->frame_chain; - if (val) r->frame_chain = *val; + result = r->frame_chain ; + if (val) r->frame_chain = *val ; #endif - break; + break ; case GSM_OPT_FRAME_INDEX: #ifdef WAV49 - result = r->frame_index; - if (val) r->frame_index = *val; + result = r->frame_index ; + if (val) r->frame_index = *val ; #endif - break; + break ; case GSM_OPT_WAV49: -#ifdef WAV49 - result = r->wav_fmt; - if (val) r->wav_fmt = !!*val; +#ifdef WAV49 + result = r->wav_fmt ; + if (val) r->wav_fmt = !!*val ; #endif - break; + break ; default: - break; + break ; } - return result; + return result ; } diff --git a/lib-src/libsndfile/src/GSM610/long_term.c b/lib-src/libsndfile/src/GSM610/long_term.c index 0d2cd0ff4..3276a464c 100644 --- a/lib-src/libsndfile/src/GSM610/long_term.c +++ b/lib-src/libsndfile/src/GSM610/long_term.c @@ -18,26 +18,26 @@ * This module computes the LTP gain (bc) and the LTP lag (Nc) * for the long term analysis filter. This is done by calculating a * maximum of the cross-correlation function between the current - * sub-segment short term residual signal d[0..39] (output of - * the short term analysis filter; for simplification the index + * sub-segment short term residual signal d [0..39] (output of + * the short term analysis filter ; for simplification the index * of this array begins at 0 and ends at 39 for each sub-segment of the * RPE-LTP analysis) and the previous reconstructed short term - * residual signal dp[ -120 .. -1 ]. A dynamic scaling must be + * residual signal dp [-120 .. -1]. A dynamic scaling must be * performed to avoid overflow. */ /* The next procedure exists in six versions. First two integer - * version (if USE_FLOAT_MUL is not defined); then four floating + * version (if USE_FLOAT_MUL is not defined) ; then four floating * point versions, twice with proper scaling (USE_FLOAT_MUL defined), * once without (USE_FLOAT_MUL and FAST defined, and fast run-time * option used). Every pair has first a Cut version (see the -C - * option to toast or the LTP_CUT option to gsm_option()), then the + * option to toast or the LTP_CUT option to gsm_option ()), then the * uncut one. (For a detailed explanation of why this is altogether * a bad idea, see Henry Spencer and Geoff Collyer, ``#ifdef Considered * Harmful''.) */ -#ifndef USE_FLOAT_MUL +#ifndef USE_FLOAT_MUL #ifdef LTP_CUT @@ -45,240 +45,235 @@ static void Cut_Calculation_of_the_LTP_parameters ( struct gsm_state * st, - register word * d, /* [0..39] IN */ - register word * dp, /* [-120..-1] IN */ - word * bc_out, /* OUT */ - word * Nc_out /* OUT */ -) + register int16_t * d, /* [0..39] IN */ + register int16_t * dp, /* [-120..-1] IN */ + int16_t * bc_out, /* OUT */ + int16_t * Nc_out /* OUT */) { - register int k, lambda; - word Nc, bc; - word wt[40]; + register int k, lambda ; + int16_t Nc, bc ; + int16_t wt [40] ; - longword L_result; - longword L_max, L_power; - word R, S, dmax, scal, best_k; - word ltp_cut; + int32_t L_result ; + int32_t L_max, L_power ; + int16_t R, S, dmax, scal, best_k ; + int16_t ltp_cut ; - register word temp, wt_k; + register int16_t temp, wt_k ; - /* Search of the optimum scaling of d[0..39]. - */ - dmax = 0; - for (k = 0; k <= 39; k++) { - temp = d[k]; - temp = GSM_ABS( temp ); - if (temp > dmax) { - dmax = temp; - best_k = k; + /* Search of the optimum scaling of d [0..39]. */ + dmax = 0 ; + for (k = 0 ; k <= 39 ; k++) + { temp = d [k] ; + temp = GSM_ABS (temp) ; + if (temp > dmax) + { dmax = temp ; + best_k = k ; + } } - } - temp = 0; - if (dmax == 0) scal = 0; - else { - assert(dmax > 0); - temp = gsm_norm( (longword)dmax << 16 ); - } - if (temp > 6) scal = 0; - else scal = 6 - temp; - assert(scal >= 0); + temp = 0 ; + if (dmax == 0) + scal = 0 ; + else + { assert (dmax > 0) ; + temp = gsm_norm ((int32_t) dmax << 16) ; + } + if (temp > 6) scal = 0 ; + else scal = 6 - temp ; + assert (scal >= 0) ; /* Search for the maximum cross-correlation and coding of the LTP lag */ - L_max = 0; - Nc = 40; /* index for the maximum cross-correlation */ - wt_k = SASR_W(d[best_k], scal); + L_max = 0 ; + Nc = 40 ; /* index for the maximum cross-correlation */ + wt_k = SASR_W (d [best_k], scal) ; - for (lambda = 40; lambda <= 120; lambda++) { - L_result = (longword)wt_k * dp[best_k - lambda]; - if (L_result > L_max) { - Nc = lambda; - L_max = L_result; + for (lambda = 40 ; lambda <= 120 ; lambda++) + { L_result = (int32_t) wt_k * dp [best_k - lambda] ; + if (L_result > L_max) + { Nc = lambda ; + L_max = L_result ; + } } - } - *Nc_out = Nc; - L_max <<= 1; + *Nc_out = Nc ; + L_max <<= 1 ; /* Rescaling of L_max */ - assert(scal <= 100 && scal >= -100); - L_max = L_max >> (6 - scal); /* sub(6, scal) */ + assert (scal <= 100 && scal >= -100) ; + L_max = L_max >> (6 - scal) ; /* sub (6, scal) */ - assert( Nc <= 120 && Nc >= 40); + assert (Nc <= 120 && Nc >= 40) ; /* Compute the power of the reconstructed short term residual - * signal dp[..] + * signal dp [..] */ - L_power = 0; - for (k = 0; k <= 39; k++) { + L_power = 0 ; + for (k = 0 ; k <= 39 ; k++) + { register int32_t L_temp ; - register longword L_temp; + L_temp = SASR_W (dp [k - Nc], 3) ; + L_power += L_temp * L_temp ; + } + L_power <<= 1 ; /* from L_MULT */ - L_temp = SASR_W( dp[k - Nc], 3 ); - L_power += L_temp * L_temp; - } - L_power <<= 1; /* from L_MULT */ + /* Normalization of L_max and L_power */ - /* Normalization of L_max and L_power - */ + if (L_max <= 0) + { *bc_out = 0 ; + return ; + } + if (L_max >= L_power) + { *bc_out = 3 ; + return ; + } - if (L_max <= 0) { - *bc_out = 0; - return; - } - if (L_max >= L_power) { - *bc_out = 3; - return; - } + temp = gsm_norm (L_power) ; - temp = gsm_norm( L_power ); - - R = SASR( L_max << temp, 16 ); - S = SASR( L_power << temp, 16 ); + R = SASR (L_max << temp, 16) ; + S = SASR (L_power << temp, 16) ; /* Coding of the LTP gain */ - /* Table 4.3a must be used to obtain the level DLB[i] for the + /* Table 4.3a must be used to obtain the level DLB [i] for the * quantization of the LTP gain b to get the coded version bc. */ - for (bc = 0; bc <= 2; bc++) if (R <= gsm_mult(S, gsm_DLB[bc])) break; - *bc_out = bc; + for (bc = 0 ; bc <= 2 ; bc++) if (R <= gsm_mult (S, gsm_DLB [bc])) break ; + *bc_out = bc ; } #endif /* LTP_CUT */ static void Calculation_of_the_LTP_parameters ( - register word * d, /* [0..39] IN */ - register word * dp, /* [-120..-1] IN */ - word * bc_out, /* OUT */ - word * Nc_out /* OUT */ -) + register int16_t * d, /* [0..39] IN */ + register int16_t * dp, /* [-120..-1] IN */ + int16_t * bc_out, /* OUT */ + int16_t * Nc_out /* OUT */) { - register int k, lambda; - word Nc, bc; - word wt[40]; + register int k, lambda ; + int16_t Nc, bc ; + int16_t wt [40] ; - longword L_max, L_power; - word R, S, dmax, scal; - register word temp; + int32_t L_max, L_power ; + int16_t R, S, dmax, scal ; + register int16_t temp ; - /* Search of the optimum scaling of d[0..39]. + /* Search of the optimum scaling of d [0..39]. */ - dmax = 0; + dmax = 0 ; - for (k = 0; k <= 39; k++) { - temp = d[k]; - temp = GSM_ABS( temp ); - if (temp > dmax) dmax = temp; - } + for (k = 0 ; k <= 39 ; k++) + { temp = d [k] ; + temp = GSM_ABS (temp) ; + if (temp > dmax) dmax = temp ; + } - temp = 0; - if (dmax == 0) scal = 0; - else { - assert(dmax > 0); - temp = gsm_norm( (longword)dmax << 16 ); - } + temp = 0 ; + if (dmax == 0) + scal = 0 ; + else + { assert (dmax > 0) ; + temp = gsm_norm ((int32_t) dmax << 16) ; + } - if (temp > 6) scal = 0; - else scal = 6 - temp; + if (temp > 6) scal = 0 ; + else scal = 6 - temp ; - assert(scal >= 0); + assert (scal >= 0) ; /* Initialization of a working array wt */ - for (k = 0; k <= 39; k++) wt[k] = SASR_W( d[k], scal ); + for (k = 0 ; k <= 39 ; k++) wt [k] = SASR_W (d [k], scal) ; - /* Search for the maximum cross-correlation and coding of the LTP lag - */ - L_max = 0; - Nc = 40; /* index for the maximum cross-correlation */ + /* Search for the maximum cross-correlation and coding of the LTP lag */ + L_max = 0 ; + Nc = 40 ; /* index for the maximum cross-correlation */ - for (lambda = 40; lambda <= 120; lambda++) { + for (lambda = 40 ; lambda <= 120 ; lambda++) + { # undef STEP -# define STEP(k) (longword)wt[k] * dp[k - lambda] +# define STEP(k) (int32_t) wt [k] * dp [k - lambda] - register longword L_result; + register int32_t L_result ; - L_result = STEP(0) ; L_result += STEP(1) ; - L_result += STEP(2) ; L_result += STEP(3) ; - L_result += STEP(4) ; L_result += STEP(5) ; - L_result += STEP(6) ; L_result += STEP(7) ; - L_result += STEP(8) ; L_result += STEP(9) ; - L_result += STEP(10) ; L_result += STEP(11) ; - L_result += STEP(12) ; L_result += STEP(13) ; - L_result += STEP(14) ; L_result += STEP(15) ; - L_result += STEP(16) ; L_result += STEP(17) ; - L_result += STEP(18) ; L_result += STEP(19) ; - L_result += STEP(20) ; L_result += STEP(21) ; - L_result += STEP(22) ; L_result += STEP(23) ; - L_result += STEP(24) ; L_result += STEP(25) ; - L_result += STEP(26) ; L_result += STEP(27) ; - L_result += STEP(28) ; L_result += STEP(29) ; - L_result += STEP(30) ; L_result += STEP(31) ; - L_result += STEP(32) ; L_result += STEP(33) ; - L_result += STEP(34) ; L_result += STEP(35) ; - L_result += STEP(36) ; L_result += STEP(37) ; - L_result += STEP(38) ; L_result += STEP(39) ; + L_result = STEP (0) ; L_result += STEP (1) ; + L_result += STEP (2) ; L_result += STEP (3) ; + L_result += STEP (4) ; L_result += STEP (5) ; + L_result += STEP (6) ; L_result += STEP (7) ; + L_result += STEP (8) ; L_result += STEP (9) ; + L_result += STEP (10) ; L_result += STEP (11) ; + L_result += STEP (12) ; L_result += STEP (13) ; + L_result += STEP (14) ; L_result += STEP (15) ; + L_result += STEP (16) ; L_result += STEP (17) ; + L_result += STEP (18) ; L_result += STEP (19) ; + L_result += STEP (20) ; L_result += STEP (21) ; + L_result += STEP (22) ; L_result += STEP (23) ; + L_result += STEP (24) ; L_result += STEP (25) ; + L_result += STEP (26) ; L_result += STEP (27) ; + L_result += STEP (28) ; L_result += STEP (29) ; + L_result += STEP (30) ; L_result += STEP (31) ; + L_result += STEP (32) ; L_result += STEP (33) ; + L_result += STEP (34) ; L_result += STEP (35) ; + L_result += STEP (36) ; L_result += STEP (37) ; + L_result += STEP (38) ; L_result += STEP (39) ; - if (L_result > L_max) { - - Nc = lambda; - L_max = L_result; + if (L_result > L_max) + { Nc = lambda ; + L_max = L_result ; + } } - } - *Nc_out = Nc; + *Nc_out = Nc ; - L_max <<= 1; + L_max <<= 1 ; /* Rescaling of L_max */ - assert(scal <= 100 && scal >= -100); - L_max = L_max >> (6 - scal); /* sub(6, scal) */ + assert (scal <= 100 && scal >= -100) ; + L_max = L_max >> (6 - scal) ; /* sub (6, scal) */ - assert( Nc <= 120 && Nc >= 40); + assert (Nc <= 120 && Nc >= 40) ; /* Compute the power of the reconstructed short term residual - * signal dp[..] + * signal dp [..] */ - L_power = 0; - for (k = 0; k <= 39; k++) { + L_power = 0 ; + for (k = 0 ; k <= 39 ; k++) + { register int32_t L_temp ; - register longword L_temp; - - L_temp = SASR_W( dp[k - Nc], 3 ); - L_power += L_temp * L_temp; - } - L_power <<= 1; /* from L_MULT */ + L_temp = SASR_W (dp [k - Nc], 3) ; + L_power += L_temp * L_temp ; + } + L_power <<= 1 ; /* from L_MULT */ /* Normalization of L_max and L_power */ - if (L_max <= 0) { - *bc_out = 0; - return; - } - if (L_max >= L_power) { - *bc_out = 3; - return; - } + if (L_max <= 0) + { *bc_out = 0 ; + return ; + } + if (L_max >= L_power) + { *bc_out = 3 ; + return ; + } - temp = gsm_norm( L_power ); + temp = gsm_norm (L_power) ; - R = SASR_L( L_max << temp, 16 ); - S = SASR_L( L_power << temp, 16 ); + R = SASR_L (L_max << temp, 16) ; + S = SASR_L (L_power << temp, 16) ; /* Coding of the LTP gain */ - /* Table 4.3a must be used to obtain the level DLB[i] for the + /* Table 4.3a must be used to obtain the level DLB [i] for the * quantization of the LTP gain b to get the coded version bc. */ - for (bc = 0; bc <= 2; bc++) if (R <= gsm_mult(S, gsm_DLB[bc])) break; - *bc_out = bc; + for (bc = 0 ; bc <= 2 ; bc++) if (R <= gsm_mult (S, gsm_DLB [bc])) break ; + *bc_out = bc ; } #else /* USE_FLOAT_MUL */ @@ -287,117 +282,110 @@ static void Calculation_of_the_LTP_parameters ( static void Cut_Calculation_of_the_LTP_parameters ( struct gsm_state * st, /* IN */ - register word * d, /* [0..39] IN */ - register word * dp, /* [-120..-1] IN */ - word * bc_out, /* OUT */ - word * Nc_out /* OUT */ -) + register int16_t * d, /* [0..39] IN */ + register int16_t * dp, /* [-120..-1] IN */ + int16_t * bc_out, /* OUT */ + int16_t * Nc_out /* OUT */) { - register int k, lambda; - word Nc, bc; - word ltp_cut; + register int k, lambda ; + int16_t Nc, bc ; + int16_t ltp_cut ; - float wt_float[40]; - float dp_float_base[120], * dp_float = dp_float_base + 120; + float wt_float [40] ; + float dp_float_base [120], * dp_float = dp_float_base + 120 ; - longword L_max, L_power; - word R, S, dmax, scal; - register word temp; + int32_t L_max, L_power ; + int16_t R, S, dmax, scal ; + register int16_t temp ; - /* Search of the optimum scaling of d[0..39]. + /* Search of the optimum scaling of d [0..39]. */ - dmax = 0; + dmax = 0 ; - for (k = 0; k <= 39; k++) { - temp = d[k]; - temp = GSM_ABS( temp ); - if (temp > dmax) dmax = temp; - } - - temp = 0; - if (dmax == 0) scal = 0; - else { - assert(dmax > 0); - temp = gsm_norm( (longword)dmax << 16 ); - } - - if (temp > 6) scal = 0; - else scal = 6 - temp; - - assert(scal >= 0); - ltp_cut = (longword)SASR_W(dmax, scal) * st->ltp_cut / 100; - - - /* Initialization of a working array wt - */ - - for (k = 0; k < 40; k++) { - register word w = SASR_W( d[k], scal ); - if (w < 0 ? w > -ltp_cut : w < ltp_cut) { - wt_float[k] = 0.0; + for (k = 0 ; k <= 39 ; k++) + { temp = d [k] ; + temp = GSM_ABS (temp) ; + if (temp > dmax) dmax = temp ; } - else { - wt_float[k] = w; + + temp = 0 ; + if (dmax == 0) scal = 0 ; + else + { assert (dmax > 0) ; + temp = gsm_norm ((int32_t) dmax << 16) ; } - } - for (k = -120; k < 0; k++) dp_float[k] = dp[k]; + + if (temp > 6) scal = 0 ; + else scal = 6 - temp ; + + assert (scal >= 0) ; + ltp_cut = (int32_t) SASR_W (dmax, scal) * st->ltp_cut / 100 ; + + /* Initialization of a working array wt */ + + for (k = 0 ; k < 40 ; k++) + { register int16_t w = SASR_W (d [k], scal) ; + if (w < 0 ? w > -ltp_cut : w < ltp_cut) + wt_float [k] = 0.0 ; + else + wt_float [k] = w ; + } + for (k = -120 ; k < 0 ; k++) dp_float [k] = dp [k] ; /* Search for the maximum cross-correlation and coding of the LTP lag */ - L_max = 0; - Nc = 40; /* index for the maximum cross-correlation */ + L_max = 0 ; + Nc = 40 ; /* index for the maximum cross-correlation */ - for (lambda = 40; lambda <= 120; lambda += 9) { + for (lambda = 40 ; lambda <= 120 ; lambda += 9) + { /* Calculate L_result for l = lambda .. lambda + 9. */ + register float *lp = dp_float - lambda ; - /* Calculate L_result for l = lambda .. lambda + 9. - */ - register float *lp = dp_float - lambda; - - register float W; - register float a = lp[-8], b = lp[-7], c = lp[-6], - d = lp[-5], e = lp[-4], f = lp[-3], - g = lp[-2], h = lp[-1]; - register float E; - register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, - S5 = 0, S6 = 0, S7 = 0, S8 = 0; + register float W ; + register float a = lp [-8], b = lp [-7], c = lp [-6], + d = lp [-5], e = lp [-4], f = lp [-3], + g = lp [-2], h = lp [-1] ; + register float E ; + register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, + S5 = 0, S6 = 0, S7 = 0, S8 = 0 ; # undef STEP # define STEP(K, a, b, c, d, e, f, g, h) \ - if ((W = wt_float[K]) != 0.0) { \ - E = W * a; S8 += E; \ - E = W * b; S7 += E; \ - E = W * c; S6 += E; \ - E = W * d; S5 += E; \ - E = W * e; S4 += E; \ - E = W * f; S3 += E; \ - E = W * g; S2 += E; \ - E = W * h; S1 += E; \ - a = lp[K]; \ - E = W * a; S0 += E; } else (a = lp[K]) + if ((W = wt_float [K]) != 0.0) { \ + E = W * a ; S8 += E ; \ + E = W * b ; S7 += E ; \ + E = W * c ; S6 += E ; \ + E = W * d ; S5 += E ; \ + E = W * e ; S4 += E ; \ + E = W * f ; S3 += E ; \ + E = W * g ; S2 += E ; \ + E = W * h ; S1 += E ; \ + a = lp [K] ; \ + E = W * a ; S0 += E ; } else (a = lp [K]) -# define STEP_A(K) STEP(K, a, b, c, d, e, f, g, h) -# define STEP_B(K) STEP(K, b, c, d, e, f, g, h, a) -# define STEP_C(K) STEP(K, c, d, e, f, g, h, a, b) -# define STEP_D(K) STEP(K, d, e, f, g, h, a, b, c) -# define STEP_E(K) STEP(K, e, f, g, h, a, b, c, d) -# define STEP_F(K) STEP(K, f, g, h, a, b, c, d, e) -# define STEP_G(K) STEP(K, g, h, a, b, c, d, e, f) -# define STEP_H(K) STEP(K, h, a, b, c, d, e, f, g) +# define STEP_A(K) STEP (K, a, b, c, d, e, f, g, h) +# define STEP_B(K) STEP (K, b, c, d, e, f, g, h, a) +# define STEP_C(K) STEP (K, c, d, e, f, g, h, a, b) +# define STEP_D(K) STEP (K, d, e, f, g, h, a, b, c) +# define STEP_E(K) STEP (K, e, f, g, h, a, b, c, d) +# define STEP_F(K) STEP (K, f, g, h, a, b, c, d, e) +# define STEP_G(K) STEP (K, g, h, a, b, c, d, e, f) +# define STEP_H(K) STEP (K, h, a, b, c, d, e, f, g) - STEP_A( 0); STEP_B( 1); STEP_C( 2); STEP_D( 3); - STEP_E( 4); STEP_F( 5); STEP_G( 6); STEP_H( 7); + STEP_A (0) ; STEP_B (1) ; STEP_C (2) ; STEP_D (3) ; + STEP_E (4) ; STEP_F (5) ; STEP_G (6) ; STEP_H (7) ; - STEP_A( 8); STEP_B( 9); STEP_C(10); STEP_D(11); - STEP_E(12); STEP_F(13); STEP_G(14); STEP_H(15); + STEP_A (8) ; STEP_B (9) ; STEP_C (10) ; STEP_D (11) ; + STEP_E (12) ; STEP_F (13) ; STEP_G (14) ; STEP_H (15) ; - STEP_A(16); STEP_B(17); STEP_C(18); STEP_D(19); - STEP_E(20); STEP_F(21); STEP_G(22); STEP_H(23); + STEP_A (16) ; STEP_B (17) ; STEP_C (18) ; STEP_D (19) ; + STEP_E (20) ; STEP_F (21) ; STEP_G (22) ; STEP_H (23) ; - STEP_A(24); STEP_B(25); STEP_C(26); STEP_D(27); - STEP_E(28); STEP_F(29); STEP_G(30); STEP_H(31); + STEP_A (24) ; STEP_B (25) ; STEP_C (26) ; STEP_D (27) ; + STEP_E (28) ; STEP_F (29) ; STEP_G (30) ; STEP_H (31) ; - STEP_A(32); STEP_B(33); STEP_C(34); STEP_D(35); - STEP_E(36); STEP_F(37); STEP_G(38); STEP_H(39); + STEP_A (32) ; STEP_B (33) ; STEP_C (34) ; STEP_D (35) ; + STEP_E (36) ; STEP_F (37) ; STEP_G (38) ; STEP_H (39) ; # undef STEP_A # undef STEP_B @@ -408,171 +396,166 @@ static void Cut_Calculation_of_the_LTP_parameters ( # undef STEP_G # undef STEP_H - if (S0 > L_max) { L_max = S0; Nc = lambda; } - if (S1 > L_max) { L_max = S1; Nc = lambda + 1; } - if (S2 > L_max) { L_max = S2; Nc = lambda + 2; } - if (S3 > L_max) { L_max = S3; Nc = lambda + 3; } - if (S4 > L_max) { L_max = S4; Nc = lambda + 4; } - if (S5 > L_max) { L_max = S5; Nc = lambda + 5; } - if (S6 > L_max) { L_max = S6; Nc = lambda + 6; } - if (S7 > L_max) { L_max = S7; Nc = lambda + 7; } - if (S8 > L_max) { L_max = S8; Nc = lambda + 8; } + if (S0 > L_max) { L_max = S0 ; Nc = lambda ; } + if (S1 > L_max) { L_max = S1 ; Nc = lambda + 1 ; } + if (S2 > L_max) { L_max = S2 ; Nc = lambda + 2 ; } + if (S3 > L_max) { L_max = S3 ; Nc = lambda + 3 ; } + if (S4 > L_max) { L_max = S4 ; Nc = lambda + 4 ; } + if (S5 > L_max) { L_max = S5 ; Nc = lambda + 5 ; } + if (S6 > L_max) { L_max = S6 ; Nc = lambda + 6 ; } + if (S7 > L_max) { L_max = S7 ; Nc = lambda + 7 ; } + if (S8 > L_max) { L_max = S8 ; Nc = lambda + 8 ; } } - *Nc_out = Nc; + *Nc_out = Nc ; - L_max <<= 1; + L_max <<= 1 ; /* Rescaling of L_max */ - assert(scal <= 100 && scal >= -100); - L_max = L_max >> (6 - scal); /* sub(6, scal) */ + assert (scal <= 100 && scal >= -100) ; + L_max = L_max >> (6 - scal) ; /* sub (6, scal) */ - assert( Nc <= 120 && Nc >= 40); + assert (Nc <= 120 && Nc >= 40) ; /* Compute the power of the reconstructed short term residual - * signal dp[..] + * signal dp [..] */ - L_power = 0; - for (k = 0; k <= 39; k++) { + L_power = 0 ; + for (k = 0 ; k <= 39 ; k++) + { register int32_t L_temp ; - register longword L_temp; - - L_temp = SASR_W( dp[k - Nc], 3 ); - L_power += L_temp * L_temp; - } - L_power <<= 1; /* from L_MULT */ + L_temp = SASR_W (dp [k - Nc], 3) ; + L_power += L_temp * L_temp ; + } + L_power <<= 1 ; /* from L_MULT */ /* Normalization of L_max and L_power */ - if (L_max <= 0) { - *bc_out = 0; - return; - } - if (L_max >= L_power) { - *bc_out = 3; - return; - } + if (L_max <= 0) + { *bc_out = 0 ; + return ; + } + if (L_max >= L_power) + { *bc_out = 3 ; + return ; + } - temp = gsm_norm( L_power ); + temp = gsm_norm (L_power) ; - R = SASR( L_max << temp, 16 ); - S = SASR( L_power << temp, 16 ); + R = SASR (L_max << temp, 16) ; + S = SASR (L_power << temp, 16) ; /* Coding of the LTP gain */ - /* Table 4.3a must be used to obtain the level DLB[i] for the + /* Table 4.3a must be used to obtain the level DLB [i] for the * quantization of the LTP gain b to get the coded version bc. */ - for (bc = 0; bc <= 2; bc++) if (R <= gsm_mult(S, gsm_DLB[bc])) break; - *bc_out = bc; + for (bc = 0 ; bc <= 2 ; bc++) if (R <= gsm_mult (S, gsm_DLB [bc])) break ; + *bc_out = bc ; } #endif /* LTP_CUT */ static void Calculation_of_the_LTP_parameters ( - register word * din, /* [0..39] IN */ - register word * dp, /* [-120..-1] IN */ - word * bc_out, /* OUT */ - word * Nc_out /* OUT */ -) + register int16_t * din, /* [0..39] IN */ + register int16_t * dp, /* [-120..-1] IN */ + int16_t * bc_out, /* OUT */ + int16_t * Nc_out /* OUT */) { - register int k, lambda; - word Nc, bc; + register int k, lambda ; + int16_t Nc, bc ; - float wt_float[40]; - float dp_float_base[120], * dp_float = dp_float_base + 120; + float wt_float [40] ; + float dp_float_base [120], * dp_float = dp_float_base + 120 ; - longword L_max, L_power; - word R, S, dmax, scal; - register word temp; + int32_t L_max, L_power ; + int16_t R, S, dmax, scal ; + register int16_t temp ; - /* Search of the optimum scaling of d[0..39]. + /* Search of the optimum scaling of d [0..39]. */ - dmax = 0; + dmax = 0 ; - for (k = 0; k <= 39; k++) { - temp = din [k] ; + for (k = 0 ; k <= 39 ; k++) + { temp = din [k] ; temp = GSM_ABS (temp) ; - if (temp > dmax) dmax = temp; - } + if (temp > dmax) dmax = temp ; + } - temp = 0; - if (dmax == 0) scal = 0; - else { - assert(dmax > 0); - temp = gsm_norm( (longword)dmax << 16 ); - } + temp = 0 ; + if (dmax == 0) scal = 0 ; + else + { assert (dmax > 0) ; + temp = gsm_norm ((int32_t) dmax << 16) ; + } - if (temp > 6) scal = 0; - else scal = 6 - temp; + if (temp > 6) scal = 0 ; + else scal = 6 - temp ; - assert(scal >= 0); + assert (scal >= 0) ; - /* Initialization of a working array wt - */ + /* Initialization of a working array wt */ - for (k = 0; k < 40; k++) wt_float[k] = SASR_W (din [k], scal) ; - for (k = -120; k < 0; k++) dp_float[k] = dp[k]; + for (k = 0 ; k < 40 ; k++) wt_float [k] = SASR_W (din [k], scal) ; + for (k = -120 ; k < 0 ; k++) dp_float [k] = dp [k] ; /* Search for the maximum cross-correlation and coding of the LTP lag */ - L_max = 0; - Nc = 40; /* index for the maximum cross-correlation */ + L_max = 0 ; + Nc = 40 ; /* index for the maximum cross-correlation */ - for (lambda = 40; lambda <= 120; lambda += 9) { + for (lambda = 40 ; lambda <= 120 ; lambda += 9) + { /* Calculate L_result for l = lambda .. lambda + 9. */ + register float *lp = dp_float - lambda ; - /* Calculate L_result for l = lambda .. lambda + 9. - */ - register float *lp = dp_float - lambda; - - register float W; - register float a = lp[-8], b = lp[-7], c = lp[-6], - d = lp[-5], e = lp[-4], f = lp[-3], - g = lp[-2], h = lp[-1]; - register float E; - register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, - S5 = 0, S6 = 0, S7 = 0, S8 = 0; + register float W ; + register float a = lp [-8], b = lp [-7], c = lp [-6], + d = lp [-5], e = lp [-4], f = lp [-3], + g = lp [-2], h = lp [-1] ; + register float E ; + register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, + S5 = 0, S6 = 0, S7 = 0, S8 = 0 ; # undef STEP # define STEP(K, a, b, c, d, e, f, g, h) \ - W = wt_float[K]; \ - E = W * a; S8 += E; \ - E = W * b; S7 += E; \ - E = W * c; S6 += E; \ - E = W * d; S5 += E; \ - E = W * e; S4 += E; \ - E = W * f; S3 += E; \ - E = W * g; S2 += E; \ - E = W * h; S1 += E; \ - a = lp[K]; \ - E = W * a; S0 += E + W = wt_float [K] ; \ + E = W * a ; S8 += E ; \ + E = W * b ; S7 += E ; \ + E = W * c ; S6 += E ; \ + E = W * d ; S5 += E ; \ + E = W * e ; S4 += E ; \ + E = W * f ; S3 += E ; \ + E = W * g ; S2 += E ; \ + E = W * h ; S1 += E ; \ + a = lp [K] ; \ + E = W * a ; S0 += E -# define STEP_A(K) STEP(K, a, b, c, d, e, f, g, h) -# define STEP_B(K) STEP(K, b, c, d, e, f, g, h, a) -# define STEP_C(K) STEP(K, c, d, e, f, g, h, a, b) -# define STEP_D(K) STEP(K, d, e, f, g, h, a, b, c) -# define STEP_E(K) STEP(K, e, f, g, h, a, b, c, d) -# define STEP_F(K) STEP(K, f, g, h, a, b, c, d, e) -# define STEP_G(K) STEP(K, g, h, a, b, c, d, e, f) -# define STEP_H(K) STEP(K, h, a, b, c, d, e, f, g) +# define STEP_A(K) STEP (K, a, b, c, d, e, f, g, h) +# define STEP_B(K) STEP (K, b, c, d, e, f, g, h, a) +# define STEP_C(K) STEP (K, c, d, e, f, g, h, a, b) +# define STEP_D(K) STEP (K, d, e, f, g, h, a, b, c) +# define STEP_E(K) STEP (K, e, f, g, h, a, b, c, d) +# define STEP_F(K) STEP (K, f, g, h, a, b, c, d, e) +# define STEP_G(K) STEP (K, g, h, a, b, c, d, e, f) +# define STEP_H(K) STEP (K, h, a, b, c, d, e, f, g) - STEP_A( 0); STEP_B( 1); STEP_C( 2); STEP_D( 3); - STEP_E( 4); STEP_F( 5); STEP_G( 6); STEP_H( 7); + STEP_A (0) ; STEP_B (1) ; STEP_C (2) ; STEP_D (3) ; + STEP_E (4) ; STEP_F (5) ; STEP_G (6) ; STEP_H (7) ; - STEP_A( 8); STEP_B( 9); STEP_C(10); STEP_D(11); - STEP_E(12); STEP_F(13); STEP_G(14); STEP_H(15); + STEP_A (8) ; STEP_B (9) ; STEP_C (10) ; STEP_D (11) ; + STEP_E (12) ; STEP_F (13) ; STEP_G (14) ; STEP_H (15) ; - STEP_A(16); STEP_B(17); STEP_C(18); STEP_D(19); - STEP_E(20); STEP_F(21); STEP_G(22); STEP_H(23); + STEP_A (16) ; STEP_B (17) ; STEP_C (18) ; STEP_D (19) ; + STEP_E (20) ; STEP_F (21) ; STEP_G (22) ; STEP_H (23) ; - STEP_A(24); STEP_B(25); STEP_C(26); STEP_D(27); - STEP_E(28); STEP_F(29); STEP_G(30); STEP_H(31); + STEP_A (24) ; STEP_B (25) ; STEP_C (26) ; STEP_D (27) ; + STEP_E (28) ; STEP_F (29) ; STEP_G (30) ; STEP_H (31) ; - STEP_A(32); STEP_B(33); STEP_C(34); STEP_D(35); - STEP_E(36); STEP_F(37); STEP_G(38); STEP_H(39); + STEP_A (32) ; STEP_B (33) ; STEP_C (34) ; STEP_D (35) ; + STEP_E (36) ; STEP_F (37) ; STEP_G (38) ; STEP_H (39) ; # undef STEP_A # undef STEP_B @@ -583,65 +566,64 @@ static void Calculation_of_the_LTP_parameters ( # undef STEP_G # undef STEP_H - if (S0 > L_max) { L_max = S0; Nc = lambda; } - if (S1 > L_max) { L_max = S1; Nc = lambda + 1; } - if (S2 > L_max) { L_max = S2; Nc = lambda + 2; } - if (S3 > L_max) { L_max = S3; Nc = lambda + 3; } - if (S4 > L_max) { L_max = S4; Nc = lambda + 4; } - if (S5 > L_max) { L_max = S5; Nc = lambda + 5; } - if (S6 > L_max) { L_max = S6; Nc = lambda + 6; } - if (S7 > L_max) { L_max = S7; Nc = lambda + 7; } - if (S8 > L_max) { L_max = S8; Nc = lambda + 8; } + if (S0 > L_max) { L_max = S0 ; Nc = lambda ; } + if (S1 > L_max) { L_max = S1 ; Nc = lambda + 1 ; } + if (S2 > L_max) { L_max = S2 ; Nc = lambda + 2 ; } + if (S3 > L_max) { L_max = S3 ; Nc = lambda + 3 ; } + if (S4 > L_max) { L_max = S4 ; Nc = lambda + 4 ; } + if (S5 > L_max) { L_max = S5 ; Nc = lambda + 5 ; } + if (S6 > L_max) { L_max = S6 ; Nc = lambda + 6 ; } + if (S7 > L_max) { L_max = S7 ; Nc = lambda + 7 ; } + if (S8 > L_max) { L_max = S8 ; Nc = lambda + 8 ; } } - *Nc_out = Nc; + *Nc_out = Nc ; - L_max <<= 1; + L_max <<= 1 ; /* Rescaling of L_max */ - assert(scal <= 100 && scal >= -100); - L_max = L_max >> (6 - scal); /* sub(6, scal) */ + assert (scal <= 100 && scal >= -100) ; + L_max = L_max >> (6 - scal) ; /* sub (6, scal) */ - assert( Nc <= 120 && Nc >= 40); + assert (Nc <= 120 && Nc >= 40) ; /* Compute the power of the reconstructed short term residual - * signal dp[..] + * signal dp [..] */ - L_power = 0; - for (k = 0; k <= 39; k++) { + L_power = 0 ; + for (k = 0 ; k <= 39 ; k++) + { register int32_t L_temp ; - register longword L_temp; - - L_temp = SASR_W( dp[k - Nc], 3 ); - L_power += L_temp * L_temp; - } - L_power <<= 1; /* from L_MULT */ + L_temp = SASR_W (dp [k - Nc], 3) ; + L_power += L_temp * L_temp ; + } + L_power <<= 1 ; /* from L_MULT */ /* Normalization of L_max and L_power */ - if (L_max <= 0) { - *bc_out = 0; - return; - } - if (L_max >= L_power) { - *bc_out = 3; - return; - } + if (L_max <= 0) + { *bc_out = 0 ; + return ; + } + if (L_max >= L_power) + { *bc_out = 3 ; + return ; + } - temp = gsm_norm( L_power ); + temp = gsm_norm (L_power) ; - R = SASR_L ( L_max << temp, 16 ); - S = SASR_L ( L_power << temp, 16 ); + R = SASR_L (L_max << temp, 16) ; + S = SASR_L (L_power << temp, 16) ; /* Coding of the LTP gain */ - /* Table 4.3a must be used to obtain the level DLB[i] for the + /* Table 4.3a must be used to obtain the level DLB [i] for the * quantization of the LTP gain b to get the coded version bc. */ - for (bc = 0; bc <= 2; bc++) if (R <= gsm_mult(S, gsm_DLB[bc])) break; - *bc_out = bc; + for (bc = 0 ; bc <= 2 ; bc++) if (R <= gsm_mult (S, gsm_DLB [bc])) break ; + *bc_out = bc ; } #ifdef FAST @@ -649,192 +631,186 @@ static void Calculation_of_the_LTP_parameters ( static void Cut_Fast_Calculation_of_the_LTP_parameters ( struct gsm_state * st, /* IN */ - register word * d, /* [0..39] IN */ - register word * dp, /* [-120..-1] IN */ - word * bc_out, /* OUT */ - word * Nc_out /* OUT */ -) + register int16_t * d, /* [0..39] IN */ + register int16_t * dp, /* [-120..-1] IN */ + int16_t * bc_out, /* OUT */ + int16_t * Nc_out /* OUT */) { - register int k, lambda; - register float wt_float; - word Nc, bc; - word wt_max, best_k, ltp_cut; + register int k, lambda ; + register float wt_float ; + int16_t Nc, bc ; + int16_t wt_max, best_k, ltp_cut ; - float dp_float_base[120], * dp_float = dp_float_base + 120; + float dp_float_base [120], * dp_float = dp_float_base + 120 ; - register float L_result, L_max, L_power; + register float L_result, L_max, L_power ; - wt_max = 0; + wt_max = 0 ; - for (k = 0; k < 40; ++k) { - if ( d[k] > wt_max) wt_max = d[best_k = k]; - else if (-d[k] > wt_max) wt_max = -d[best_k = k]; - } - - assert(wt_max >= 0); - wt_float = (float)wt_max; - - for (k = -120; k < 0; ++k) dp_float[k] = (float)dp[k]; - - /* Search for the maximum cross-correlation and coding of the LTP lag - */ - L_max = 0; - Nc = 40; /* index for the maximum cross-correlation */ - - for (lambda = 40; lambda <= 120; lambda++) { - L_result = wt_float * dp_float[best_k - lambda]; - if (L_result > L_max) { - Nc = lambda; - L_max = L_result; + for (k = 0 ; k < 40 ; ++k) + { if (d [k] > wt_max) wt_max = d [best_k = k] ; + else if (-d [k] > wt_max) wt_max = -d [best_k = k] ; } - } - *Nc_out = Nc; - if (L_max <= 0.) { - *bc_out = 0; - return; - } + assert (wt_max >= 0) ; + wt_float = (float) wt_max ; + + for (k = -120 ; k < 0 ; ++k) dp_float [k] = (float) dp [k] ; + + /* Search for the maximum cross-correlation and coding of the LTP lag */ + L_max = 0 ; + Nc = 40 ; /* index for the maximum cross-correlation */ + + for (lambda = 40 ; lambda <= 120 ; lambda++) + { L_result = wt_float * dp_float [best_k - lambda] ; + if (L_result > L_max) + { Nc = lambda ; + L_max = L_result ; + } + } + + *Nc_out = Nc ; + if (L_max <= 0.) + { *bc_out = 0 ; + return ; + } /* Compute the power of the reconstructed short term residual - * signal dp[..] + * signal dp [..] */ - dp_float -= Nc; - L_power = 0; - for (k = 0; k < 40; ++k) { - register float f = dp_float[k]; - L_power += f * f; - } + dp_float -= Nc ; + L_power = 0 ; + for (k = 0 ; k < 40 ; ++k) + { register float f = dp_float [k] ; + L_power += f * f ; + } - if (L_max >= L_power) { - *bc_out = 3; - return; - } + if (L_max >= L_power) + { *bc_out = 3 ; + return ; + } /* Coding of the LTP gain - * Table 4.3a must be used to obtain the level DLB[i] for the + * Table 4.3a must be used to obtain the level DLB [i] for the * quantization of the LTP gain b to get the coded version bc. */ - lambda = L_max / L_power * 32768.; - for (bc = 0; bc <= 2; ++bc) if (lambda <= gsm_DLB[bc]) break; - *bc_out = bc; + lambda = L_max / L_power * 32768.0 ; + for (bc = 0 ; bc <= 2 ; ++bc) if (lambda <= gsm_DLB [bc]) break ; + *bc_out = bc ; } #endif /* LTP_CUT */ static void Fast_Calculation_of_the_LTP_parameters ( - register word * din, /* [0..39] IN */ - register word * dp, /* [-120..-1] IN */ - word * bc_out, /* OUT */ - word * Nc_out /* OUT */ -) + register int16_t * din, /* [0..39] IN */ + register int16_t * dp, /* [-120..-1] IN */ + int16_t * bc_out, /* OUT */ + int16_t * Nc_out /* OUT */) { - register int k, lambda; - word Nc, bc; + register int k, lambda ; + int16_t Nc, bc ; - float wt_float[40]; - float dp_float_base[120], * dp_float = dp_float_base + 120; + float wt_float [40] ; + float dp_float_base [120], * dp_float = dp_float_base + 120 ; - register float L_max, L_power; + register float L_max, L_power ; - for (k = 0; k < 40; ++k) wt_float[k] = (float) din [k] ; - for (k = -120; k < 0; ++k) dp_float[k] = (float) dp [k] ; + for (k = 0 ; k < 40 ; ++k) wt_float [k] = (float) din [k] ; + for (k = -120 ; k < 0 ; ++k) dp_float [k] = (float) dp [k] ; - /* Search for the maximum cross-correlation and coding of the LTP lag - */ - L_max = 0; - Nc = 40; /* index for the maximum cross-correlation */ + /* Search for the maximum cross-correlation and coding of the LTP lag */ + L_max = 0 ; + Nc = 40 ; /* index for the maximum cross-correlation */ - for (lambda = 40; lambda <= 120; lambda += 9) { + for (lambda = 40 ; lambda <= 120 ; lambda += 9) + { /* Calculate L_result for l = lambda .. lambda + 9. */ + register float *lp = dp_float - lambda ; - /* Calculate L_result for l = lambda .. lambda + 9. - */ - register float *lp = dp_float - lambda; - - register float W; - register float a = lp[-8], b = lp[-7], c = lp[-6], - d = lp[-5], e = lp[-4], f = lp[-3], - g = lp[-2], h = lp[-1]; - register float E; - register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, - S5 = 0, S6 = 0, S7 = 0, S8 = 0; + register float W ; + register float a = lp [-8], b = lp [-7], c = lp [-6], + d = lp [-5], e = lp [-4], f = lp [-3], + g = lp [-2], h = lp [-1] ; + register float E ; + register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, + S5 = 0, S6 = 0, S7 = 0, S8 = 0 ; # undef STEP # define STEP(K, a, b, c, d, e, f, g, h) \ - W = wt_float[K]; \ - E = W * a; S8 += E; \ - E = W * b; S7 += E; \ - E = W * c; S6 += E; \ - E = W * d; S5 += E; \ - E = W * e; S4 += E; \ - E = W * f; S3 += E; \ - E = W * g; S2 += E; \ - E = W * h; S1 += E; \ - a = lp[K]; \ - E = W * a; S0 += E + W = wt_float [K] ; \ + E = W * a ; S8 += E ; \ + E = W * b ; S7 += E ; \ + E = W * c ; S6 += E ; \ + E = W * d ; S5 += E ; \ + E = W * e ; S4 += E ; \ + E = W * f ; S3 += E ; \ + E = W * g ; S2 += E ; \ + E = W * h ; S1 += E ; \ + a = lp [K] ; \ + E = W * a ; S0 += E -# define STEP_A(K) STEP(K, a, b, c, d, e, f, g, h) -# define STEP_B(K) STEP(K, b, c, d, e, f, g, h, a) -# define STEP_C(K) STEP(K, c, d, e, f, g, h, a, b) -# define STEP_D(K) STEP(K, d, e, f, g, h, a, b, c) -# define STEP_E(K) STEP(K, e, f, g, h, a, b, c, d) -# define STEP_F(K) STEP(K, f, g, h, a, b, c, d, e) -# define STEP_G(K) STEP(K, g, h, a, b, c, d, e, f) -# define STEP_H(K) STEP(K, h, a, b, c, d, e, f, g) +# define STEP_A(K) STEP (K, a, b, c, d, e, f, g, h) +# define STEP_B(K) STEP (K, b, c, d, e, f, g, h, a) +# define STEP_C(K) STEP (K, c, d, e, f, g, h, a, b) +# define STEP_D(K) STEP (K, d, e, f, g, h, a, b, c) +# define STEP_E(K) STEP (K, e, f, g, h, a, b, c, d) +# define STEP_F(K) STEP (K, f, g, h, a, b, c, d, e) +# define STEP_G(K) STEP (K, g, h, a, b, c, d, e, f) +# define STEP_H(K) STEP (K, h, a, b, c, d, e, f, g) - STEP_A( 0); STEP_B( 1); STEP_C( 2); STEP_D( 3); - STEP_E( 4); STEP_F( 5); STEP_G( 6); STEP_H( 7); + STEP_A (0) ; STEP_B (1) ; STEP_C (2) ; STEP_D (3) ; + STEP_E (4) ; STEP_F (5) ; STEP_G (6) ; STEP_H (7) ; - STEP_A( 8); STEP_B( 9); STEP_C(10); STEP_D(11); - STEP_E(12); STEP_F(13); STEP_G(14); STEP_H(15); + STEP_A (8) ; STEP_B (9) ; STEP_C (10) ; STEP_D (11) ; + STEP_E (12) ; STEP_F (13) ; STEP_G (14) ; STEP_H (15) ; - STEP_A(16); STEP_B(17); STEP_C(18); STEP_D(19); - STEP_E(20); STEP_F(21); STEP_G(22); STEP_H(23); + STEP_A (16) ; STEP_B (17) ; STEP_C (18) ; STEP_D (19) ; + STEP_E (20) ; STEP_F (21) ; STEP_G (22) ; STEP_H (23) ; - STEP_A(24); STEP_B(25); STEP_C(26); STEP_D(27); - STEP_E(28); STEP_F(29); STEP_G(30); STEP_H(31); + STEP_A (24) ; STEP_B (25) ; STEP_C (26) ; STEP_D (27) ; + STEP_E (28) ; STEP_F (29) ; STEP_G (30) ; STEP_H (31) ; - STEP_A(32); STEP_B(33); STEP_C(34); STEP_D(35); - STEP_E(36); STEP_F(37); STEP_G(38); STEP_H(39); + STEP_A (32) ; STEP_B (33) ; STEP_C (34) ; STEP_D (35) ; + STEP_E (36) ; STEP_F (37) ; STEP_G (38) ; STEP_H (39) ; - if (S0 > L_max) { L_max = S0; Nc = lambda; } - if (S1 > L_max) { L_max = S1; Nc = lambda + 1; } - if (S2 > L_max) { L_max = S2; Nc = lambda + 2; } - if (S3 > L_max) { L_max = S3; Nc = lambda + 3; } - if (S4 > L_max) { L_max = S4; Nc = lambda + 4; } - if (S5 > L_max) { L_max = S5; Nc = lambda + 5; } - if (S6 > L_max) { L_max = S6; Nc = lambda + 6; } - if (S7 > L_max) { L_max = S7; Nc = lambda + 7; } - if (S8 > L_max) { L_max = S8; Nc = lambda + 8; } + if (S0 > L_max) { L_max = S0 ; Nc = lambda ; } + if (S1 > L_max) { L_max = S1 ; Nc = lambda + 1 ; } + if (S2 > L_max) { L_max = S2 ; Nc = lambda + 2 ; } + if (S3 > L_max) { L_max = S3 ; Nc = lambda + 3 ; } + if (S4 > L_max) { L_max = S4 ; Nc = lambda + 4 ; } + if (S5 > L_max) { L_max = S5 ; Nc = lambda + 5 ; } + if (S6 > L_max) { L_max = S6 ; Nc = lambda + 6 ; } + if (S7 > L_max) { L_max = S7 ; Nc = lambda + 7 ; } + if (S8 > L_max) { L_max = S8 ; Nc = lambda + 8 ; } } - *Nc_out = Nc; + *Nc_out = Nc ; - if (L_max <= 0.) { - *bc_out = 0; - return; - } + if (L_max <= 0.0) + { *bc_out = 0 ; + return ; + } /* Compute the power of the reconstructed short term residual - * signal dp[..] + * signal dp [..] */ - dp_float -= Nc; - L_power = 0; - for (k = 0; k < 40; ++k) { - register float f = dp_float[k]; - L_power += f * f; - } + dp_float -= Nc ; + L_power = 0 ; + for (k = 0 ; k < 40 ; ++k) + { register float f = dp_float [k] ; + L_power += f * f ; + } - if (L_max >= L_power) { - *bc_out = 3; - return; - } + if (L_max >= L_power) + { *bc_out = 3 ; + return ; + } /* Coding of the LTP gain - * Table 4.3a must be used to obtain the level DLB[i] for the + * Table 4.3a must be used to obtain the level DLB [i] for the * quantization of the LTP gain b to get the coded version bc. */ - lambda = L_max / L_power * 32768.; - for (bc = 0; bc <= 2; ++bc) if (lambda <= gsm_DLB[bc]) break; - *bc_out = bc; + lambda = L_max / L_power * 32768.0 ; + for (bc = 0 ; bc <= 2 ; ++bc) if (lambda <= gsm_DLB [bc]) break ; + *bc_out = bc ; } #endif /* FAST */ @@ -844,116 +820,113 @@ static void Fast_Calculation_of_the_LTP_parameters ( /* 4.2.12 */ static void Long_term_analysis_filtering ( - word bc, /* IN */ - word Nc, /* IN */ - register word * dp, /* previous d [-120..-1] IN */ - register word * d, /* d [0..39] IN */ - register word * dpp, /* estimate [0..39] OUT */ - register word * e /* long term res. signal [0..39] OUT */ -) + int16_t bc, /* IN */ + int16_t Nc, /* IN */ + register int16_t * dp, /* previous d [-120..-1] IN */ + register int16_t * d, /* d [0..39] IN */ + register int16_t * dpp, /* estimate [0..39] OUT */ + register int16_t * e /* long term res. signal [0..39] OUT */) /* * In this part, we have to decode the bc parameter to compute - * the samples of the estimate dpp[0..39]. The decoding of bc needs the - * use of table 4.3b. The long term residual signal e[0..39] + * the samples of the estimate dpp [0..39]. The decoding of bc needs the + * use of table 4.3b. The long term residual signal e [0..39] * is then calculated to be fed to the RPE encoding section. */ { - register int k; + register int k ; # undef STEP # define STEP(BP) \ - for (k = 0; k <= 39; k++) { \ - dpp[k] = GSM_MULT_R( BP, dp[k - Nc]); \ - e[k] = GSM_SUB( d[k], dpp[k] ); \ - } + for (k = 0 ; k <= 39 ; k++) \ + { dpp [k] = GSM_MULT_R (BP, dp [k - Nc]) ; \ + e [k] = GSM_SUB (d [k], dpp [k]) ; \ + } - switch (bc) { - case 0: STEP( 3277 ); break; - case 1: STEP( 11469 ); break; - case 2: STEP( 21299 ); break; - case 3: STEP( 32767 ); break; - } + switch (bc) + { case 0: STEP (3277) ; break ; + case 1: STEP (11469) ; break ; + case 2: STEP (21299) ; break ; + case 3: STEP (32767) ; break ; + } } void Gsm_Long_Term_Predictor ( /* 4x for 160 samples */ struct gsm_state * S, - word * d, /* [0..39] residual signal IN */ - word * dp, /* [-120..-1] d' IN */ + int16_t * d, /* [0..39] residual signal IN */ + int16_t * dp, /* [-120..-1] d' IN */ - word * e, /* [0..39] OUT */ - word * dpp, /* [0..39] OUT */ - word * Nc, /* correlation lag OUT */ - word * bc /* gain factor OUT */ -) + int16_t * e, /* [0..39] OUT */ + int16_t * dpp, /* [0..39] OUT */ + int16_t * Nc, /* correlation lag OUT */ + int16_t * bc /* gain factor OUT */) { - assert( d ); assert( dp ); assert( e ); - assert( dpp); assert( Nc ); assert( bc ); + assert (d) ; assert (dp) ; assert (e) ; + assert (dpp) ; assert (Nc) ; assert (bc) ; -#if defined(FAST) && defined(USE_FLOAT_MUL) - if (S->fast) -#if defined (LTP_CUT) +#if defined (FAST) && defined (USE_FLOAT_MUL) + if (S->fast) +#if defined (LTP_CUT) if (S->ltp_cut) - Cut_Fast_Calculation_of_the_LTP_parameters(S, - d, dp, bc, Nc); + Cut_Fast_Calculation_of_the_LTP_parameters (S, + d, dp, bc, Nc) ; else #endif /* LTP_CUT */ - Fast_Calculation_of_the_LTP_parameters(d, dp, bc, Nc ); - else + Fast_Calculation_of_the_LTP_parameters (d, dp, bc, Nc) ; + else #endif /* FAST & USE_FLOAT_MUL */ #ifdef LTP_CUT if (S->ltp_cut) - Cut_Calculation_of_the_LTP_parameters(S, d, dp, bc, Nc); + Cut_Calculation_of_the_LTP_parameters (S, d, dp, bc, Nc) ; else #endif - Calculation_of_the_LTP_parameters(d, dp, bc, Nc); + Calculation_of_the_LTP_parameters (d, dp, bc, Nc) ; - Long_term_analysis_filtering( *bc, *Nc, dp, d, dpp, e ); + Long_term_analysis_filtering (*bc, *Nc, dp, d, dpp, e) ; } /* 4.3.2 */ void Gsm_Long_Term_Synthesis_Filtering ( struct gsm_state * S, - word Ncr, - word bcr, - register word * erp, /* [0..39] IN */ - register word * drp /* [-120..-1] IN, [-120..40] OUT */ -) + int16_t Ncr, + int16_t bcr, + register int16_t * erp, /* [0..39] IN */ + register int16_t * drp /* [-120..-1] IN, [-120..40] OUT */) /* * This procedure uses the bcr and Ncr parameter to realize the * long term synthesis filtering. The decoding of bcr needs * table 4.3b. */ { - register int k; - word brp, drpp, Nr; + register int k ; + int16_t brp, drpp, Nr ; /* Check the limits of Nr. */ - Nr = Ncr < 40 || Ncr > 120 ? S->nrp : Ncr; - S->nrp = Nr; - assert(Nr >= 40 && Nr <= 120); + Nr = Ncr < 40 || Ncr > 120 ? S->nrp : Ncr ; + S->nrp = Nr ; + assert (Nr >= 40 && Nr <= 120) ; /* Decoding of the LTP gain bcr */ - brp = gsm_QLB[ bcr ]; + brp = gsm_QLB [bcr] ; - /* Computation of the reconstructed short term residual - * signal drp[0..39] + /* Computation of the reconstructed short term residual + * signal drp [0..39] */ - assert(brp != MIN_WORD); + assert (brp != MIN_WORD) ; - for (k = 0; k <= 39; k++) { - drpp = GSM_MULT_R( brp, drp[ k - Nr ] ); - drp[k] = GSM_ADD( erp[k], drpp ); - } + for (k = 0 ; k <= 39 ; k++) + { drpp = GSM_MULT_R (brp, drp [k - Nr]) ; + drp [k] = GSM_ADD (erp [k], drpp) ; + } /* * Update of the reconstructed short term residual signal - * drp[ -1..-120 ] + * drp [-1..-120] */ - for (k = 0; k <= 119; k++) drp[ -120 + k ] = drp[ -80 + k ]; + for (k = 0 ; k <= 119 ; k++) drp [-120 + k] = drp [-80 + k] ; } diff --git a/lib-src/libsndfile/src/GSM610/lpc.c b/lib-src/libsndfile/src/GSM610/lpc.c index 0e776e363..f492eab43 100644 --- a/lib-src/libsndfile/src/GSM610/lpc.c +++ b/lib-src/libsndfile/src/GSM610/lpc.c @@ -5,6 +5,7 @@ */ #include +#include #include #include "gsm610_priv.h" @@ -17,315 +18,316 @@ static void Autocorrelation ( - word * s, /* [0..159] IN/OUT */ - longword * L_ACF) /* [0..8] OUT */ + int16_t * s, /* [0..159] IN/OUT */ + int32_t * L_ACF) /* [0..8] OUT */ /* - * The goal is to compute the array L_ACF[k]. The signal s[i] must + * The goal is to compute the array L_ACF [k]. The signal s [i] must * be scaled in order to avoid an overflow situation. */ { - register int k, i; + register int k, i ; - word temp, smax, scalauto; + int16_t temp, smax, scalauto ; #ifdef USE_FLOAT_MUL - float float_s[160]; + float float_s [160] ; #endif - /* Dynamic scaling of the array s[0..159] - */ + /* Dynamic scaling of the array s [0..159] */ - /* Search for the maximum. - */ - smax = 0; - for (k = 0; k <= 159; k++) { - temp = GSM_ABS( s[k] ); - if (temp > smax) smax = temp; - } + /* Search for the maximum. */ + smax = 0 ; + for (k = 0 ; k <= 159 ; k++) + { temp = GSM_ABS (s [k]) ; + if (temp > smax) smax = temp ; + } /* Computation of the scaling factor. */ - if (smax == 0) scalauto = 0; - else { - assert(smax > 0); - scalauto = 4 - gsm_norm( (longword)smax << 16 );/* sub(4,..) */ - } + if (smax == 0) + scalauto = 0 ; + else + { assert (smax > 0) ; + scalauto = 4 - gsm_norm ((int32_t) smax << 16) ; /* sub (4,..) */ + } - /* Scaling of the array s[0...159] + /* Scaling of the array s [0...159] */ - if (scalauto > 0) { + if (scalauto > 0) + { # ifdef USE_FLOAT_MUL -# define SCALE(n) \ - case n: for (k = 0; k <= 159; k++) \ - float_s[k] = (float) \ - (s[k] = GSM_MULT_R(s[k], 16384 >> (n-1)));\ - break; -# else -# define SCALE(n) \ - case n: for (k = 0; k <= 159; k++) \ - s[k] = GSM_MULT_R( s[k], 16384 >> (n-1) );\ - break; +# define SCALE(n) \ + case n: for (k = 0 ; k <= 159 ; k++) \ + float_s [k] = (float) \ + (s [k] = GSM_MULT_R (s [k], 16384 >> (n-1))) ;\ + break ; +# else +# define SCALE(n) \ + case n: for (k = 0 ; k <= 159 ; k++) \ + s [k] = GSM_MULT_R (s [k], 16384 >> (n-1)) ;\ + break ; # endif /* USE_FLOAT_MUL */ switch (scalauto) { - SCALE(1) - SCALE(2) - SCALE(3) - SCALE(4) + SCALE (1) + SCALE (2) + SCALE (3) + SCALE (4) } # undef SCALE } # ifdef USE_FLOAT_MUL - else for (k = 0; k <= 159; k++) float_s[k] = (float) s[k]; + else for (k = 0 ; k <= 159 ; k++) float_s [k] = (float) s [k] ; # endif - /* Compute the L_ACF[..]. + /* Compute the L_ACF [..]. */ { # ifdef USE_FLOAT_MUL - register float * sp = float_s; - register float sl = *sp; + register float *sp = float_s ; + register float sl = *sp ; -# define STEP(k) L_ACF[k] += (longword)(sl * sp[ -(k) ]); +# define STEP(k) L_ACF [k] += (int32_t) (sl * sp [- (k)]) ; # else - word * sp = s; - word sl = *sp; + int16_t *sp = s ; + int16_t sl = *sp ; -# define STEP(k) L_ACF[k] += ((longword)sl * sp[ -(k) ]); +# define STEP(k) L_ACF [k] += ((int32_t) sl * sp [- (k)]) ; # endif -# define NEXTI sl = *++sp +# define NEXTI sl = *++sp - for (k = 9; k--; L_ACF[k] = 0) ; + for (k = 9 ; k-- ; L_ACF [k] = 0) ; - STEP (0); - NEXTI; - STEP(0); STEP(1); - NEXTI; - STEP(0); STEP(1); STEP(2); - NEXTI; - STEP(0); STEP(1); STEP(2); STEP(3); - NEXTI; - STEP(0); STEP(1); STEP(2); STEP(3); STEP(4); - NEXTI; - STEP(0); STEP(1); STEP(2); STEP(3); STEP(4); STEP(5); - NEXTI; - STEP(0); STEP(1); STEP(2); STEP(3); STEP(4); STEP(5); STEP(6); - NEXTI; - STEP(0); STEP(1); STEP(2); STEP(3); STEP(4); STEP(5); STEP(6); STEP(7); + STEP (0) ; + NEXTI ; + STEP (0) ; STEP (1) ; + NEXTI ; + STEP (0) ; STEP (1) ; STEP (2) ; + NEXTI ; + STEP (0) ; STEP (1) ; STEP (2) ; STEP (3) ; + NEXTI ; + STEP (0) ; STEP (1) ; STEP (2) ; STEP (3) ; STEP (4) ; + NEXTI ; + STEP (0) ; STEP (1) ; STEP (2) ; STEP (3) ; STEP (4) ; STEP (5) ; + NEXTI ; + STEP (0) ; STEP (1) ; STEP (2) ; STEP (3) ; STEP (4) ; STEP (5) ; STEP (6) ; + NEXTI ; + STEP (0) ; STEP (1) ; STEP (2) ; STEP (3) ; STEP (4) ; STEP (5) ; STEP (6) ; STEP (7) ; - for (i = 8; i <= 159; i++) { + for (i = 8 ; i <= 159 ; i++) + { NEXTI ; - NEXTI; + STEP (0) ; + STEP (1) ; STEP (2) ; STEP (3) ; STEP (4) ; + STEP (5) ; STEP (6) ; STEP (7) ; STEP (8) ; + } - STEP(0); - STEP(1); STEP(2); STEP(3); STEP(4); - STEP(5); STEP(6); STEP(7); STEP(8); - } - - for (k = 9; k--; L_ACF[k] <<= 1) ; + for (k = 9 ; k-- ; ) + L_ACF [k] = SASL_L (L_ACF [k], 1) ; } - /* Rescaling of the array s[0..159] + /* Rescaling of the array s [0..159] */ - if (scalauto > 0) { - assert(scalauto <= 4); - for (k = 160; k--; *s++ <<= scalauto) ; - } + if (scalauto > 0) + { assert (scalauto <= 4) ; + for (k = 160 ; k-- ; s++) + *s = SASL_W (*s, scalauto) ; + } } -#if defined(USE_FLOAT_MUL) && defined(FAST) +#if defined (USE_FLOAT_MUL) && defined (FAST) static void Fast_Autocorrelation ( - word * s, /* [0..159] IN/OUT */ - longword * L_ACF) /* [0..8] OUT */ + int16_t * s, /* [0..159] IN/OUT */ + int32_t * L_ACF) /* [0..8] OUT */ { - register int k, i; - float f_L_ACF[9]; - float scale; + register int k, i ; + float f_L_ACF [9] ; + float scale ; - float s_f[160]; - register float *sf = s_f; + float s_f [160] ; + register float *sf = s_f ; - for (i = 0; i < 160; ++i) sf[i] = s[i]; - for (k = 0; k <= 8; k++) { - register float L_temp2 = 0; - register float *sfl = sf - k; - for (i = k; i < 160; ++i) L_temp2 += sf[i] * sfl[i]; - f_L_ACF[k] = L_temp2; - } - scale = MAX_LONGWORD / f_L_ACF[0]; + for (i = 0 ; i < 160 ; ++i) sf [i] = s [i] ; + for (k = 0 ; k <= 8 ; k++) + { register float L_temp2 = 0 ; + register float *sfl = sf - k ; + for (i = k ; i < 160 ; ++i) L_temp2 += sf [i] * sfl [i] ; + f_L_ACF [k] = L_temp2 ; + } + scale = MAX_LONGWORD / f_L_ACF [0] ; - for (k = 0; k <= 8; k++) { - L_ACF[k] = f_L_ACF[k] * scale; - } + for (k = 0 ; k <= 8 ; k++) + L_ACF [k] = f_L_ACF [k] * scale ; } #endif /* defined (USE_FLOAT_MUL) && defined (FAST) */ /* 4.2.5 */ static void Reflection_coefficients ( - longword * L_ACF, /* 0...8 IN */ - register word * r /* 0...7 OUT */ + int32_t * L_ACF, /* 0...8 IN */ + register int16_t * r /* 0...7 OUT */ ) { - register int i, m, n; - register word temp; - word ACF[9]; /* 0..8 */ - word P[ 9]; /* 0..8 */ - word K[ 9]; /* 2..8 */ + register int i, m, n ; + register int16_t temp ; + int16_t ACF [9] ; /* 0..8 */ + int16_t P [9] ; /* 0..8 */ + int16_t K [9] ; /* 2..8 */ /* Schur recursion with 16 bits arithmetic. */ - if (L_ACF[0] == 0) { - for (i = 8; i--; *r++ = 0) ; - return; - } + if (L_ACF [0] == 0) + { memset (r, 0, 8 * sizeof (r [0])) ; + return ; + } - assert( L_ACF[0] != 0 ); - temp = gsm_norm( L_ACF[0] ); + assert (L_ACF [0] != 0) ; + temp = gsm_norm (L_ACF [0]) ; - assert(temp >= 0 && temp < 32); + assert (temp >= 0 && temp < 32) ; /* ? overflow ? */ - for (i = 0; i <= 8; i++) ACF[i] = SASR_L( L_ACF[i] << temp, 16 ); + for (i = 0 ; i <= 8 ; i++) ACF [i] = SASR_L (SASL_L (L_ACF [i], temp), 16) ; - /* Initialize array P[..] and K[..] for the recursion. + /* Initialize array P [..] and K [..] for the recursion. */ - for (i = 1; i <= 7; i++) K[ i ] = ACF[ i ]; - for (i = 0; i <= 8; i++) P[ i ] = ACF[ i ]; + for (i = 1 ; i <= 7 ; i++) K [i] = ACF [i] ; + for (i = 0 ; i <= 8 ; i++) P [i] = ACF [i] ; /* Compute reflection coefficients */ - for (n = 1; n <= 8; n++, r++) { + for (n = 1 ; n <= 8 ; n++, r++) + { temp = P [1] ; + temp = GSM_ABS (temp) ; + if (P [0] < temp) + { for (i = n ; i <= 8 ; i++) *r++ = 0 ; + return ; + } - temp = P[1]; - temp = GSM_ABS(temp); - if (P[0] < temp) { - for (i = n; i <= 8; i++) *r++ = 0; - return; - } + *r = gsm_div (temp, P [0]) ; - *r = gsm_div( temp, P[0] ); - - assert(*r >= 0); - if (P[1] > 0) *r = -*r; /* r[n] = sub(0, r[n]) */ - assert (*r != MIN_WORD); - if (n == 8) return; + assert (*r >= 0) ; + if (P [1] > 0) *r = -*r ; /* r [n] = sub (0, r [n]) */ + assert (*r != MIN_WORD) ; + if (n == 8) return ; /* Schur recursion */ - temp = GSM_MULT_R( P[1], *r ); - P[0] = GSM_ADD( P[0], temp ); + temp = GSM_MULT_R (P [1], *r) ; + P [0] = GSM_ADD (P [0], temp) ; - for (m = 1; m <= 8 - n; m++) { - temp = GSM_MULT_R( K[ m ], *r ); - P[m] = GSM_ADD( P[ m+1 ], temp ); + for (m = 1 ; m <= 8 - n ; m++) + { temp = GSM_MULT_R (K [m], *r) ; + P [m] = GSM_ADD (P [m + 1], temp) ; - temp = GSM_MULT_R( P[ m+1 ], *r ); - K[m] = GSM_ADD( K[ m ], temp ); + temp = GSM_MULT_R (P [m + 1], *r) ; + K [m] = GSM_ADD (K [m], temp) ; + } } - } } /* 4.2.6 */ static void Transformation_to_Log_Area_Ratios ( - register word * r /* 0..7 IN/OUT */ + register int16_t * r /* 0..7 IN/OUT */ ) /* - * The following scaling for r[..] and LAR[..] has been used: + * The following scaling for r [..] and LAR [..] has been used: * - * r[..] = integer( real_r[..]*32768. ); -1 <= real_r < 1. - * LAR[..] = integer( real_LAR[..] * 16384 ); + * r [..] = integer (real_r [..]*32768.) ; -1 <= real_r < 1. + * LAR [..] = integer (real_LAR [..] * 16384) ; * with -1.625 <= real_LAR <= 1.625 */ { - register word temp; - register int i; + register int16_t temp ; + register int i ; - /* Computation of the LAR[0..7] from the r[0..7] + /* Computation of the LAR [0..7] from the r [0..7] */ - for (i = 1; i <= 8; i++, r++) { + for (i = 1 ; i <= 8 ; i++, r++) + { temp = *r ; + temp = GSM_ABS (temp) ; + assert (temp >= 0) ; - temp = *r; - temp = GSM_ABS(temp); - assert(temp >= 0); + if (temp < 22118) + { temp >>= 1 ; + } + else if (temp < 31130) + { assert (temp >= 11059) ; + temp -= 11059 ; + } + else + { assert (temp >= 26112) ; + temp -= 26112 ; + temp <<= 2 ; + } - if (temp < 22118) { - temp >>= 1; - } else if (temp < 31130) { - assert( temp >= 11059 ); - temp -= 11059; - } else { - assert( temp >= 26112 ); - temp -= 26112; - temp <<= 2; - } - - *r = *r < 0 ? -temp : temp; - assert( *r != MIN_WORD ); + *r = *r < 0 ? -temp : temp ; + assert (*r != MIN_WORD) ; } } /* 4.2.7 */ static void Quantization_and_coding ( - register word * LAR /* [0..7] IN/OUT */ + register int16_t * LAR /* [0..7] IN/OUT */ ) { - register word temp; + register int16_t temp ; - /* This procedure needs four tables; the following equations + /* This procedure needs four tables ; the following equations * give the optimum scaling for the constants: - * - * A[0..7] = integer( real_A[0..7] * 1024 ) - * B[0..7] = integer( real_B[0..7] * 512 ) - * MAC[0..7] = maximum of the LARc[0..7] - * MIC[0..7] = minimum of the LARc[0..7] + * + * A [0..7] = integer (real_A [0..7] * 1024) + * B [0..7] = integer (real_B [0..7] * 512) + * MAC [0..7] = maximum of the LARc [0..7] + * MIC [0..7] = minimum of the LARc [0..7] */ # undef STEP -# define STEP( A, B, MAC, MIC ) \ - temp = GSM_MULT( A, *LAR ); \ - temp = GSM_ADD( temp, B ); \ - temp = GSM_ADD( temp, 256 ); \ - temp = SASR_W( temp, 9 ); \ - *LAR = temp>MAC ? MAC - MIC : (temp MAC ? MAC - MIC : (temp < MIC ? 0 : temp - MIC) ; \ + LAR++ ; - STEP( 20480, 0, 31, -32 ); - STEP( 20480, 0, 31, -32 ); - STEP( 20480, 2048, 15, -16 ); - STEP( 20480, -2560, 15, -16 ); + STEP (20480, 0, 31, -32) ; + STEP (20480, 0, 31, -32) ; + STEP (20480, 2048, 15, -16) ; + STEP (20480, -2560, 15, -16) ; - STEP( 13964, 94, 7, -8 ); - STEP( 15360, -1792, 7, -8 ); - STEP( 8534, -341, 3, -4 ); - STEP( 9036, -1144, 3, -4 ); + STEP (13964, 94, 7, -8) ; + STEP (15360, -1792, 7, -8) ; + STEP (8534, -341, 3, -4) ; + STEP (9036, -1144, 3, -4) ; # undef STEP } void Gsm_LPC_Analysis ( struct gsm_state *S, - word * s, /* 0..159 signals IN/OUT */ - word * LARc) /* 0..7 LARc's OUT */ + int16_t * s, /* 0..159 signals IN/OUT */ + int16_t *LARc) /* 0..7 LARc's OUT */ { - longword L_ACF[9]; + int32_t L_ACF [9] ; -#if defined(USE_FLOAT_MUL) && defined(FAST) - if (S->fast) Fast_Autocorrelation (s, L_ACF ); +#if defined (USE_FLOAT_MUL) && defined (FAST) + if (S->fast) + Fast_Autocorrelation (s, L_ACF) ; else #endif - Autocorrelation (s, L_ACF ); - Reflection_coefficients (L_ACF, LARc ); - Transformation_to_Log_Area_Ratios (LARc); - Quantization_and_coding (LARc); + Autocorrelation (s, L_ACF ) ; + Reflection_coefficients (L_ACF, LARc ) ; + Transformation_to_Log_Area_Ratios (LARc) ; + Quantization_and_coding (LARc) ; } diff --git a/lib-src/libsndfile/src/GSM610/preprocess.c b/lib-src/libsndfile/src/GSM610/preprocess.c index 723e226a5..82f4fe296 100644 --- a/lib-src/libsndfile/src/GSM610/preprocess.c +++ b/lib-src/libsndfile/src/GSM610/preprocess.c @@ -10,7 +10,7 @@ #include "gsm610_priv.h" /* 4.2.0 .. 4.2.3 PREPROCESSING SECTION - * + * * After A-law to linear conversion (or directly from the * Ato D converter) the following scaling is assumed for * input to the RPE-LTP algorithm: @@ -21,85 +21,81 @@ * Where S is the sign bit, v a valid bit, and * a "don't care" bit. * The original signal is called sop[..] * - * out: 0.1................... 12 + * out: 0.1................... 12 * S.S.v.v.v.v.v.v.v.v.v.v.v.v.0.0 */ void Gsm_Preprocess ( struct gsm_state * S, - word * s, - word * so ) /* [0..159] IN/OUT */ + int16_t * s, + int16_t * so) /* [0..159] IN/OUT */ { - word z1 = S->z1; - longword L_z2 = S->L_z2; - word mp = S->mp; + int16_t z1 = S->z1 ; + int32_t L_z2 = S->L_z2 ; + int16_t mp = S->mp ; - word s1; - longword L_s2; + int16_t s1 ; + int32_t L_s2 ; - longword L_temp; + int32_t L_temp ; - word msp, lsp; - word SO; + int16_t msp, lsp ; + int16_t SO ; - register int k = 160; + register int k = 160 ; - while (k--) { + while (k--) + { - /* 4.2.1 Downscaling of the input signal - */ - SO = SASR_W( *s, 3 ) << 2; - s++; + /* 4.2.1 Downscaling of the input signal */ + SO = arith_shift_left (SASR_W (*s, 3), 2) ; + s++ ; - assert (SO >= -0x4000); /* downscaled by */ - assert (SO <= 0x3FFC); /* previous routine. */ + assert (SO >= -0x4000) ; /* downscaled by */ + assert (SO <= 0x3FFC) ; /* previous routine. */ - /* 4.2.2 Offset compensation - * - * This part implements a high-pass filter and requires extended - * arithmetic precision for the recursive part of this filter. - * The input of this procedure is the array so[0...159] and the - * output the array sof[ 0...159 ]. - */ - /* Compute the non-recursive part + /* 4.2.2 Offset compensation + * + * This part implements a high-pass filter and requires extended + * arithmetic precision for the recursive part of this filter. + * The input of this procedure is the array so[0...159] and the + * output the array sof[ 0...159 ]. */ - s1 = SO - z1; /* s1 = gsm_sub( *so, z1 ); */ - z1 = SO; + /* Compute the non-recursive part */ - assert(s1 != MIN_WORD); + s1 = SO - z1 ; /* s1 = gsm_sub (*so, z1) ; */ + z1 = SO ; - /* Compute the recursive part - */ - L_s2 = s1; - L_s2 <<= 15; + assert (s1 != MIN_WORD) ; - /* Execution of a 31 bv 16 bits multiplication - */ + /* Compute the recursive part */ + L_s2 = s1 ; + L_s2 = arith_shift_left (L_s2, 15) ; - msp = SASR_L( L_z2, 15 ); - lsp = L_z2-((longword)msp<<15); /* gsm_L_sub(L_z2,(msp<<15)); */ + /* Execution of a 31 bv 16 bits multiplication */ - L_s2 += GSM_MULT_R( lsp, 32735 ); - L_temp = (longword)msp * 32735; /* GSM_L_MULT(msp,32735) >> 1;*/ - L_z2 = GSM_L_ADD( L_temp, L_s2 ); + msp = SASR_L (L_z2, 15) ; + lsp = L_z2 - arith_shift_left ((int32_t) msp, 15) ; /* gsm_L_sub (L_z2,(msp<<15)) ; */ - /* Compute sof[k] with rounding - */ - L_temp = GSM_L_ADD( L_z2, 16384 ); + L_s2 += GSM_MULT_R (lsp, 32735) ; + L_temp = (int32_t) msp * 32735 ; /* GSM_L_MULT (msp,32735) >> 1 ;*/ + L_z2 = GSM_L_ADD (L_temp, L_s2) ; - /* 4.2.3 Preemphasis - */ + /* Compute sof[k] with rounding */ + L_temp = GSM_L_ADD (L_z2, 16384) ; - msp = GSM_MULT_R( mp, -28180 ); - mp = SASR_L( L_temp, 15 ); - *so++ = GSM_ADD( mp, msp ); - } + /* 4.2.3 Preemphasis */ - S->z1 = z1; - S->L_z2 = L_z2; - S->mp = mp; + msp = GSM_MULT_R (mp, -28180) ; + mp = SASR_L (L_temp, 15) ; + *so++ = GSM_ADD (mp, msp) ; + } + + S->z1 = z1 ; + S->L_z2 = L_z2 ; + S->mp = mp ; } diff --git a/lib-src/libsndfile/src/GSM610/rpe.c b/lib-src/libsndfile/src/GSM610/rpe.c index d8f931e21..d9e90f29c 100644 --- a/lib-src/libsndfile/src/GSM610/rpe.c +++ b/lib-src/libsndfile/src/GSM610/rpe.c @@ -15,372 +15,363 @@ /* 4.2.13 */ static void Weighting_filter ( - register word * e, /* signal [-5..0.39.44] IN */ - word * x /* signal [0..39] OUT */ + register int16_t * e, /* signal [-5..0.39.44] IN */ + int16_t * x /* signal [0..39] OUT */ ) /* * The coefficients of the weighting filter are stored in a table * (see table 4.4). The following scaling is used: * - * H[0..10] = integer( real_H[ 0..10] * 8192 ); + * H[0..10] = integer(real_H [0..10] * 8192) ; */ { - /* word wt[ 50 ]; */ + /* int16_t wt [50] ; */ - register longword L_result; + register int32_t L_result ; register int k /* , i */ ; /* Initialization of a temporary working array wt[0...49] */ - /* for (k = 0; k <= 4; k++) wt[k] = 0; - * for (k = 5; k <= 44; k++) wt[k] = *e++; - * for (k = 45; k <= 49; k++) wt[k] = 0; + /* for (k = 0 ; k <= 4 ; k++) wt[k] = 0 ; + * for (k = 5 ; k <= 44 ; k++) wt[k] = *e++; + * for (k = 45 ; k <= 49 ; k++) wt[k] = 0 ; * * (e[-5..-1] and e[40..44] are allocated by the caller, * are initially zero and are not written anywhere.) */ - e -= 5; + e -= 5 ; /* Compute the signal x[0..39] - */ - for (k = 0; k <= 39; k++) { + */ + for (k = 0 ; k <= 39 ; k++) + { L_result = 8192 >> 1 ; - L_result = 8192 >> 1; - - /* for (i = 0; i <= 10; i++) { - * L_temp = GSM_L_MULT( wt[k+i], gsm_H[i] ); - * L_result = GSM_L_ADD( L_result, L_temp ); + /* for (i = 0 ; i <= 10 ; i++) { + * L_temp = GSM_L_MULT(wt[k+i], gsm_H[i]) ; + * L_result = GSM_L_ADD(L_result, L_temp) ; * } */ #undef STEP -#define STEP( i, H ) (e[ k + i ] * (longword)H) +#define STEP(i, H) (e [k + i] * (int32_t) H) /* Every one of these multiplications is done twice -- - * but I don't see an elegant way to optimize this. + * but I don't see an elegant way to optimize this. * Do you? */ #ifdef STUPID_COMPILER - L_result += STEP( 0, -134 ) ; - L_result += STEP( 1, -374 ) ; - /* + STEP( 2, 0 ) */ - L_result += STEP( 3, 2054 ) ; - L_result += STEP( 4, 5741 ) ; - L_result += STEP( 5, 8192 ) ; - L_result += STEP( 6, 5741 ) ; - L_result += STEP( 7, 2054 ) ; - /* + STEP( 8, 0 ) */ - L_result += STEP( 9, -374 ) ; - L_result += STEP( 10, -134 ) ; + L_result += STEP (0, -134) ; + L_result += STEP (1, -374) ; + /* + STEP (2, 0) */ + L_result += STEP (3, 2054) ; + L_result += STEP (4, 5741) ; + L_result += STEP (5, 8192) ; + L_result += STEP (6, 5741) ; + L_result += STEP (7, 2054) ; + /* + STEP (8, 0) */ + L_result += STEP (9, -374) ; + L_result += STEP (10, -134) ; #else - L_result += - STEP( 0, -134 ) - + STEP( 1, -374 ) - /* + STEP( 2, 0 ) */ - + STEP( 3, 2054 ) - + STEP( 4, 5741 ) - + STEP( 5, 8192 ) - + STEP( 6, 5741 ) - + STEP( 7, 2054 ) - /* + STEP( 8, 0 ) */ - + STEP( 9, -374 ) - + STEP(10, -134 ) - ; + L_result += STEP (0, -134) + + STEP (1, -374) + /* + STEP (2, 0) */ + + STEP (3, 2054) + + STEP (4, 5741) + + STEP (5, 8192) + + STEP (6, 5741) + + STEP (7, 2054) + /* + STEP (8, 0) */ + + STEP (9, -374) + + STEP (10, -134) ; #endif - /* L_result = GSM_L_ADD( L_result, L_result ); (* scaling(x2) *) - * L_result = GSM_L_ADD( L_result, L_result ); (* scaling(x4) *) + /* L_result = GSM_L_ADD(L_result, L_result) ; (* scaling(x2) *) + * L_result = GSM_L_ADD(L_result, L_result) ; (* scaling(x4) *) * - * x[k] = SASR( L_result, 16 ); + * x[k] = SASR(L_result, 16) ; */ /* 2 adds vs. >>16 => 14, minus one shift to compensate for * those we lost when replacing L_MULT by '*'. */ - L_result = SASR_L( L_result, 13 ); - x[k] = ( L_result < MIN_WORD ? MIN_WORD - : (L_result > MAX_WORD ? MAX_WORD : L_result )); + L_result = SASR_L (L_result, 13) ; + x [k] = (L_result < MIN_WORD ? MIN_WORD + : (L_result > MAX_WORD ? MAX_WORD : L_result)) ; } } /* 4.2.14 */ static void RPE_grid_selection ( - word * x, /* [0..39] IN */ - word * xM, /* [0..12] OUT */ - word * Mc_out /* OUT */ + int16_t * x, /* [0..39] IN */ + int16_t * xM, /* [0..12] OUT */ + int16_t * Mc_out /* OUT */ ) /* * The signal x[0..39] is used to select the RPE grid which is * represented by Mc. */ { - /* register word temp1; */ - register int /* m, */ i; - register longword L_result, L_temp; - longword EM; /* xxx should be L_EM? */ - word Mc; + register int i ; + register int32_t L_result, L_temp ; + int32_t EM ; /* xxx should be L_EM? */ + int16_t Mc ; - longword L_common_0_3; + int32_t L_common_0_3 ; - EM = 0; - Mc = 0; + EM = 0 ; + Mc = 0 ; - /* for (m = 0; m <= 3; m++) { - * L_result = 0; + /* for (m = 0 ; m <= 3 ; m++) { + * L_result = 0 ; * * - * for (i = 0; i <= 12; i++) { + * for (i = 0 ; i <= 12 ; i++) { * - * temp1 = SASR_W( x[m + 3*i], 2 ); + * temp1 = SASR_W (x[m + 3*i], 2) ; * - * assert(temp1 != MIN_WORD); + * assert (temp1 != MIN_WORD) ; * - * L_temp = GSM_L_MULT( temp1, temp1 ); - * L_result = GSM_L_ADD( L_temp, L_result ); + * L_temp = GSM_L_MULT(temp1, temp1) ; + * L_result = GSM_L_ADD(L_temp, L_result) ; * } - * + * * if (L_result > EM) { - * Mc = m; - * EM = L_result; + * Mc = m ; + * EM = L_result ; * } * } */ #undef STEP -#define STEP( m, i ) L_temp = SASR_W( x[m + 3 * i], 2 ); \ - L_result += L_temp * L_temp; +#define STEP(m, i) L_temp = SASR_W (x [m + 3 * i], 2) ; \ + L_result += L_temp * L_temp ; /* common part of 0 and 3 */ - L_result = 0; - STEP( 0, 1 ); STEP( 0, 2 ); STEP( 0, 3 ); STEP( 0, 4 ); - STEP( 0, 5 ); STEP( 0, 6 ); STEP( 0, 7 ); STEP( 0, 8 ); - STEP( 0, 9 ); STEP( 0, 10); STEP( 0, 11); STEP( 0, 12); - L_common_0_3 = L_result; + L_result = 0 ; + STEP (0, 1) ; STEP (0, 2) ; STEP (0, 3) ; STEP (0, 4) ; + STEP (0, 5) ; STEP (0, 6) ; STEP (0, 7) ; STEP (0, 8) ; + STEP (0, 9) ; STEP (0, 10) ; STEP (0, 11) ; STEP (0, 12) ; + L_common_0_3 = L_result ; /* i = 0 */ - STEP( 0, 0 ); - L_result <<= 1; /* implicit in L_MULT */ - EM = L_result; + STEP (0, 0) ; + L_result <<= 1 ; /* implicit in L_MULT */ + EM = L_result ; /* i = 1 */ - L_result = 0; - STEP( 1, 0 ); - STEP( 1, 1 ); STEP( 1, 2 ); STEP( 1, 3 ); STEP( 1, 4 ); - STEP( 1, 5 ); STEP( 1, 6 ); STEP( 1, 7 ); STEP( 1, 8 ); - STEP( 1, 9 ); STEP( 1, 10); STEP( 1, 11); STEP( 1, 12); - L_result <<= 1; - if (L_result > EM) { - Mc = 1; - EM = L_result; - } + L_result = 0 ; + STEP (1, 0) ; + STEP (1, 1) ; STEP (1, 2) ; STEP (1, 3) ; STEP (1, 4) ; + STEP (1, 5) ; STEP (1, 6) ; STEP (1, 7) ; STEP (1, 8) ; + STEP (1, 9) ; STEP (1, 10) ; STEP (1, 11) ; STEP (1, 12) ; + L_result <<= 1 ; + if (L_result > EM) + { Mc = 1 ; + EM = L_result ; + } /* i = 2 */ - L_result = 0; - STEP( 2, 0 ); - STEP( 2, 1 ); STEP( 2, 2 ); STEP( 2, 3 ); STEP( 2, 4 ); - STEP( 2, 5 ); STEP( 2, 6 ); STEP( 2, 7 ); STEP( 2, 8 ); - STEP( 2, 9 ); STEP( 2, 10); STEP( 2, 11); STEP( 2, 12); - L_result <<= 1; - if (L_result > EM) { - Mc = 2; - EM = L_result; - } + L_result = 0 ; + STEP (2, 0) ; + STEP (2, 1) ; STEP (2, 2) ; STEP (2, 3) ; STEP (2, 4) ; + STEP (2, 5) ; STEP (2, 6) ; STEP (2, 7) ; STEP (2, 8) ; + STEP (2, 9) ; STEP (2, 10) ; STEP (2, 11) ; STEP (2, 12) ; + L_result <<= 1 ; + if (L_result > EM) + { Mc = 2 ; + EM = L_result ; + } /* i = 3 */ - L_result = L_common_0_3; - STEP( 3, 12 ); - L_result <<= 1; - if (L_result > EM) { - Mc = 3; - EM = L_result; - } + L_result = L_common_0_3 ; + STEP (3, 12) ; + L_result <<= 1 ; + if (L_result > EM) + { Mc = 3 ; + EM = L_result ; + } - /**/ - - /* Down-sampling by a factor 3 to get the selected xM[0..12] + /* Down-sampling by a factor 3 to get the selected xM [0..12] * RPE sequence. */ - for (i = 0; i <= 12; i ++) xM[i] = x[Mc + 3*i]; - *Mc_out = Mc; + for (i = 0 ; i <= 12 ; i ++) xM [i] = x [Mc + 3 * i] ; + *Mc_out = Mc ; } /* 4.12.15 */ static void APCM_quantization_xmaxc_to_exp_mant ( - word xmaxc, /* IN */ - word * expon_out, /* OUT */ - word * mant_out ) /* OUT */ + int16_t xmaxc, /* IN */ + int16_t * expon_out, /* OUT */ + int16_t * mant_out) /* OUT */ { - word expon, mant; + int16_t expon, mant ; /* Compute expononent and mantissa of the decoded version of xmaxc */ - expon = 0; - if (xmaxc > 15) expon = SASR_W(xmaxc, 3) - 1; - mant = xmaxc - (expon << 3); + expon = 0 ; + if (xmaxc > 15) expon = SASR_W (xmaxc, 3) - 1 ; + mant = xmaxc - (expon << 3) ; - if (mant == 0) { - expon = -4; - mant = 7; - } - else { - while (mant <= 7) { - mant = mant << 1 | 1; - expon--; + if (mant == 0) + { expon = -4 ; + mant = 7 ; + } + else + { while (mant <= 7) + { mant = mant << 1 | 1 ; + expon-- ; + } + mant -= 8 ; } - mant -= 8; - } - assert( expon >= -4 && expon <= 6 ); - assert( mant >= 0 && mant <= 7 ); + assert (expon >= -4 && expon <= 6) ; + assert (mant >= 0 && mant <= 7) ; - *expon_out = expon; - *mant_out = mant; + *expon_out = expon ; + *mant_out = mant ; } static void APCM_quantization ( - word * xM, /* [0..12] IN */ - word * xMc, /* [0..12] OUT */ - word * mant_out, /* OUT */ - word * expon_out, /* OUT */ - word * xmaxc_out /* OUT */ + int16_t * xM, /* [0..12] IN */ + int16_t * xMc, /* [0..12] OUT */ + int16_t * mant_out, /* OUT */ + int16_t * expon_out, /* OUT */ + int16_t * xmaxc_out /* OUT */ ) { - int i, itest; + int i, itest ; - word xmax, xmaxc, temp, temp1, temp2; - word expon, mant; + int16_t xmax, xmaxc, temp, temp1, temp2 ; + int16_t expon, mant ; - /* Find the maximum absolute value xmax of xM[0..12]. + /* Find the maximum absolute value xmax of xM [0..12]. */ - xmax = 0; - for (i = 0; i <= 12; i++) { - temp = xM[i]; - temp = GSM_ABS(temp); - if (temp > xmax) xmax = temp; - } + xmax = 0 ; + for (i = 0 ; i <= 12 ; i++) + { temp = xM [i] ; + temp = GSM_ABS (temp) ; + if (temp > xmax) xmax = temp ; + } /* Qantizing and coding of xmax to get xmaxc. */ - expon = 0; - temp = SASR_W( xmax, 9 ); - itest = 0; + expon = 0 ; + temp = SASR_W (xmax, 9) ; + itest = 0 ; - for (i = 0; i <= 5; i++) { + for (i = 0 ; i <= 5 ; i++) + { itest |= (temp <= 0) ; + temp = SASR_W (temp, 1) ; - itest |= (temp <= 0); - temp = SASR_W( temp, 1 ); + assert (expon <= 5) ; + if (itest == 0) expon++ ; /* expon = add (expon, 1) */ + } - assert(expon <= 5); - if (itest == 0) expon++; /* expon = add (expon, 1) */ - } + assert (expon <= 6 && expon >= 0) ; + temp = expon + 5 ; - assert(expon <= 6 && expon >= 0); - temp = expon + 5; + assert (temp <= 11 && temp >= 0) ; + xmaxc = gsm_add (SASR_W (xmax, temp), (int16_t) (expon << 3)) ; - assert(temp <= 11 && temp >= 0); - xmaxc = gsm_add( SASR_W(xmax, temp), (word) (expon << 3) ); - - /* Quantizing and coding of the xM[0..12] RPE sequence - * to get the xMc[0..12] + /* Quantizing and coding of the xM [0..12] RPE sequence + * to get the xMc [0..12] */ - APCM_quantization_xmaxc_to_exp_mant( xmaxc, &expon, &mant ); + APCM_quantization_xmaxc_to_exp_mant (xmaxc, &expon, &mant) ; /* This computation uses the fact that the decoded version of xmaxc * can be calculated by using the expononent and the mantissa part of * xmaxc (logarithmic table). * So, this method avoids any division and uses only a scaling - * of the RPE samples by a function of the expononent. A direct + * of the RPE samples by a function of the expononent. A direct * multiplication by the inverse of the mantissa (NRFAC[0..7] - * found in table 4.5) gives the 3 bit coded version xMc[0..12] + * found in table 4.5) gives the 3 bit coded version xMc [0..12] * of the RPE samples. */ - /* Direct computation of xMc[0..12] using table 4.5 + /* Direct computation of xMc [0..12] using table 4.5 */ - assert( expon <= 4096 && expon >= -4096); - assert( mant >= 0 && mant <= 7 ); + assert (expon <= 4096 && expon >= -4096) ; + assert (mant >= 0 && mant <= 7) ; - temp1 = 6 - expon; /* normalization by the expononent */ - temp2 = gsm_NRFAC[ mant ]; /* inverse mantissa */ + temp1 = 6 - expon ; /* normalization by the expononent */ + temp2 = gsm_NRFAC [mant] ; /* inverse mantissa */ - for (i = 0; i <= 12; i++) { + for (i = 0 ; i <= 12 ; i++) + { assert (temp1 >= 0 && temp1 < 16) ; - assert(temp1 >= 0 && temp1 < 16); - - temp = xM[i] << temp1; - temp = GSM_MULT( temp, temp2 ); - temp = SASR_W(temp, 12); - xMc[i] = temp + 4; /* see note below */ + temp = arith_shift_left (xM [i], temp1) ; + temp = GSM_MULT (temp, temp2) ; + temp = SASR_W (temp, 12) ; + xMc [i] = temp + 4 ; /* see note below */ } - /* NOTE: This equation is used to make all the xMc[i] positive. + /* NOTE: This equation is used to make all the xMc [i] positive. */ - *mant_out = mant; - *expon_out = expon; - *xmaxc_out = xmaxc; + *mant_out = mant ; + *expon_out = expon ; + *xmaxc_out = xmaxc ; } /* 4.2.16 */ static void APCM_inverse_quantization ( - register word * xMc, /* [0..12] IN */ - word mant, - word expon, - register word * xMp) /* [0..12] OUT */ -/* - * This part is for decoding the RPE sequence of coded xMc[0..12] + register int16_t * xMc, /* [0..12] IN */ + int16_t mant, + int16_t expon, + register int16_t * xMp) /* [0..12] OUT */ +/* + * This part is for decoding the RPE sequence of coded xMc [0..12] * samples to obtain the xMp[0..12] array. Table 4.6 is used to get * the mantissa of xmaxc (FAC[0..7]). */ { - int i; - word temp, temp1, temp2, temp3; + int i ; + int16_t temp, temp1, temp2, temp3 ; - assert( mant >= 0 && mant <= 7 ); + assert (mant >= 0 && mant <= 7) ; - temp1 = gsm_FAC[ mant ]; /* see 4.2-15 for mant */ - temp2 = gsm_sub( 6, expon ); /* see 4.2-15 for exp */ - temp3 = gsm_asl( 1, gsm_sub( temp2, 1 )); + temp1 = gsm_FAC [mant] ; /* see 4.2-15 for mant */ + temp2 = gsm_sub (6, expon) ; /* see 4.2-15 for exp */ + temp3 = gsm_asl (1, gsm_sub (temp2, 1)) ; - for (i = 13; i--;) { + for (i = 13 ; i-- ;) + { assert (*xMc <= 7 && *xMc >= 0) ; /* 3 bit unsigned */ - assert( *xMc <= 7 && *xMc >= 0 ); /* 3 bit unsigned */ + /* temp = gsm_sub (*xMc++ << 1, 7) ; */ + temp = (*xMc++ << 1) - 7 ; /* restore sign */ + assert (temp <= 7 && temp >= -7) ; /* 4 bit signed */ - /* temp = gsm_sub( *xMc++ << 1, 7 ); */ - temp = (*xMc++ << 1) - 7; /* restore sign */ - assert( temp <= 7 && temp >= -7 ); /* 4 bit signed */ - - temp <<= 12; /* 16 bit signed */ - temp = GSM_MULT_R( temp1, temp ); - temp = GSM_ADD( temp, temp3 ); - *xMp++ = gsm_asr( temp, temp2 ); + temp = arith_shift_left (temp, 12) ; /* 16 bit signed */ + temp = GSM_MULT_R (temp1, temp) ; + temp = GSM_ADD (temp, temp3) ; + *xMp++ = gsm_asr (temp, temp2) ; } } /* 4.2.17 */ static void RPE_grid_positioning ( - word Mc, /* grid position IN */ - register word * xMp, /* [0..12] IN */ - register word * ep /* [0..39] OUT */ + int16_t Mc, /* grid position IN */ + register int16_t * xMp, /* [0..12] IN */ + register int16_t * ep /* [0..39] OUT */ ) /* * This procedure computes the reconstructed long term residual signal @@ -390,28 +381,22 @@ static void RPE_grid_positioning ( * values. */ { - int i = 13; + int i = 13 ; - assert(0 <= Mc && Mc <= 3); + assert (0 <= Mc && Mc <= 3) ; - switch (Mc) { - case 3: *ep++ = 0; - case 2: do { - *ep++ = 0; - case 1: *ep++ = 0; - case 0: *ep++ = *xMp++; - } while (--i); - } - while (++Mc < 4) *ep++ = 0; - - /* - - int i, k; - for (k = 0; k <= 39; k++) ep[k] = 0; - for (i = 0; i <= 12; i++) { - ep[ Mc + (3*i) ] = xMp[i]; + switch (Mc) + { case 3: *ep++ = 0 ; + /* Falls through. */ + case 2: do + { *ep++ = 0 ; + /* Falls through. */ + case 1: *ep++ = 0 ; + /* Falls through. */ + case 0: *ep++ = *xMp++ ; + } while (--i) ; } - */ + while (++Mc < 4) *ep++ = 0 ; } /* 4.2.18 */ @@ -419,62 +404,57 @@ static void RPE_grid_positioning ( /* This procedure adds the reconstructed long term residual signal * ep[0..39] to the estimated signal dpp[0..39] from the long term * analysis filter to compute the reconstructed short term residual - * signal dp[-40..-1]; also the reconstructed short term residual + * signal dp[-40..-1] ; also the reconstructed short term residual * array dp[-120..-41] is updated. */ #if 0 /* Has been inlined in code.c */ void Gsm_Update_of_reconstructed_short_time_residual_signal ( - word * dpp, /* [0...39] IN */ - word * ep, /* [0...39] IN */ - word * dp) /* [-120...-1] IN/OUT */ + int16_t * dpp, /* [0...39] IN */ + int16_t * ep, /* [0...39] IN */ + int16_t * dp) /* [-120...-1] IN/OUT */ { - int k; + int k ; - for (k = 0; k <= 79; k++) - dp[ -120 + k ] = dp[ -80 + k ]; + for (k = 0 ; k <= 79 ; k++) + dp [-120 + k] = dp [-80 + k] ; - for (k = 0; k <= 39; k++) - dp[ -40 + k ] = gsm_add( ep[k], dpp[k] ); + for (k = 0 ; k <= 39 ; k++) + dp [-40 + k] = gsm_add (ep [k], dpp [k]) ; } #endif /* Has been inlined in code.c */ void Gsm_RPE_Encoding ( - /*-struct gsm_state * S,-*/ - - word * e, /* -5..-1][0..39][40..44 IN/OUT */ - word * xmaxc, /* OUT */ - word * Mc, /* OUT */ - word * xMc) /* [0..12] OUT */ + int16_t * e, /* -5..-1][0..39][40..44 IN/OUT */ + int16_t * xmaxc, /* OUT */ + int16_t * Mc, /* OUT */ + int16_t * xMc) /* [0..12] OUT */ { - word x[40]; - word xM[13], xMp[13]; - word mant, expon; + int16_t x [40] ; + int16_t xM [13], xMp [13] ; + int16_t mant, expon ; - Weighting_filter(e, x); - RPE_grid_selection(x, xM, Mc); + Weighting_filter (e, x) ; + RPE_grid_selection (x, xM, Mc) ; - APCM_quantization( xM, xMc, &mant, &expon, xmaxc); - APCM_inverse_quantization( xMc, mant, expon, xMp); + APCM_quantization (xM, xMc, &mant, &expon, xmaxc) ; + APCM_inverse_quantization (xMc, mant, expon, xMp) ; - RPE_grid_positioning( *Mc, xMp, e ); + RPE_grid_positioning (*Mc, xMp, e) ; } void Gsm_RPE_Decoding ( - /*-struct gsm_state * S,-*/ - - word xmaxcr, - word Mcr, - word * xMcr, /* [0..12], 3 bits IN */ - word * erp /* [0..39] OUT */ + int16_t xmaxcr, + int16_t Mcr, + int16_t * xMcr, /* [0..12], 3 bits IN */ + int16_t * erp /* [0..39] OUT */ ) { - word expon, mant; - word xMp[ 13 ]; - - APCM_quantization_xmaxc_to_exp_mant( xmaxcr, &expon, &mant ); - APCM_inverse_quantization( xMcr, mant, expon, xMp ); - RPE_grid_positioning( Mcr, xMp, erp ); + int16_t expon, mant ; + int16_t xMp [13] ; + APCM_quantization_xmaxc_to_exp_mant (xmaxcr, &expon, &mant) ; + APCM_inverse_quantization (xMcr, mant, expon, xMp) ; + RPE_grid_positioning (Mcr, xMp, erp) ; } diff --git a/lib-src/libsndfile/src/GSM610/short_term.c b/lib-src/libsndfile/src/GSM610/short_term.c index 1dcffac61..e8cdac3b8 100644 --- a/lib-src/libsndfile/src/GSM610/short_term.c +++ b/lib-src/libsndfile/src/GSM610/short_term.c @@ -16,15 +16,15 @@ /* 4.2.8 */ static void Decoding_of_the_coded_Log_Area_Ratios ( - word * LARc, /* coded log area ratio [0..7] IN */ - word * LARpp) /* out: decoded .. */ + int16_t * LARc, /* coded log area ratio [0..7] IN */ + int16_t * LARpp) /* out: decoded .. */ { - register word temp1 /* , temp2 */; + register int16_t temp1 ; /* This procedure requires for efficient implementation * two tables. * - * INVA[1..8] = integer( (32768 * 8) / real_A[1..8]) + * INVA[1..8] = integer((32768 * 8) / real_A[1..8]) * MIC[1..8] = minimum value of the LARc[1..8] */ @@ -33,33 +33,33 @@ static void Decoding_of_the_coded_Log_Area_Ratios ( /* for (i = 1; i <= 8; i++, B++, MIC++, INVA++, LARc++, LARpp++) { * - * temp1 = GSM_ADD( *LARc, *MIC ) << 10; + * temp1 = GSM_ADD (*LARc, *MIC) << 10; * temp2 = *B << 1; - * temp1 = GSM_SUB( temp1, temp2 ); + * temp1 = GSM_SUB(temp1, temp2) ; * - * assert(*INVA != MIN_WORD); + * assert(*INVA != MIN_WORD) ; * - * temp1 = GSM_MULT_R( *INVA, temp1 ); - * *LARpp = GSM_ADD( temp1, temp1 ); + * temp1 = GSM_MULT_R (*INVA, temp1) ; + * *LARpp = GSM_ADD (temp1, temp1) ; * } */ #undef STEP -#define STEP( B, MIC, INVA ) \ - temp1 = GSM_ADD( *LARc++, MIC ) << 10; \ - temp1 = GSM_SUB( temp1, B * 2 ); \ - temp1 = GSM_MULT_R( INVA, temp1 ); \ - *LARpp++ = GSM_ADD( temp1, temp1 ); +#define STEP(B, MIC, INVA) \ + temp1 = arith_shift_left (GSM_ADD (*LARc++, MIC), 10) ; \ + temp1 = GSM_SUB (temp1, B * 2) ; \ + temp1 = GSM_MULT_R (INVA, temp1) ; \ + *LARpp++ = GSM_ADD (temp1, temp1) ; - STEP( 0, -32, 13107 ); - STEP( 0, -32, 13107 ); - STEP( 2048, -16, 13107 ); - STEP( -2560, -16, 13107 ); + STEP (0, -32, 13107) ; + STEP (0, -32, 13107) ; + STEP (2048, -16, 13107) ; + STEP (-2560, -16, 13107) ; - STEP( 94, -8, 19223 ); - STEP( -1792, -8, 17476 ); - STEP( -341, -4, 31454 ); - STEP( -1144, -4, 29708 ); + STEP (94, -8, 19223) ; + STEP (-1792, -8, 17476) ; + STEP (-341, -4, 31454) ; + STEP (-1144, -4, 29708) ; /* NOTE: the addition of *MIC is used to restore * the sign of *LARc. @@ -67,7 +67,7 @@ static void Decoding_of_the_coded_Log_Area_Ratios ( } /* 4.2.9 */ -/* Computation of the quantized reflection coefficients +/* Computation of the quantized reflection coefficients */ /* 4.2.9.1 Interpolation of the LARpp[1..8] to get the LARp[1..8] @@ -83,88 +83,87 @@ static void Decoding_of_the_coded_Log_Area_Ratios ( */ static void Coefficients_0_12 ( - register word * LARpp_j_1, - register word * LARpp_j, - register word * LARp) + register int16_t * LARpp_j_1, + register int16_t * LARpp_j, + register int16_t * LARp) { - register int i; + register int i ; - for (i = 1; i <= 8; i++, LARp++, LARpp_j_1++, LARpp_j++) { - *LARp = GSM_ADD( SASR_W( *LARpp_j_1, 2 ), SASR_W( *LARpp_j, 2 )); - *LARp = GSM_ADD( *LARp, SASR_W( *LARpp_j_1, 1)); - } + for (i = 1 ; i <= 8 ; i++, LARp++, LARpp_j_1++, LARpp_j++) + { *LARp = GSM_ADD (SASR_W (*LARpp_j_1, 2), SASR_W (*LARpp_j, 2)) ; + *LARp = GSM_ADD (*LARp, SASR_W (*LARpp_j_1, 1)) ; + } } static void Coefficients_13_26 ( - register word * LARpp_j_1, - register word * LARpp_j, - register word * LARp) + register int16_t * LARpp_j_1, + register int16_t * LARpp_j, + register int16_t * LARp) { - register int i; - for (i = 1; i <= 8; i++, LARpp_j_1++, LARpp_j++, LARp++) { - *LARp = GSM_ADD( SASR_W( *LARpp_j_1, 1), SASR_W( *LARpp_j, 1 )); - } + register int i ; + for (i = 1 ; i <= 8 ; i++, LARpp_j_1++, LARpp_j++, LARp++) + *LARp = GSM_ADD (SASR_W (*LARpp_j_1, 1), SASR_W (*LARpp_j, 1)) ; } static void Coefficients_27_39 ( - register word * LARpp_j_1, - register word * LARpp_j, - register word * LARp) + register int16_t * LARpp_j_1, + register int16_t * LARpp_j, + register int16_t * LARp) { - register int i; + register int i ; - for (i = 1; i <= 8; i++, LARpp_j_1++, LARpp_j++, LARp++) { - *LARp = GSM_ADD( SASR_W( *LARpp_j_1, 2 ), SASR_W( *LARpp_j, 2 )); - *LARp = GSM_ADD( *LARp, SASR_W( *LARpp_j, 1 )); - } + for (i = 1 ; i <= 8 ; i++, LARpp_j_1++, LARpp_j++, LARp++) + { *LARp = GSM_ADD (SASR_W (*LARpp_j_1, 2), SASR_W (*LARpp_j, 2)) ; + *LARp = GSM_ADD (*LARp, SASR_W (*LARpp_j, 1)) ; + } } static void Coefficients_40_159 ( - register word * LARpp_j, - register word * LARp) + register int16_t * LARpp_j, + register int16_t * LARp) { - register int i; + register int i ; - for (i = 1; i <= 8; i++, LARp++, LARpp_j++) - *LARp = *LARpp_j; + for (i = 1 ; i <= 8 ; i++, LARp++, LARpp_j++) + *LARp = *LARpp_j ; } /* 4.2.9.2 */ static void LARp_to_rp ( - register word * LARp) /* [0..7] IN/OUT */ + register int16_t * LARp) /* [0..7] IN/OUT */ /* * The input of this procedure is the interpolated LARp[0..7] array. * The reflection coefficients, rp[i], are used in the analysis * filter and in the synthesis filter. */ { - register int i; - register word temp; + register int i ; + register int16_t temp ; - for (i = 1; i <= 8; i++, LARp++) { - - /* temp = GSM_ABS( *LARp ); + for (i = 1 ; i <= 8 ; i++, LARp++) + { /* temp = GSM_ABS(*LARp) ; * * if (temp < 11059) temp <<= 1; * else if (temp < 20070) temp += 11059; - * else temp = GSM_ADD( temp >> 2, 26112 ); + * else temp = GSM_ADD (temp >> 2, 26112) ; * * *LARp = *LARp < 0 ? -temp : temp; */ - if (*LARp < 0) { - temp = *LARp == MIN_WORD ? MAX_WORD : -(*LARp); + if (*LARp < 0) + { temp = *LARp == MIN_WORD ? MAX_WORD : - (*LARp) ; *LARp = - ((temp < 11059) ? temp << 1 : ((temp < 20070) ? temp + 11059 - : GSM_ADD( (word) (temp >> 2), (word) 26112 ))); - } else { - temp = *LARp; - *LARp = (temp < 11059) ? temp << 1 + : GSM_ADD ((int16_t) (temp >> 2), (int16_t) 26112))) ; + } + else + { temp = *LARp ; + *LARp = (temp < 11059) ? temp << 1 : ((temp < 20070) ? temp + 11059 - : GSM_ADD( (word) (temp >> 2), (word) 26112 )); - } + : GSM_ADD ((int16_t) (temp >> 2), (int16_t) 26112)) ; + } } } @@ -172,9 +171,9 @@ static void LARp_to_rp ( /* 4.2.10 */ static void Short_term_analysis_filtering ( struct gsm_state * S, - register word * rp, /* [0..7] IN */ + register int16_t * rp, /* [0..7] IN */ register int k_n, /* k_end - k_start */ - register word * s /* [0..n-1] IN/OUT */ + register int16_t * s /* [0..n-1] IN/OUT */ ) /* * This procedure computes the short term residual signal d[..] to be fed @@ -184,234 +183,230 @@ static void Short_term_analysis_filtering ( * coefficient), it is assumed that the computation begins with index * k_start (for arrays d[..] and s[..]) and stops with index k_end * (k_start and k_end are defined in 4.2.9.1). This procedure also - * needs to keep the array u[0..7] in memory for each call. + * needs to keep the array u [0..7] in memory for each call. */ { - register word * u = S->u; - register int i; - register word di, zzz, ui, sav, rpi; + register int16_t * u = S->u ; + register int i ; + register int16_t di, zzz, ui, sav, rpi ; - for (; k_n--; s++) { + for ( ; k_n-- ; s++) + { di = sav = *s ; - di = sav = *s; + for (i = 0 ; i < 8 ; i++) + { /* YYY */ + ui = u [i] ; + rpi = rp [i] ; + u [i] = sav ; - for (i = 0; i < 8; i++) { /* YYY */ + zzz = GSM_MULT_R (rpi, di) ; + sav = GSM_ADD (ui, zzz) ; - ui = u[i]; - rpi = rp[i]; - u[i] = sav; - - zzz = GSM_MULT_R(rpi, di); - sav = GSM_ADD( ui, zzz); - - zzz = GSM_MULT_R(rpi, ui); - di = GSM_ADD( di, zzz ); + zzz = GSM_MULT_R (rpi, ui) ; + di = GSM_ADD (di, zzz) ; } - *s = di; + *s = di ; } } -#if defined(USE_FLOAT_MUL) && defined(FAST) +#if defined (USE_FLOAT_MUL) && defined (FAST) static void Fast_Short_term_analysis_filtering ( struct gsm_state * S, - register word * rp, /* [0..7] IN */ + register int16_t * rp, /* [0..7] IN */ register int k_n, /* k_end - k_start */ - register word * s /* [0..n-1] IN/OUT */ + register int16_t * s /* [0..n-1] IN/OUT */ ) { - register word * u = S->u; - register int i; + register int16_t * u = S->u ; + register int i ; - float uf[8], - rpf[8]; + float uf [8], rpf [8] ; - register float scalef = 3.0517578125e-5; - register float sav, di, temp; + register float scalef = 3.0517578125e-5 ; + register float sav, di, temp ; - for (i = 0; i < 8; ++i) { - uf[i] = u[i]; - rpf[i] = rp[i] * scalef; - } - for (; k_n--; s++) { - sav = di = *s; - for (i = 0; i < 8; ++i) { - register float rpfi = rpf[i]; - register float ufi = uf[i]; - - uf[i] = sav; - temp = rpfi * di + ufi; - di += rpfi * ufi; - sav = temp; + for (i = 0 ; i < 8 ; ++i) + { uf [i] = u [i] ; + rpf [i] = rp [i] * scalef ; } - *s = di; + for ( ; k_n-- ; s++) + { sav = di = *s ; + for (i = 0 ; i < 8 ; i++) + { register float rpfi = rpf [i] ; + register float ufi = uf [i] ; + + uf [i] = sav ; + temp = rpfi * di + ufi ; + di += rpfi * ufi ; + sav = temp ; + } + *s = di ; } - for (i = 0; i < 8; ++i) u[i] = uf[i]; + for (i = 0 ; i < 8 ; i++) u [i] = uf [i] ; } #endif /* ! (defined (USE_FLOAT_MUL) && defined (FAST)) */ static void Short_term_synthesis_filtering ( struct gsm_state * S, - register word * rrp, /* [0..7] IN */ + register int16_t * rrp, /* [0..7] IN */ register int k, /* k_end - k_start */ - register word * wt, /* [0..k-1] IN */ - register word * sr /* [0..k-1] OUT */ + register int16_t * wt, /* [0..k-1] IN */ + register int16_t * sr /* [0..k-1] OUT */ ) { - register word * v = S->v; - register int i; - register word sri, tmp1, tmp2; + register int16_t * v = S->v ; + register int i ; + register int16_t sri, tmp1, tmp2 ; - while (k--) { - sri = *wt++; - for (i = 8; i--;) { - - /* sri = GSM_SUB( sri, gsm_mult_r( rrp[i], v[i] ) ); + while (k--) + { sri = *wt++ ; + for (i = 8 ; i-- ; ) + { /* sri = GSM_SUB(sri, gsm_mult_r(rrp[i], v [i])) ; */ - tmp1 = rrp[i]; - tmp2 = v[i]; - tmp2 = ( tmp1 == MIN_WORD && tmp2 == MIN_WORD + tmp1 = rrp [i] ; + tmp2 = v [i] ; + tmp2 = (tmp1 == MIN_WORD && tmp2 == MIN_WORD ? MAX_WORD - : 0x0FFFF & (( (longword)tmp1 * (longword)tmp2 - + 16384) >> 15)) ; + : 0x0FFFF & (((int32_t) tmp1 * (int32_t) tmp2 + + 16384) >> 15)) ; - sri = GSM_SUB( sri, tmp2 ); + sri = GSM_SUB (sri, tmp2) ; - /* v[i+1] = GSM_ADD( v[i], gsm_mult_r( rrp[i], sri ) ); + /* v [i+1] = GSM_ADD (v [i], gsm_mult_r(rrp[i], sri)) ; */ - tmp1 = ( tmp1 == MIN_WORD && sri == MIN_WORD + tmp1 = (tmp1 == MIN_WORD && sri == MIN_WORD ? MAX_WORD - : 0x0FFFF & (( (longword)tmp1 * (longword)sri - + 16384) >> 15)) ; + : 0x0FFFF & (((int32_t) tmp1 * (int32_t) sri + + 16384) >> 15)) ; - v[i+1] = GSM_ADD( v[i], tmp1); + v [i + 1] = GSM_ADD (v [i], tmp1) ; } - *sr++ = v[0] = sri; + *sr++ = v [0] = sri ; } } -#if defined(FAST) && defined(USE_FLOAT_MUL) +#if defined (FAST) && defined (USE_FLOAT_MUL) static void Fast_Short_term_synthesis_filtering ( struct gsm_state * S, - register word * rrp, /* [0..7] IN */ + register int16_t * rrp, /* [0..7] IN */ register int k, /* k_end - k_start */ - register word * wt, /* [0..k-1] IN */ - register word * sr /* [0..k-1] OUT */ + register int16_t * wt, /* [0..k-1] IN */ + register int16_t * sr /* [0..k-1] OUT */ ) { - register word * v = S->v; - register int i; + register int16_t * v = S->v ; + register int i ; - float va[9], rrpa[8]; - register float scalef = 3.0517578125e-5, temp; + float va [9], rrpa [8] ; + register float scalef = 3.0517578125e-5, temp ; - for (i = 0; i < 8; ++i) { - va[i] = v[i]; - rrpa[i] = (float)rrp[i] * scalef; - } - while (k--) { - register float sri = *wt++; - for (i = 8; i--;) { - sri -= rrpa[i] * va[i]; - if (sri < -32768.) sri = -32768.; - else if (sri > 32767.) sri = 32767.; - - temp = va[i] + rrpa[i] * sri; - if (temp < -32768.) temp = -32768.; - else if (temp > 32767.) temp = 32767.; - va[i+1] = temp; + for (i = 0 ; i < 8 ; ++i) + { va [i] = v [i] ; + rrpa [i] = (float) rrp [i] * scalef ; } - *sr++ = va[0] = sri; + while (k--) { + register float sri = *wt++ ; + for (i = 8 ; i-- ; ) + { sri -= rrpa [i] * va [i] ; + if (sri < -32768.0) sri = -32768.0 ; + else if (sri > 32767.0) sri = 32767.0 ; + + temp = va [i] + rrpa [i] * sri ; + if (temp < -32768.0) temp = -32768.0 ; + else if (temp > 32767.0) temp = 32767.0 ; + va [i+1] = temp ; + } + *sr++ = va [0] = sri ; } - for (i = 0; i < 9; ++i) v[i] = va[i]; + for (i = 0 ; i < 9 ; ++i) v [i] = va [i] ; } #endif /* defined(FAST) && defined(USE_FLOAT_MUL) */ void Gsm_Short_Term_Analysis_Filter ( - struct gsm_state * S, - word * LARc, /* coded log area ratio [0..7] IN */ - word * s /* signal [0..159] IN/OUT */ + int16_t * LARc, /* coded log area ratio [0..7] IN */ + int16_t * s /* signal [0..159] IN/OUT */ ) { - word * LARpp_j = S->LARpp[ S->j ]; - word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ]; + int16_t * LARpp_j = S->LARpp [S->j] ; + int16_t * LARpp_j_1 = S->LARpp [S->j ^= 1] ; - word LARp[8]; + int16_t LARp [8] ; #undef FILTER -#if defined(FAST) && defined(USE_FLOAT_MUL) -# define FILTER (* (S->fast \ - ? Fast_Short_term_analysis_filtering \ - : Short_term_analysis_filtering )) +#if defined (FAST) && defined (USE_FLOAT_MUL) +# define FILTER (* (S->fast \ + ? Fast_Short_term_analysis_filtering \ + : Short_term_analysis_filtering)) #else # define FILTER Short_term_analysis_filtering #endif - Decoding_of_the_coded_Log_Area_Ratios( LARc, LARpp_j ); + Decoding_of_the_coded_Log_Area_Ratios (LARc, LARpp_j) ; - Coefficients_0_12( LARpp_j_1, LARpp_j, LARp ); - LARp_to_rp( LARp ); - FILTER( S, LARp, 13, s); + Coefficients_0_12 (LARpp_j_1, LARpp_j, LARp) ; + LARp_to_rp (LARp) ; + FILTER (S, LARp, 13, s) ; - Coefficients_13_26( LARpp_j_1, LARpp_j, LARp); - LARp_to_rp( LARp ); - FILTER( S, LARp, 14, s + 13); + Coefficients_13_26 (LARpp_j_1, LARpp_j, LARp) ; + LARp_to_rp (LARp) ; + FILTER (S, LARp, 14, s + 13) ; - Coefficients_27_39( LARpp_j_1, LARpp_j, LARp); - LARp_to_rp( LARp ); - FILTER( S, LARp, 13, s + 27); + Coefficients_27_39 (LARpp_j_1, LARpp_j, LARp) ; + LARp_to_rp (LARp) ; + FILTER (S, LARp, 13, s + 27) ; - Coefficients_40_159( LARpp_j, LARp); - LARp_to_rp( LARp ); - FILTER( S, LARp, 120, s + 40); + Coefficients_40_159 (LARpp_j, LARp) ; + LARp_to_rp (LARp) ; + FILTER (S, LARp, 120, s + 40) ; } void Gsm_Short_Term_Synthesis_Filter ( struct gsm_state * S, - word * LARcr, /* received log area ratios [0..7] IN */ - word * wt, /* received d [0..159] IN */ + int16_t * LARcr, /* received log area ratios [0..7] IN */ + int16_t * wt, /* received d [0..159] IN */ - word * s /* signal s [0..159] OUT */ + int16_t * s /* signal s [0..159] OUT */ ) { - word * LARpp_j = S->LARpp[ S->j ]; - word * LARpp_j_1 = S->LARpp[ S->j ^=1 ]; + int16_t * LARpp_j = S->LARpp [S->j] ; + int16_t * LARpp_j_1 = S->LARpp [S->j ^= 1] ; - word LARp[8]; + int16_t LARp [8] ; #undef FILTER -#if defined(FAST) && defined(USE_FLOAT_MUL) +#if defined (FAST) && defined (USE_FLOAT_MUL) -# define FILTER (* (S->fast \ - ? Fast_Short_term_synthesis_filtering \ - : Short_term_synthesis_filtering )) +# define FILTER (* (S->fast \ + ? Fast_Short_term_synthesis_filtering \ + : Short_term_synthesis_filtering)) #else # define FILTER Short_term_synthesis_filtering #endif - Decoding_of_the_coded_Log_Area_Ratios( LARcr, LARpp_j ); + Decoding_of_the_coded_Log_Area_Ratios (LARcr, LARpp_j) ; - Coefficients_0_12( LARpp_j_1, LARpp_j, LARp ); - LARp_to_rp( LARp ); - FILTER( S, LARp, 13, wt, s ); + Coefficients_0_12 (LARpp_j_1, LARpp_j, LARp) ; + LARp_to_rp (LARp) ; + FILTER (S, LARp, 13, wt, s) ; - Coefficients_13_26( LARpp_j_1, LARpp_j, LARp); - LARp_to_rp( LARp ); - FILTER( S, LARp, 14, wt + 13, s + 13 ); + Coefficients_13_26 (LARpp_j_1, LARpp_j, LARp) ; + LARp_to_rp (LARp) ; + FILTER (S, LARp, 14, wt + 13, s + 13) ; - Coefficients_27_39( LARpp_j_1, LARpp_j, LARp); - LARp_to_rp( LARp ); - FILTER( S, LARp, 13, wt + 27, s + 27 ); + Coefficients_27_39 (LARpp_j_1, LARpp_j, LARp) ; + LARp_to_rp (LARp) ; + FILTER (S, LARp, 13, wt + 27, s + 27) ; - Coefficients_40_159( LARpp_j, LARp ); - LARp_to_rp( LARp ); - FILTER(S, LARp, 120, wt + 40, s + 40); + Coefficients_40_159 (LARpp_j, LARp) ; + LARp_to_rp (LARp) ; + FILTER (S, LARp, 120, wt + 40, s + 40) ; } diff --git a/lib-src/libsndfile/src/GSM610/table.c b/lib-src/libsndfile/src/GSM610/table.c index 8b83f78cf..30590aff3 100644 --- a/lib-src/libsndfile/src/GSM610/table.c +++ b/lib-src/libsndfile/src/GSM610/table.c @@ -19,42 +19,42 @@ /* Table 4.1 Quantization of the Log.-Area Ratios */ /* i 1 2 3 4 5 6 7 8 */ -word gsm_A[8] = {20480, 20480, 20480, 20480, 13964, 15360, 8534, 9036}; -word gsm_B[8] = { 0, 0, 2048, -2560, 94, -1792, -341, -1144}; -word gsm_MIC[8] = { -32, -32, -16, -16, -8, -8, -4, -4 }; -word gsm_MAC[8] = { 31, 31, 15, 15, 7, 7, 3, 3 }; +int16_t gsm_A [8] = { 20480, 20480, 20480, 20480, 13964, 15360, 8534, 9036 } ; +int16_t gsm_B [8] = { 0, 0, 2048, -2560, 94, -1792, -341, -1144 } ; +int16_t gsm_MIC [8] = { -32, -32, -16, -16, -8, -8, -4, -4 } ; +int16_t gsm_MAC [8] = { 31, 31, 15, 15, 7, 7, 3, 3 } ; /* Table 4.2 Tabulation of 1/A[1..8] */ -word gsm_INVA[8]={ 13107, 13107, 13107, 13107, 19223, 17476, 31454, 29708 }; +int16_t gsm_INVA [8] = { 13107, 13107, 13107, 13107, 19223, 17476, 31454, 29708 } ; /* Table 4.3a Decision level of the LTP gain quantizer */ /* bc 0 1 2 3 */ -word gsm_DLB[4] = { 6554, 16384, 26214, 32767 }; +int16_t gsm_DLB [4] = { 6554, 16384, 26214, 32767 } ; /* Table 4.3b Quantization levels of the LTP gain quantizer */ /* bc 0 1 2 3 */ -word gsm_QLB[4] = { 3277, 11469, 21299, 32767 }; +int16_t gsm_QLB [4] = { 3277, 11469, 21299, 32767 } ; /* Table 4.4 Coefficients of the weighting filter */ /* i 0 1 2 3 4 5 6 7 8 9 10 */ -word gsm_H[11] = {-134, -374, 0, 2054, 5741, 8192, 5741, 2054, 0, -374, -134 }; +int16_t gsm_H [11] = { -134, -374, 0, 2054, 5741, 8192, 5741, 2054, 0, -374, -134 } ; -/* Table 4.5 Normalized inverse mantissa used to compute xM/xmax +/* Table 4.5 Normalized inverse mantissa used to compute xM/xmax */ /* i 0 1 2 3 4 5 6 7 */ -word gsm_NRFAC[8] = { 29128, 26215, 23832, 21846, 20165, 18725, 17476, 16384 }; +int16_t gsm_NRFAC [8] = { 29128, 26215, 23832, 21846, 20165, 18725, 17476, 16384 } ; /* Table 4.6 Normalized direct mantissa used to compute xM/xmax */ /* i 0 1 2 3 4 5 6 7 */ -word gsm_FAC[8] = { 18431, 20479, 22527, 24575, 26623, 28671, 30719, 32767 }; +int16_t gsm_FAC [8] = { 18431, 20479, 22527, 24575, 26623, 28671, 30719, 32767 } ; diff --git a/lib-src/libsndfile/src/Makefile.am b/lib-src/libsndfile/src/Makefile.am deleted file mode 100644 index 832791d6c..000000000 --- a/lib-src/libsndfile/src/Makefile.am +++ /dev/null @@ -1,113 +0,0 @@ -## Process this file with automake to produce Makefile.in - -SUBDIRS = GSM610 G72x - -AM_CPPFLAGS = @EXTERNAL_CFLAGS@ - -lib_LTLIBRARIES = libsndfile.la -include_HEADERS = sndfile.hh -nodist_include_HEADERS = sndfile.h - -noinst_LTLIBRARIES = libcommon.la - -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ - -SYMBOL_FILES = Symbols.gnu-binutils Symbols.darwin libsndfile-1.def Symbols.os2 Symbols.static - -EXTRA_DIST = sndfile.h.in config.h.in test_endswap.tpl test_endswap.def \ - $(SYMBOL_FILES) create_symbols_file.py binheader_writef_check.py \ - make-static-lib-hidden-privates.sh - -noinst_HEADERS = common.h sfconfig.h sfendian.h wav_w64.h sf_unistd.h chanmap.h - -noinst_PROGRAMS = test_main - -COMMON = common.c file_io.c command.c pcm.c ulaw.c alaw.c float32.c \ - double64.c ima_adpcm.c ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c \ - interleave.c strings.c dither.c broadcast.c audio_detect.c \ - ima_oki_adpcm.c ima_oki_adpcm.h chunk.c chanmap.c \ - windows.c id3.c $(WIN_VERSION_FILE) - -FILESPECIFIC = sndfile.c aiff.c au.c avr.c caf.c dwd.c flac.c g72x.c htk.c ircam.c \ - macbinary3.c macos.c mat4.c mat5.c nist.c ogg.c paf.c pvf.c raw.c rx2.c sd2.c \ - sds.c svx.c txw.c voc.c wve.c w64.c wav_w64.c wav.c xi.c mpc2k.c rf64.c - -CLEANFILES = *~ - -if USE_WIN_VERSION_FILE -WIN_VERSION_FILE = version-metadata.rc -else -WIN_VERSION_FILE = -endif - -#=============================================================================== -# MinGW requires -no-undefined if a DLL is to be built. -libsndfile_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@ -libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS) -nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS) -libsndfile_la_LIBADD = libcommon.la GSM610/libgsm.la G72x/libg72x.la \ - @EXTERNAL_LIBS@ -lm - -libcommon_la_SOURCES = $(COMMON) - -test_main_SOURCES = test_main.c test_main.h test_conversions.c test_float.c test_endswap.c \ - test_audio_detect.c test_log_printf.c test_file_io.c test_ima_oki_adpcm.c \ - test_strncpy_crlf.c test_broadcast_var.c -test_main_LDADD = libcommon.la - - -test_endswap.c: test_endswap.def test_endswap.tpl - autogen --writable test_endswap.def - -genfiles : test_endswap.c $(SYMBOL_FILES) - -# A single test programs. -# It is not possible to place these in the tests/ directory because they -# need access to the internals of the SF_PRIVATE struct. - -check: $(noinst_PROGRAMS) - @if [ -x /usr/bin/python ]; then $(srcdir)/binheader_writef_check.py $(srcdir)/*.c ; fi - ./test_main$(EXEEXT) - -#====================================================================== -# Generate an OS specific Symbols files. This is done when the author -# builds the distribution tarball. There should be not need for the -# end user to create these files. - -Symbols.gnu-binutils: create_symbols_file.py - ./create_symbols_file.py linux $(VERSION) > $@ - -Symbols.darwin: create_symbols_file.py - ./create_symbols_file.py darwin $(VERSION) > $@ - -libsndfile-1.def: create_symbols_file.py - ./create_symbols_file.py win32 $(VERSION) > $@ - -Symbols.os2: create_symbols_file.py - ./create_symbols_file.py os2 $(VERSION) > $@ - -Symbols.static: create_symbols_file.py - ./create_symbols_file.py static $(VERSION) > $@ - -# Fake dependancy to force the creation of these files. -sndfile.o : $(SYMBOL_FILES) - -#====================================================================== -# Building windows resource files (if needed). - -.rc.lo: - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) $< -o $@ - -#====================================================================== -# Disable autoheader. -AUTOHEADER=echo - -# Dependancies. - -aiff.c au.c g72x.c ircam.c mat4.c mat5.c nist.c paf.c pvf.c : sndfile.h common.h -raw.c svx.c voc.c w64.c wav.c wav_w64.c htk.c sd2.c rx2.c txw.c : sndfile.h common.h -sds.c wve.c dwd.c ogg.c xi.c sndfile.c common.c file_io.c : sndfile.h common.h -command.c pcm.c ulaw.c alaw.c float32.c double64.c ima_adpcm.c : sndfile.h common.h -ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c interleave.c strings.c : sndfile.h common.h -dither.c : sndfile.h common.h diff --git a/lib-src/libsndfile/src/Makefile.in b/lib-src/libsndfile/src/Makefile.in deleted file mode 100644 index 6b5792a81..000000000 --- a/lib-src/libsndfile/src/Makefile.in +++ /dev/null @@ -1,1103 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -noinst_PROGRAMS = test_main$(EXEEXT) -subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/config.h.in $(srcdir)/sndfile.h.in \ - $(srcdir)/version-metadata.rc.in $(top_srcdir)/Cfg/depcomp \ - $(include_HEADERS) $(noinst_HEADERS) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = sndfile.h version-metadata.rc -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" -LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) -libcommon_la_LIBADD = -am__libcommon_la_SOURCES_DIST = common.c file_io.c command.c pcm.c \ - ulaw.c alaw.c float32.c double64.c ima_adpcm.c ms_adpcm.c \ - gsm610.c dwvw.c vox_adpcm.c interleave.c strings.c dither.c \ - broadcast.c audio_detect.c ima_oki_adpcm.c ima_oki_adpcm.h \ - chunk.c chanmap.c windows.c id3.c version-metadata.rc -@USE_WIN_VERSION_FILE_TRUE@am__objects_1 = version-metadata.lo -am__objects_2 = common.lo file_io.lo command.lo pcm.lo ulaw.lo alaw.lo \ - float32.lo double64.lo ima_adpcm.lo ms_adpcm.lo gsm610.lo \ - dwvw.lo vox_adpcm.lo interleave.lo strings.lo dither.lo \ - broadcast.lo audio_detect.lo ima_oki_adpcm.lo chunk.lo \ - chanmap.lo windows.lo id3.lo $(am__objects_1) -am_libcommon_la_OBJECTS = $(am__objects_2) -libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -libsndfile_la_DEPENDENCIES = libcommon.la GSM610/libgsm.la \ - G72x/libg72x.la -am__objects_3 = sndfile.lo aiff.lo au.lo avr.lo caf.lo dwd.lo flac.lo \ - g72x.lo htk.lo ircam.lo macbinary3.lo macos.lo mat4.lo mat5.lo \ - nist.lo ogg.lo paf.lo pvf.lo raw.lo rx2.lo sd2.lo sds.lo \ - svx.lo txw.lo voc.lo wve.lo w64.lo wav_w64.lo wav.lo xi.lo \ - mpc2k.lo rf64.lo -am__objects_4 = -am_libsndfile_la_OBJECTS = $(am__objects_3) $(am__objects_4) -nodist_libsndfile_la_OBJECTS = $(am__objects_4) -libsndfile_la_OBJECTS = $(am_libsndfile_la_OBJECTS) \ - $(nodist_libsndfile_la_OBJECTS) -libsndfile_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libsndfile_la_LDFLAGS) $(LDFLAGS) -o $@ -PROGRAMS = $(noinst_PROGRAMS) -am_test_main_OBJECTS = test_main.$(OBJEXT) test_conversions.$(OBJEXT) \ - test_float.$(OBJEXT) test_endswap.$(OBJEXT) \ - test_audio_detect.$(OBJEXT) test_log_printf.$(OBJEXT) \ - test_file_io.$(OBJEXT) test_ima_oki_adpcm.$(OBJEXT) \ - test_strncpy_crlf.$(OBJEXT) test_broadcast_var.$(OBJEXT) -test_main_OBJECTS = $(am_test_main_OBJECTS) -test_main_DEPENDENCIES = libcommon.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/Cfg/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libcommon_la_SOURCES) $(libsndfile_la_SOURCES) \ - $(nodist_libsndfile_la_SOURCES) $(test_main_SOURCES) -DIST_SOURCES = $(am__libcommon_la_SOURCES_DIST) \ - $(libsndfile_la_SOURCES) $(test_main_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(noinst_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ - -#====================================================================== -# Disable autoheader. -AUTOHEADER = echo -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = GSM610 G72x -AM_CPPFLAGS = @EXTERNAL_CFLAGS@ -lib_LTLIBRARIES = libsndfile.la -include_HEADERS = sndfile.hh -nodist_include_HEADERS = sndfile.h -noinst_LTLIBRARIES = libcommon.la -SYMBOL_FILES = Symbols.gnu-binutils Symbols.darwin libsndfile-1.def Symbols.os2 Symbols.static -EXTRA_DIST = sndfile.h.in config.h.in test_endswap.tpl test_endswap.def \ - $(SYMBOL_FILES) create_symbols_file.py binheader_writef_check.py \ - make-static-lib-hidden-privates.sh - -noinst_HEADERS = common.h sfconfig.h sfendian.h wav_w64.h sf_unistd.h chanmap.h -COMMON = common.c file_io.c command.c pcm.c ulaw.c alaw.c float32.c \ - double64.c ima_adpcm.c ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c \ - interleave.c strings.c dither.c broadcast.c audio_detect.c \ - ima_oki_adpcm.c ima_oki_adpcm.h chunk.c chanmap.c \ - windows.c id3.c $(WIN_VERSION_FILE) - -FILESPECIFIC = sndfile.c aiff.c au.c avr.c caf.c dwd.c flac.c g72x.c htk.c ircam.c \ - macbinary3.c macos.c mat4.c mat5.c nist.c ogg.c paf.c pvf.c raw.c rx2.c sd2.c \ - sds.c svx.c txw.c voc.c wve.c w64.c wav_w64.c wav.c xi.c mpc2k.c rf64.c - -CLEANFILES = *~ -@USE_WIN_VERSION_FILE_FALSE@WIN_VERSION_FILE = -@USE_WIN_VERSION_FILE_TRUE@WIN_VERSION_FILE = version-metadata.rc - -#=============================================================================== -# MinGW requires -no-undefined if a DLL is to be built. -libsndfile_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@ -libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS) -nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS) -libsndfile_la_LIBADD = libcommon.la GSM610/libgsm.la G72x/libg72x.la \ - @EXTERNAL_LIBS@ -lm - -libcommon_la_SOURCES = $(COMMON) -test_main_SOURCES = test_main.c test_main.h test_conversions.c test_float.c test_endswap.c \ - test_audio_detect.c test_log_printf.c test_file_io.c test_ima_oki_adpcm.c \ - test_strncpy_crlf.c test_broadcast_var.c - -test_main_LDADD = libcommon.la -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj .rc -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -config.h: stamp-h1 - @test -f $@ || rm -f stamp-h1 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status src/config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 -sndfile.h: $(top_builddir)/config.status $(srcdir)/sndfile.h.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -version-metadata.rc: $(top_builddir)/config.status $(srcdir)/version-metadata.rc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) $(EXTRA_libcommon_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS) - -libsndfile.la: $(libsndfile_la_OBJECTS) $(libsndfile_la_DEPENDENCIES) $(EXTRA_libsndfile_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsndfile_la_LINK) -rpath $(libdir) $(libsndfile_la_OBJECTS) $(libsndfile_la_LIBADD) $(LIBS) - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -test_main$(EXEEXT): $(test_main_OBJECTS) $(test_main_DEPENDENCIES) $(EXTRA_test_main_DEPENDENCIES) - @rm -f test_main$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_main_OBJECTS) $(test_main_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aiff.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alaw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/au.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_detect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/broadcast.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chanmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chunk.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/double64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dwd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dwvw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g72x.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm610.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htk.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ima_adpcm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ima_oki_adpcm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interleave.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ircam.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/macbinary3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/macos.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mat4.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mat5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpc2k.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ms_adpcm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nist.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pvf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rf64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rx2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sd2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strings.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_audio_detect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_broadcast_var.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conversions.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_endswap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_file_io.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_float.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ima_oki_adpcm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_log_printf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strncpy_crlf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ulaw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/voc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vox_adpcm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wav.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wav_w64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wve.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xi.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) -install-nodist_includeHEADERS: $(nodist_include_HEADERS) - @$(NORMAL_INSTALL) - @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ - done - -uninstall-nodist_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-includeHEADERS install-nodist_includeHEADERS - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \ - uninstall-nodist_includeHEADERS - -.MAKE: $(am__recursive_targets) all install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-includeHEADERS install-info \ - install-info-am install-libLTLIBRARIES install-man \ - install-nodist_includeHEADERS install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-includeHEADERS \ - uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS - - -test_endswap.c: test_endswap.def test_endswap.tpl - autogen --writable test_endswap.def - -genfiles : test_endswap.c $(SYMBOL_FILES) - -# A single test programs. -# It is not possible to place these in the tests/ directory because they -# need access to the internals of the SF_PRIVATE struct. - -check: $(noinst_PROGRAMS) - @if [ -x /usr/bin/python ]; then $(srcdir)/binheader_writef_check.py $(srcdir)/*.c ; fi - ./test_main$(EXEEXT) - -#====================================================================== -# Generate an OS specific Symbols files. This is done when the author -# builds the distribution tarball. There should be not need for the -# end user to create these files. - -Symbols.gnu-binutils: create_symbols_file.py - ./create_symbols_file.py linux $(VERSION) > $@ - -Symbols.darwin: create_symbols_file.py - ./create_symbols_file.py darwin $(VERSION) > $@ - -libsndfile-1.def: create_symbols_file.py - ./create_symbols_file.py win32 $(VERSION) > $@ - -Symbols.os2: create_symbols_file.py - ./create_symbols_file.py os2 $(VERSION) > $@ - -Symbols.static: create_symbols_file.py - ./create_symbols_file.py static $(VERSION) > $@ - -# Fake dependancy to force the creation of these files. -sndfile.o : $(SYMBOL_FILES) - -#====================================================================== -# Building windows resource files (if needed). - -.rc.lo: - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) $< -o $@ - -# Dependancies. - -aiff.c au.c g72x.c ircam.c mat4.c mat5.c nist.c paf.c pvf.c : sndfile.h common.h -raw.c svx.c voc.c w64.c wav.c wav_w64.c htk.c sd2.c rx2.c txw.c : sndfile.h common.h -sds.c wve.c dwd.c ogg.c xi.c sndfile.c common.c file_io.c : sndfile.h common.h -command.c pcm.c ulaw.c alaw.c float32.c double64.c ima_adpcm.c : sndfile.h common.h -ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c interleave.c strings.c : sndfile.h common.h -dither.c : sndfile.h common.h - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/src/Symbols.darwin b/lib-src/libsndfile/src/Symbols.darwin deleted file mode 100644 index a67146075..000000000 --- a/lib-src/libsndfile/src/Symbols.darwin +++ /dev/null @@ -1,37 +0,0 @@ -# Auto-generated by create_symbols_file.py - -_sf_command -_sf_open -_sf_close -_sf_seek -_sf_error -_sf_perror -_sf_error_str -_sf_error_number -_sf_format_check -_sf_read_raw -_sf_readf_short -_sf_readf_int -_sf_readf_float -_sf_readf_double -_sf_read_short -_sf_read_int -_sf_read_float -_sf_read_double -_sf_write_raw -_sf_writef_short -_sf_writef_int -_sf_writef_float -_sf_writef_double -_sf_write_short -_sf_write_int -_sf_write_float -_sf_write_double -_sf_strerror -_sf_get_string -_sf_set_string -_sf_version_string -_sf_open_fd -_sf_open_virtual -_sf_write_sync - diff --git a/lib-src/libsndfile/src/Symbols.gnu-binutils b/lib-src/libsndfile/src/Symbols.gnu-binutils deleted file mode 100644 index 93da6d684..000000000 --- a/lib-src/libsndfile/src/Symbols.gnu-binutils +++ /dev/null @@ -1,43 +0,0 @@ -# Auto-generated by create_symbols_file.py - -libsndfile.so.1.0 -{ - global: - sf_command ; - sf_open ; - sf_close ; - sf_seek ; - sf_error ; - sf_perror ; - sf_error_str ; - sf_error_number ; - sf_format_check ; - sf_read_raw ; - sf_readf_short ; - sf_readf_int ; - sf_readf_float ; - sf_readf_double ; - sf_read_short ; - sf_read_int ; - sf_read_float ; - sf_read_double ; - sf_write_raw ; - sf_writef_short ; - sf_writef_int ; - sf_writef_float ; - sf_writef_double ; - sf_write_short ; - sf_write_int ; - sf_write_float ; - sf_write_double ; - sf_strerror ; - sf_get_string ; - sf_set_string ; - sf_version_string ; - sf_open_fd ; - sf_open_virtual ; - sf_write_sync ; - local: - * ; -} ; - diff --git a/lib-src/libsndfile/src/Symbols.os2 b/lib-src/libsndfile/src/Symbols.os2 deleted file mode 100644 index 118ceba72..000000000 --- a/lib-src/libsndfile/src/Symbols.os2 +++ /dev/null @@ -1,43 +0,0 @@ -; Auto-generated by create_symbols_file.py - -LIBRARY sndfile1 -INITINSTANCE TERMINSTANCE -CODE PRELOAD MOVEABLE DISCARDABLE -DATA PRELOAD MOVEABLE MULTIPLE NONSHARED -EXPORTS - -_sf_command @1 -_sf_open @2 -_sf_close @3 -_sf_seek @4 -_sf_error @7 -_sf_perror @8 -_sf_error_str @9 -_sf_error_number @10 -_sf_format_check @11 -_sf_read_raw @16 -_sf_readf_short @17 -_sf_readf_int @18 -_sf_readf_float @19 -_sf_readf_double @20 -_sf_read_short @21 -_sf_read_int @22 -_sf_read_float @23 -_sf_read_double @24 -_sf_write_raw @32 -_sf_writef_short @33 -_sf_writef_int @34 -_sf_writef_float @35 -_sf_writef_double @36 -_sf_write_short @37 -_sf_write_int @38 -_sf_write_float @39 -_sf_write_double @40 -_sf_strerror @50 -_sf_get_string @60 -_sf_set_string @61 -_sf_version_string @68 -_sf_open_fd @70 -_sf_open_virtual @80 -_sf_write_sync @90 - diff --git a/lib-src/libsndfile/src/Symbols.static b/lib-src/libsndfile/src/Symbols.static deleted file mode 100644 index a0e8d6298..000000000 --- a/lib-src/libsndfile/src/Symbols.static +++ /dev/null @@ -1,35 +0,0 @@ -sf_command -sf_open -sf_close -sf_seek -sf_error -sf_perror -sf_error_str -sf_error_number -sf_format_check -sf_read_raw -sf_readf_short -sf_readf_int -sf_readf_float -sf_readf_double -sf_read_short -sf_read_int -sf_read_float -sf_read_double -sf_write_raw -sf_writef_short -sf_writef_int -sf_writef_float -sf_writef_double -sf_write_short -sf_write_int -sf_write_float -sf_write_double -sf_strerror -sf_get_string -sf_set_string -sf_version_string -sf_open_fd -sf_wchar_open -sf_open_virtual -sf_write_sync diff --git a/lib-src/libsndfile/src/aiff.c b/lib-src/libsndfile/src/aiff.c index 0113ba651..a2bf55ee4 100644 --- a/lib-src/libsndfile/src/aiff.c +++ b/lib-src/libsndfile/src/aiff.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2018 Erik de Castro Lopo ** Copyright (C) 2005 David Viens ** ** This program is free software; you can redistribute it and/or modify @@ -123,34 +123,34 @@ enum } ; typedef struct -{ unsigned int size ; - short numChannels ; - unsigned int numSampleFrames ; - short sampleSize ; - unsigned char sampleRate [10] ; - unsigned int encoding ; +{ uint32_t size ; + int16_t numChannels ; + uint32_t numSampleFrames ; + int16_t sampleSize ; + uint8_t sampleRate [10] ; + uint32_t encoding ; char zero_bytes [2] ; } COMM_CHUNK ; typedef struct -{ unsigned int offset ; - unsigned int blocksize ; +{ uint32_t offset ; + uint32_t blocksize ; } SSND_CHUNK ; typedef struct -{ short playMode ; - unsigned short beginLoop ; - unsigned short endLoop ; +{ int16_t playMode ; + uint16_t beginLoop ; + uint16_t endLoop ; } INST_LOOP ; typedef struct -{ char baseNote ; /* all notes are MIDI note numbers */ - char detune ; /* cents off, only -50 to +50 are significant */ - char lowNote ; - char highNote ; - char lowVelocity ; /* 1 to 127 */ - char highVelocity ; /* 1 to 127 */ - short gain ; /* in dB, 0 is normal */ +{ int8_t baseNote ; /* all notes are MIDI note numbers */ + int8_t detune ; /* cents off, only -50 to +50 are significant */ + int8_t lowNote ; + int8_t highNote ; + int8_t lowVelocity ; /* 1 to 127 */ + int8_t highVelocity ; /* 1 to 127 */ + int16_t gain ; /* in dB, 0 is normal */ INST_LOOP sustain_loop ; INST_LOOP release_loop ; } INST_CHUNK ; @@ -170,27 +170,25 @@ enum typedef struct -{ unsigned int version ; - unsigned int numBeats ; - unsigned short rootNote ; - unsigned short scaleType ; - unsigned short sigNumerator ; - unsigned short sigDenominator ; - unsigned short loopType ; +{ uint32_t version ; + uint32_t numBeats ; + uint16_t rootNote ; + uint16_t scaleType ; + uint16_t sigNumerator ; + uint16_t sigDenominator ; + uint16_t loopType ; } basc_CHUNK ; typedef struct -{ unsigned short markerID ; - unsigned int position ; +{ uint16_t markerID ; + uint32_t position ; } MARK_ID_POS ; typedef struct -{ PRIV_CHUNK4 chunk4 ; - - sf_count_t comm_offset ; +{ sf_count_t comm_offset ; sf_count_t ssnd_offset ; - int chanmap_tag ; + int32_t chanmap_tag ; MARK_ID_POS *markstr ; } AIFF_PRIVATE ; @@ -201,8 +199,8 @@ typedef struct static int aiff_close (SF_PRIVATE *psf) ; -static int tenbytefloat2int (unsigned char *bytes) ; -static void uint2tenbytefloat (unsigned int num, unsigned char *bytes) ; +static int tenbytefloat2int (uint8_t *bytes) ; +static void uint2tenbytefloat (uint32_t num, uint8_t *bytes) ; static int aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) ; @@ -214,15 +212,20 @@ static void aiff_write_strings (SF_PRIVATE *psf, int location) ; static int aiff_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; -static const char *get_loop_mode_str (short mode) ; +static const char *get_loop_mode_str (int16_t mode) ; -static short get_loop_mode (short mode) ; +static int16_t get_loop_mode (int16_t mode) ; static int aiff_read_basc_chunk (SF_PRIVATE * psf, int) ; static int aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword) ; -static unsigned int marker_to_position (const MARK_ID_POS *m, unsigned short n, int marksize) ; +static uint32_t marker_to_position (const MARK_ID_POS *m, uint16_t n, int marksize) ; + +static int aiff_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) ; +static SF_CHUNK_ITERATOR * aiff_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) ; +static int aiff_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; +static int aiff_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; /*------------------------------------------------------------------------------ ** Public function. @@ -243,6 +246,11 @@ aiff_open (SF_PRIVATE *psf) if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0)) { if ((error = aiff_read_header (psf, &comm_fmt))) return error ; + + psf->next_chunk_iterator = aiff_next_chunk_iterator ; + psf->get_chunk_size = aiff_get_chunk_size ; + psf->get_chunk_data = aiff_get_chunk_data ; + psf_fseek (psf, psf->dataoffset, SEEK_SET) ; } ; @@ -266,12 +274,13 @@ aiff_open (SF_PRIVATE *psf) psf->sf.frames = 0 ; } ; - psf->str_flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ; + psf->strings.flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ; if ((error = aiff_write_header (psf, SF_FALSE))) return error ; - psf->write_header = aiff_write_header ; + psf->write_header = aiff_write_header ; + psf->set_chunk = aiff_set_chunk ; } ; psf->container_close = aiff_close ; @@ -310,15 +319,20 @@ aiff_open (SF_PRIVATE *psf) break ; case SF_FORMAT_DWVW_12 : - error = dwvw_init (psf, 12) ; + if (psf->sf.frames > comm_fmt.numSampleFrames) + psf->sf.frames = comm_fmt.numSampleFrames ; break ; case SF_FORMAT_DWVW_16 : error = dwvw_init (psf, 16) ; + if (psf->sf.frames > comm_fmt.numSampleFrames) + psf->sf.frames = comm_fmt.numSampleFrames ; break ; case SF_FORMAT_DWVW_24 : error = dwvw_init (psf, 24) ; + if (psf->sf.frames > comm_fmt.numSampleFrames) + psf->sf.frames = comm_fmt.numSampleFrames ; break ; case SF_FORMAT_DWVW_N : @@ -328,7 +342,8 @@ aiff_open (SF_PRIVATE *psf) } ; if (comm_fmt.sampleSize >= 8 && comm_fmt.sampleSize < 24) { error = dwvw_init (psf, comm_fmt.sampleSize) ; - psf->sf.frames = comm_fmt.numSampleFrames ; + if (psf->sf.frames > comm_fmt.numSampleFrames) + psf->sf.frames = comm_fmt.numSampleFrames ; break ; } ; psf_log_printf (psf, "AIFC/DWVW : Bad bitwidth %d\n", comm_fmt.sampleSize) ; @@ -346,11 +361,19 @@ aiff_open (SF_PRIVATE *psf) case SF_FORMAT_GSM610 : error = gsm610_init (psf) ; + if (psf->sf.frames > comm_fmt.numSampleFrames) + psf->sf.frames = comm_fmt.numSampleFrames ; break ; default : return SFE_UNIMPLEMENTED ; } ; + if (psf->file.mode != SFM_WRITE && psf->sf.frames - comm_fmt.numSampleFrames != 0) + { psf_log_printf (psf, + "*** Frame count read from 'COMM' chunk (%u) not equal to frame count\n" + "*** calculated from length of 'SSND' chunk (%u).\n", + comm_fmt.numSampleFrames, (uint32_t) psf->sf.frames) ; + } ; return error ; } /* aiff_open */ @@ -360,24 +383,25 @@ aiff_open (SF_PRIVATE *psf) */ /* This function ought to check size */ -static unsigned int -marker_to_position (const MARK_ID_POS *m, unsigned short n, int marksize) +static uint32_t +marker_to_position (const MARK_ID_POS *m, uint16_t n, int marksize) { int i ; - for (i = 0 ; i < marksize ; i++) + for (i = 0 ; i < marksize ; i++) if (m [i].markerID == n) return m [i].position ; - return 0 ; + return 0 ; } /* marker_to_position */ static int aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) { SSND_CHUNK ssnd_fmt ; AIFF_PRIVATE *paiff ; - unsigned marker, dword, FORMsize, SSNDsize, bytesread ; + BUF_UNION ubuf ; + uint32_t chunk_size = 0, FORMsize, SSNDsize, bytesread, mark_count = 0 ; int k, found_chunk = 0, done = 0, error = 0 ; char *cptr ; - int instr_found = 0, mark_found = 0, mark_count = 0 ; + int instr_found = 0, mark_found = 0 ; if (psf->filelength > SF_PLATFORM_S64 (0xffffffff)) psf_log_printf (psf, "Warning : filelength > 0xffffffff. This is bad!!!!\n") ; @@ -401,54 +425,62 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) ** one and then check for the mandatory chunks at the end. */ while (! done) - { psf_binheader_readf (psf, "m", &marker) ; + { unsigned marker ; + size_t jump = chunk_size & 1 ; + + marker = chunk_size = 0 ; + psf_binheader_readf (psf, "Ejm4", jump, &marker, &chunk_size) ; + if (marker == 0) + { sf_count_t pos = psf_ftell (psf) ; + psf_log_printf (psf, "Have 0 marker at position %D (0x%x).\n", pos, pos) ; + break ; + } ; if (psf->file.mode == SFM_RDWR && (found_chunk & HAVE_SSND)) return SFE_AIFF_RW_SSND_NOT_LAST ; + psf_store_read_chunk_u32 (&psf->rchunks, marker, psf_ftell (psf), chunk_size) ; + switch (marker) { case FORM_MARKER : if (found_chunk) return SFE_AIFF_NO_FORM ; - psf_binheader_readf (psf, "E4", &FORMsize) ; - pchk4_store (&paiff->chunk4, marker, psf->headindex - 8, FORMsize) ; + FORMsize = chunk_size ; + + found_chunk |= HAVE_FORM ; + psf_binheader_readf (psf, "m", &marker) ; + switch (marker) + { case AIFC_MARKER : + case AIFF_MARKER : + found_chunk |= (marker == AIFC_MARKER) ? (HAVE_AIFC | HAVE_AIFF) : HAVE_AIFF ; + break ; + default : + break ; + } ; if (psf->fileoffset > 0 && psf->filelength > FORMsize + 8) { /* Set file length. */ psf->filelength = FORMsize + 8 ; - psf_log_printf (psf, "FORM : %u\n", FORMsize) ; + psf_log_printf (psf, "FORM : %u\n %M\n", FORMsize, marker) ; } - else if (FORMsize != psf->filelength - 2 * SIGNED_SIZEOF (dword)) - { dword = psf->filelength - 2 * sizeof (dword) ; - psf_log_printf (psf, "FORM : %u (should be %u)\n", FORMsize, dword) ; - FORMsize = dword ; + else if (FORMsize != psf->filelength - 2 * SIGNED_SIZEOF (chunk_size)) + { chunk_size = psf->filelength - 2 * sizeof (chunk_size) ; + psf_log_printf (psf, "FORM : %u (should be %u)\n %M\n", FORMsize, chunk_size, marker) ; + FORMsize = chunk_size ; } else - psf_log_printf (psf, "FORM : %u\n", FORMsize) ; - found_chunk |= HAVE_FORM ; + psf_log_printf (psf, "FORM : %u\n %M\n", FORMsize, marker) ; + /* Set this to 0, so we don't jump a byte when parsing the next marker. */ + chunk_size = 0 ; break ; - case AIFC_MARKER : - case AIFF_MARKER : - if ((found_chunk & HAVE_FORM) == 0) - return SFE_AIFF_AIFF_NO_FORM ; - psf_log_printf (psf, " %M\n", marker) ; - found_chunk |= (marker == AIFC_MARKER) ? (HAVE_AIFC | HAVE_AIFF) : HAVE_AIFF ; - break ; case COMM_MARKER : - paiff->comm_offset = psf_ftell (psf) - 4 ; - error = aiff_read_comm_chunk (psf, comm_fmt) ; - pchk4_store (&paiff->chunk4, marker, paiff->comm_offset, comm_fmt->size) ; - - - psf->sf.samplerate = tenbytefloat2int (comm_fmt->sampleRate) ; - psf->sf.frames = comm_fmt->numSampleFrames ; - psf->sf.channels = comm_fmt->numChannels ; - psf->bytewidth = BITWIDTH2BYTES (comm_fmt->sampleSize) ; - - if (error) + paiff->comm_offset = psf_ftell (psf) - 8 ; + chunk_size += chunk_size & 1 ; + comm_fmt->size = chunk_size ; + if ((error = aiff_read_comm_chunk (psf, comm_fmt)) != 0) return error ; found_chunk |= HAVE_COMM ; @@ -459,12 +491,9 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) if ((found_chunk & (HAVE_FORM | HAVE_AIFF | HAVE_COMM)) != (HAVE_FORM | HAVE_AIFF | HAVE_COMM)) return SFE_AIFF_PEAK_B4_COMM ; - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf->headindex - 8, dword) ; - - psf_log_printf (psf, "%M : %d\n", marker, dword) ; - if (dword != AIFF_PEAK_CHUNK_SIZE (psf->sf.channels)) - { psf_binheader_readf (psf, "j", dword) ; + psf_log_printf (psf, "%M : %d\n", marker, chunk_size) ; + if (chunk_size != AIFF_PEAK_CHUNK_SIZE (psf->sf.channels)) + { psf_binheader_readf (psf, "j", chunk_size) ; psf_log_printf (psf, "*** File PEAK chunk too big.\n") ; return SFE_WAV_BAD_PEAK ; } ; @@ -483,18 +512,18 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) psf_log_printf (psf, " time stamp : %d\n", psf->peak_info->timestamp) ; psf_log_printf (psf, " Ch Position Value\n") ; - cptr = psf->u.cbuf ; - for (dword = 0 ; dword < (unsigned) psf->sf.channels ; dword++) + cptr = ubuf.cbuf ; + for (k = 0 ; k < psf->sf.channels ; k++) { float value ; - unsigned int position ; + uint32_t position ; psf_binheader_readf (psf, "Ef4", &value, &position) ; - psf->peak_info->peaks [dword].value = value ; - psf->peak_info->peaks [dword].position = position ; + psf->peak_info->peaks [k].value = value ; + psf->peak_info->peaks [k].position = position ; - snprintf (cptr, sizeof (psf->u.scbuf), " %2d %-12" PRId64 " %g\n", - dword, psf->peak_info->peaks [dword].position, psf->peak_info->peaks [dword].value) ; - cptr [sizeof (psf->u.scbuf) - 1] = 0 ; + snprintf (cptr, sizeof (ubuf.scbuf), " %2d %-12" PRId64 " %g\n", + k, psf->peak_info->peaks [k].position, psf->peak_info->peaks [k].value) ; + cptr [sizeof (ubuf.scbuf) - 1] = 0 ; psf_log_printf (psf, "%s", cptr) ; } ; @@ -505,9 +534,9 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) if ((found_chunk & HAVE_AIFC) && (found_chunk & HAVE_FVER) == 0) psf_log_printf (psf, "*** Valid AIFC files should have an FVER chunk.\n") ; - paiff->ssnd_offset = psf_ftell (psf) - 4 ; - psf_binheader_readf (psf, "E444", &SSNDsize, &(ssnd_fmt.offset), &(ssnd_fmt.blocksize)) ; - pchk4_store (&paiff->chunk4, marker, paiff->ssnd_offset, SSNDsize) ; + paiff->ssnd_offset = psf_ftell (psf) - 8 ; + SSNDsize = chunk_size ; + psf_binheader_readf (psf, "E44", &(ssnd_fmt.offset), &(ssnd_fmt.blocksize)) ; psf->datalength = SSNDsize - sizeof (ssnd_fmt) ; psf->dataoffset = psf_ftell (psf) ; @@ -543,157 +572,148 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) break ; /* Seek to end of SSND chunk. */ - psf_fseek (psf, psf->dataoffset + psf->datalength + (SSNDsize & 1), SEEK_SET) ; + psf_fseek (psf, psf->dataoffset + psf->datalength, SEEK_SET) ; break ; case c_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - if (dword == 0) + if (chunk_size == 0) break ; - if (dword >= SIGNED_SIZEOF (psf->u.scbuf)) - { psf_log_printf (psf, " %M : %d (too big)\n", marker, dword) ; + if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf)) + { psf_log_printf (psf, " %M : %d (too big)\n", marker, chunk_size) ; return SFE_INTERNAL ; } ; - cptr = psf->u.cbuf ; - psf_binheader_readf (psf, "b", cptr, dword + (dword & 1)) ; - cptr [dword] = 0 ; + cptr = ubuf.cbuf ; + psf_binheader_readf (psf, "b", cptr, chunk_size + (chunk_size & 1)) ; + cptr [chunk_size] = 0 ; - psf_sanitize_string (cptr, dword) ; + psf_sanitize_string (cptr, chunk_size) ; psf_log_printf (psf, " %M : %s\n", marker, cptr) ; psf_store_string (psf, SF_STR_COPYRIGHT, cptr) ; + chunk_size += chunk_size & 1 ; break ; case AUTH_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - if (dword == 0) + if (chunk_size == 0) break ; - if (dword >= SIGNED_SIZEOF (psf->u.scbuf) - 1) - { psf_log_printf (psf, " %M : %d (too big)\n", marker, dword) ; + if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf) - 1) + { psf_log_printf (psf, " %M : %d (too big)\n", marker, chunk_size) ; return SFE_INTERNAL ; } ; - cptr = psf->u.cbuf ; - psf_binheader_readf (psf, "b", cptr, dword + (dword & 1)) ; - cptr [dword] = 0 ; + cptr = ubuf.cbuf ; + psf_binheader_readf (psf, "b", cptr, chunk_size + (chunk_size & 1)) ; + cptr [chunk_size] = 0 ; psf_log_printf (psf, " %M : %s\n", marker, cptr) ; psf_store_string (psf, SF_STR_ARTIST, cptr) ; + chunk_size += chunk_size & 1 ; break ; case COMT_MARKER : - { unsigned short count, id, len ; - unsigned int timestamp ; + { uint16_t count, id, len ; + uint32_t timestamp, bytes ; - psf_binheader_readf (psf, "E42", &dword, &count) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - psf_log_printf (psf, " %M : %d\n count : %d\n", marker, dword, count) ; - dword += (dword & 1) ; - if (dword == 0) + if (chunk_size == 0) break ; - dword -= 2 ; + bytes = chunk_size ; + bytes -= psf_binheader_readf (psf, "E2", &count) ; + psf_log_printf (psf, " %M : %d\n count : %d\n", marker, chunk_size, count) ; for (k = 0 ; k < count ; k++) - { dword -= psf_binheader_readf (psf, "E422", ×tamp, &id, &len) ; + { bytes -= psf_binheader_readf (psf, "E422", ×tamp, &id, &len) ; psf_log_printf (psf, " time : 0x%x\n marker : %x\n length : %d\n", timestamp, id, len) ; - if (len + 1 > SIGNED_SIZEOF (psf->u.scbuf)) + if (len + 1 > SIGNED_SIZEOF (ubuf.scbuf)) { psf_log_printf (psf, "\nError : string length (%d) too big.\n", len) ; return SFE_INTERNAL ; } ; - cptr = psf->u.cbuf ; - dword -= psf_binheader_readf (psf, "b", cptr, len) ; + cptr = ubuf.cbuf ; + bytes -= psf_binheader_readf (psf, "b", cptr, len) ; cptr [len] = 0 ; psf_log_printf (psf, " string : %s\n", cptr) ; } ; - if (dword > 0) - psf_binheader_readf (psf, "j", dword) ; + if (bytes > 0) + psf_binheader_readf (psf, "j", bytes) ; } ; break ; case APPL_MARKER : { unsigned appl_marker ; - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - if (dword == 0) + if (chunk_size == 0) break ; - if (dword >= SIGNED_SIZEOF (psf->u.scbuf) - 1) - { psf_log_printf (psf, " %M : %d (too big, skipping)\n", marker, dword) ; - psf_binheader_readf (psf, "j", dword + (dword & 1)) ; + if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf) - 1) + { psf_log_printf (psf, " %M : %u (too big, skipping)\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size + (chunk_size & 1)) ; break ; } ; - if (dword < 4) - { psf_log_printf (psf, " %M : %d (too small, skipping)\n", marker, dword) ; - psf_binheader_readf (psf, "j", dword + (dword & 1)) ; + if (chunk_size < 4) + { psf_log_printf (psf, " %M : %d (too small, skipping)\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size + (chunk_size & 1)) ; break ; } ; - cptr = psf->u.cbuf ; - psf_binheader_readf (psf, "mb", &appl_marker, cptr, dword + (dword & 1) - 4) ; - cptr [dword] = 0 ; + cptr = ubuf.cbuf ; + psf_binheader_readf (psf, "mb", &appl_marker, cptr, chunk_size + (chunk_size & 1) - 4) ; + cptr [chunk_size] = 0 ; - for (k = 0 ; k < (int) dword ; k++) + for (k = 0 ; k < (int) chunk_size ; k++) if (! psf_isprint (cptr [k])) { cptr [k] = 0 ; break ; } ; - psf_log_printf (psf, " %M : %d\n AppSig : %M\n Name : %s\n", marker, dword, appl_marker, cptr) ; + psf_log_printf (psf, " %M : %d\n AppSig : %M\n Name : %s\n", marker, chunk_size, appl_marker, cptr) ; psf_store_string (psf, SF_STR_SOFTWARE, cptr) ; + chunk_size += chunk_size & 1 ; } ; break ; case NAME_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - if (dword == 0) + if (chunk_size == 0) break ; - if (dword >= SIGNED_SIZEOF (psf->u.scbuf) - 2) - { psf_log_printf (psf, " %M : %d (too big)\n", marker, dword) ; + if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf) - 2) + { psf_log_printf (psf, " %M : %d (too big)\n", marker, chunk_size) ; return SFE_INTERNAL ; } ; - cptr = psf->u.cbuf ; - psf_binheader_readf (psf, "b", cptr, dword + (dword & 1)) ; - cptr [dword] = 0 ; + cptr = ubuf.cbuf ; + psf_binheader_readf (psf, "b", cptr, chunk_size + (chunk_size & 1)) ; + cptr [chunk_size] = 0 ; psf_log_printf (psf, " %M : %s\n", marker, cptr) ; psf_store_string (psf, SF_STR_TITLE, cptr) ; + chunk_size += chunk_size & 1 ; break ; case ANNO_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - if (dword == 0) + if (chunk_size == 0) break ; - if (dword >= SIGNED_SIZEOF (psf->u.scbuf) - 2) - { psf_log_printf (psf, " %M : %d (too big)\n", marker, dword) ; + if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf) - 2) + { psf_log_printf (psf, " %M : %d (too big)\n", marker, chunk_size) ; return SFE_INTERNAL ; } ; - cptr = psf->u.cbuf ; - psf_binheader_readf (psf, "b", cptr, dword + (dword & 1)) ; - cptr [dword] = 0 ; + cptr = ubuf.cbuf ; + psf_binheader_readf (psf, "b", cptr, chunk_size + (chunk_size & 1)) ; + cptr [chunk_size] = 0 ; psf_log_printf (psf, " %M : %s\n", marker, cptr) ; psf_store_string (psf, SF_STR_COMMENT, cptr) ; + chunk_size += chunk_size & 1 ; break ; case INST_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - if (dword != SIZEOF_INST_CHUNK) - { psf_log_printf (psf, " %M : %d (should be %d)\n", marker, dword, SIZEOF_INST_CHUNK) ; - psf_binheader_readf (psf, "j", dword) ; + if (chunk_size != SIZEOF_INST_CHUNK) + { psf_log_printf (psf, " %M : %d (should be %d)\n", marker, chunk_size, SIZEOF_INST_CHUNK) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; } ; - psf_log_printf (psf, " %M : %d\n", marker, dword) ; - { unsigned char bytes [6] ; - short gain ; + psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ; + { uint8_t bytes [6] ; + int16_t gain ; if (psf->instrument == NULL && (psf->instrument = psf_instrument_alloc ()) == NULL) return SFE_MALLOC_FAILED ; @@ -713,9 +733,9 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) psf->instrument->gain = gain ; psf_log_printf (psf, " Gain (dB) : %d\n", gain) ; } ; - { short mode ; /* 0 - no loop, 1 - forward looping, 2 - backward looping */ + { int16_t mode ; /* 0 - no loop, 1 - forward looping, 2 - backward looping */ const char *loop_mode ; - unsigned short begin, end ; + uint16_t begin, end ; psf_binheader_readf (psf, "E222", &mode, &begin, &end) ; loop_mode = get_loop_mode_str (mode) ; @@ -752,24 +772,20 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) break ; case basc_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - psf_log_printf (psf, " basc : %u\n", dword) ; + psf_log_printf (psf, " basc : %u\n", chunk_size) ; - if ((error = aiff_read_basc_chunk (psf, dword))) + if ((error = aiff_read_basc_chunk (psf, chunk_size))) return error ; break ; case MARK_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - psf_log_printf (psf, " %M : %d\n", marker, dword) ; - { unsigned short mark_id, n = 0 ; - unsigned int position ; + psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ; + { uint16_t mark_id, n = 0 ; + uint32_t position ; bytesread = psf_binheader_readf (psf, "E2", &n) ; mark_count = n ; - psf_log_printf (psf, " Count : %d\n", mark_count) ; + psf_log_printf (psf, " Count : %u\n", mark_count) ; if (paiff->markstr != NULL) { psf_log_printf (psf, "*** Second MARK chunk found. Throwing away the first.\n") ; free (paiff->markstr) ; @@ -778,31 +794,49 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) if (paiff->markstr == NULL) return SFE_MALLOC_FAILED ; - for (n = 0 ; n < mark_count && bytesread < dword ; n++) - { unsigned int pstr_len ; - unsigned char ch ; + if (mark_count > 2500) /* 2500 is close to the largest number of cues possible because of block sizes */ + { psf_log_printf (psf, " More than 2500 markers, skipping!\n") ; + psf_binheader_readf (psf, "j", chunk_size - bytesread) ; + break ; + } ; + + if ((psf->cues = psf_cues_alloc (mark_count)) == NULL) + return SFE_MALLOC_FAILED ; + + for (n = 0 ; n < mark_count && bytesread < chunk_size ; n++) + { uint32_t pstr_len ; + uint8_t ch ; bytesread += psf_binheader_readf (psf, "E241", &mark_id, &position, &ch) ; psf_log_printf (psf, " Mark ID : %u\n Position : %u\n", mark_id, position) ; + psf->cues->cue_points [n].indx = mark_id ; + psf->cues->cue_points [n].position = 0 ; + psf->cues->cue_points [n].fcc_chunk = MAKE_MARKER ('d', 'a', 't', 'a') ; /* always data */ + psf->cues->cue_points [n].chunk_start = 0 ; + psf->cues->cue_points [n].block_start = 0 ; + psf->cues->cue_points [n].sample_offset = position ; + pstr_len = (ch & 1) ? ch : ch + 1 ; - if (pstr_len < sizeof (psf->u.scbuf) - 1) - { bytesread += psf_binheader_readf (psf, "b", psf->u.scbuf, pstr_len) ; - psf->u.scbuf [pstr_len] = 0 ; + if (pstr_len < sizeof (ubuf.scbuf) - 1) + { bytesread += psf_binheader_readf (psf, "b", ubuf.scbuf, pstr_len) ; + ubuf.scbuf [pstr_len] = 0 ; } else - { unsigned int read_len = pstr_len - (sizeof (psf->u.scbuf) - 1) ; - bytesread += psf_binheader_readf (psf, "bj", psf->u.scbuf, read_len, pstr_len - read_len) ; - psf->u.scbuf [sizeof (psf->u.scbuf) - 1] = 0 ; + { uint32_t read_len = pstr_len - (sizeof (ubuf.scbuf) - 1) ; + bytesread += psf_binheader_readf (psf, "bj", ubuf.scbuf, read_len, pstr_len - read_len) ; + ubuf.scbuf [sizeof (ubuf.scbuf) - 1] = 0 ; } - psf_log_printf (psf, " Name : %s\n", psf->u.scbuf) ; + psf_log_printf (psf, " Name : %s\n", ubuf.scbuf) ; + + psf_strlcpy (psf->cues->cue_points [n].name, sizeof (psf->cues->cue_points [n].name), ubuf.cbuf) ; paiff->markstr [n].markerID = mark_id ; paiff->markstr [n].position = position ; /* - ** TODO if psf->u.scbuf is equal to + ** TODO if ubuf.scbuf is equal to ** either Beg_loop, Beg loop or beg loop and spam ** if (psf->instrument == NULL && (psf->instrument = psf_instrument_alloc ()) == NULL) ** return SFE_MALLOC_FAILED ; @@ -810,85 +844,115 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) } ; } ; mark_found++ ; - psf_binheader_readf (psf, "j", dword - bytesread) ; + psf_binheader_readf (psf, "j", chunk_size - bytesread) ; break ; case FVER_MARKER : found_chunk |= HAVE_FVER ; - /* Fall through to next case. */ + /* Falls through. */ case SFX_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - psf_log_printf (psf, " %M : %d\n", marker, dword) ; - - psf_binheader_readf (psf, "j", dword) ; + psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; case NONE_MARKER : /* Fix for broken AIFC files with incorrect COMM chunk length. */ - { unsigned char byte ; - psf_binheader_readf (psf, "1", &byte) ; - dword = byte ; - psf_binheader_readf (psf, "j", dword) ; - } + chunk_size = (chunk_size >> 24) - 3 ; + psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ; break ; case CHAN_MARKER : - psf_binheader_readf (psf, "E4", &dword) ; - pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ; - - if (dword < 12) - { psf_log_printf (psf, " %M : %d (should be >= 12)\n", marker, dword) ; - psf_binheader_readf (psf, "j", dword) ; + if (chunk_size < 12) + { psf_log_printf (psf, " %M : %d (should be >= 12)\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; } - psf_log_printf (psf, " %M : %d\n", marker, dword) ; + psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ; - if ((error = aiff_read_chanmap (psf, dword))) + if ((error = aiff_read_chanmap (psf, chunk_size))) return error ; break ; default : - if (psf_isprint ((marker >> 24) & 0xFF) && psf_isprint ((marker >> 16) & 0xFF) - && psf_isprint ((marker >> 8) & 0xFF) && psf_isprint (marker & 0xFF)) - { psf_binheader_readf (psf, "E4", &dword) ; - psf_log_printf (psf, " %M : %d (unknown marker)\n", marker, dword) ; - - psf_binheader_readf (psf, "j", dword) ; + if (chunk_size >= 0xffff0000) + { done = SF_TRUE ; + psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D with length %u. Exiting parser.\n", marker, psf_ftell (psf) - 8, chunk_size) ; break ; } ; - if ((dword = psf_ftell (psf)) & 0x03) - { psf_log_printf (psf, " Unknown chunk marker %X at position %d. Resyncing.\n", marker, dword - 4) ; + if (psf_isprint ((marker >> 24) & 0xFF) && psf_isprint ((marker >> 16) & 0xFF) + && psf_isprint ((marker >> 8) & 0xFF) && psf_isprint (marker & 0xFF)) + { psf_log_printf (psf, " %M : %u (unknown marker)\n", marker, chunk_size) ; + + psf_binheader_readf (psf, "j", chunk_size) ; + break ; + } ; + + if (psf_ftell (psf) & 0x03) + { psf_log_printf (psf, " Unknown chunk marker at position %D. Resynching.\n", psf_ftell (psf) - 8) ; psf_binheader_readf (psf, "j", -3) ; break ; } ; psf_log_printf (psf, "*** Unknown chunk marker %X at position %D. Exiting parser.\n", marker, psf_ftell (psf)) ; - done = 1 ; + done = SF_TRUE ; break ; } ; /* switch (marker) */ + if (chunk_size >= psf->filelength) + { psf_log_printf (psf, "*** Chunk size %u > file length %D. Exiting parser.\n", chunk_size, psf->filelength) ; + break ; + } ; + if ((! psf->sf.seekable) && (found_chunk & HAVE_SSND)) break ; - if (psf_ftell (psf) >= psf->filelength - (2 * SIGNED_SIZEOF (dword))) + if (psf_ftell (psf) >= psf->filelength - (2 * SIGNED_SIZEOF (int32_t))) break ; } ; /* while (1) */ if (instr_found && mark_found) - { int j ; - - for (j = 0 ; jinstrument->loop_count ; j ++) - { if (j < ARRAY_LEN (psf->instrument->loops)) - { psf->instrument->loops [j].start = marker_to_position (paiff->markstr, psf->instrument->loops [j].start, mark_count) ; - psf->instrument->loops [j].end = marker_to_position (paiff->markstr, psf->instrument->loops [j].end, mark_count) ; - psf->instrument->loops [j].mode = SF_LOOP_FORWARD ; + { int ji, str_index ; + /* Next loop will convert markers to loop positions for internal handling */ + for (ji = 0 ; ji < psf->instrument->loop_count ; ji ++) + { if (ji < ARRAY_LEN (psf->instrument->loops)) + { psf->instrument->loops [ji].start = marker_to_position (paiff->markstr, psf->instrument->loops [ji].start, mark_count) ; + psf->instrument->loops [ji].end = marker_to_position (paiff->markstr, psf->instrument->loops [ji].end, mark_count) ; + psf->instrument->loops [ji].mode = SF_LOOP_FORWARD ; } ; - } ; + } ; + + /* The markers that correspond to loop positions can now be removed from cues struct */ + if (psf->cues->cue_count > (uint32_t) (psf->instrument->loop_count * 2)) + { uint32_t j ; + + for (j = 0 ; j < psf->cues->cue_count - (uint32_t) (psf->instrument->loop_count * 2) ; j ++) + { /* This simply copies the information in cues above loop positions and writes it at current count instead */ + psf->cues->cue_points [j].indx = psf->cues->cue_points [j + psf->instrument->loop_count * 2].indx ; + psf->cues->cue_points [j].position = psf->cues->cue_points [j + psf->instrument->loop_count * 2].position ; + psf->cues->cue_points [j].fcc_chunk = psf->cues->cue_points [j + psf->instrument->loop_count * 2].fcc_chunk ; + psf->cues->cue_points [j].chunk_start = psf->cues->cue_points [j + psf->instrument->loop_count * 2].chunk_start ; + psf->cues->cue_points [j].block_start = psf->cues->cue_points [j + psf->instrument->loop_count * 2].block_start ; + psf->cues->cue_points [j].sample_offset = psf->cues->cue_points [j + psf->instrument->loop_count * 2].sample_offset ; + for (str_index = 0 ; str_index < 256 ; str_index++) + psf->cues->cue_points [j].name [str_index] = psf->cues->cue_points [j + psf->instrument->loop_count * 2].name [str_index] ; + } ; + psf->cues->cue_count -= psf->instrument->loop_count * 2 ; + } else + { /* All the cues were in fact loop positions so we can actually remove the cues altogether */ + free (psf->cues) ; + psf->cues = NULL ; + } } ; + if (psf->sf.channels < 1) + return SFE_CHANNEL_COUNT_ZERO ; + + if (psf->sf.channels > SF_MAX_CHANNELS) + return SFE_CHANNEL_COUNT ; + if (! (found_chunk & HAVE_FORM)) return SFE_AIFF_NO_FORM ; @@ -923,25 +987,22 @@ aiff_close (SF_PRIVATE *psf) static int aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) -{ int error = 0, bytesread, subformat ; +{ BUF_UNION ubuf ; + int subformat, samplerate ; - psf->u.scbuf [0] = 0 ; - - bytesread = psf_binheader_readf (psf, "E4", &(comm_fmt->size)) ; + ubuf.scbuf [0] = 0 ; /* The COMM chunk has an int aligned to an odd word boundary. Some ** procesors are not able to deal with this (ie bus fault) so we have ** to take special care. */ - comm_fmt->size += comm_fmt->size & 1 ; - bytesread += psf_binheader_readf (psf, "E242b", &(comm_fmt->numChannels), &(comm_fmt->numSampleFrames), - &(comm_fmt->sampleSize), &(comm_fmt->sampleRate), SIGNED_SIZEOF (comm_fmt->sampleRate)) ; + &(comm_fmt->sampleSize), &(comm_fmt->sampleRate), SIGNED_SIZEOF (comm_fmt->sampleRate)) ; if (comm_fmt->size > 0x10000 && (comm_fmt->size & 0xffff) == 0) { psf_log_printf (psf, " COMM : %d (0x%x) *** should be ", comm_fmt->size, comm_fmt->size) ; - comm_fmt->size = ENDSWAP_INT (comm_fmt->size) ; + comm_fmt->size = ENDSWAP_32 (comm_fmt->size) ; psf_log_printf (psf, "%d (0x%x)\n", comm_fmt->size, comm_fmt->size) ; } else @@ -950,22 +1011,30 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) if (comm_fmt->size == SIZEOF_AIFF_COMM) comm_fmt->encoding = NONE_MARKER ; else if (comm_fmt->size == SIZEOF_AIFC_COMM_MIN) - bytesread += psf_binheader_readf (psf, "Em", &(comm_fmt->encoding)) ; + psf_binheader_readf (psf, "Em", &(comm_fmt->encoding)) ; else if (comm_fmt->size >= SIZEOF_AIFC_COMM) - { unsigned char encoding_len ; + { uint8_t encoding_len ; unsigned read_len ; - bytesread += psf_binheader_readf (psf, "Em1", &(comm_fmt->encoding), &encoding_len) ; + psf_binheader_readf (psf, "Em1", &(comm_fmt->encoding), &encoding_len) ; - comm_fmt->size = SF_MIN (sizeof (psf->u.scbuf), make_size_t (comm_fmt->size)) ; - memset (psf->u.scbuf, 0, comm_fmt->size) ; + comm_fmt->size = SF_MIN (sizeof (ubuf.scbuf), make_size_t (comm_fmt->size)) ; + memset (ubuf.scbuf, 0, comm_fmt->size) ; read_len = comm_fmt->size - SIZEOF_AIFC_COMM + 1 ; - bytesread += psf_binheader_readf (psf, "b", psf->u.scbuf, read_len) ; - psf->u.scbuf [read_len + 1] = 0 ; + psf_binheader_readf (psf, "b", ubuf.scbuf, read_len) ; + ubuf.scbuf [read_len + 1] = 0 ; } ; - psf_log_printf (psf, " Sample Rate : %d\n", tenbytefloat2int (comm_fmt->sampleRate)) ; + samplerate = tenbytefloat2int (comm_fmt->sampleRate) ; + + psf_log_printf (psf, " Sample Rate : %d\n", samplerate) ; psf_log_printf (psf, " Frames : %u%s\n", comm_fmt->numSampleFrames, (comm_fmt->numSampleFrames == 0 && psf->filelength > 104) ? " (Should not be 0)" : "") ; + + if (comm_fmt->numChannels < 1 || comm_fmt->numChannels > SF_MAX_CHANNELS) + { psf_log_printf (psf, " Channels : %d (should be >= 1 and < %d)\n", comm_fmt->numChannels, SF_MAX_CHANNELS) ; + return SFE_CHANNEL_COUNT_BAD ; + } ; + psf_log_printf (psf, " Channels : %d\n", comm_fmt->numChannels) ; /* Found some broken 'fl32' files with comm.samplesize == 16. Fix it here. */ @@ -982,6 +1051,11 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) subformat = s_bitwidth_to_subformat (comm_fmt->sampleSize) ; + psf->sf.samplerate = samplerate ; + psf->sf.frames = comm_fmt->numSampleFrames ; + psf->sf.channels = comm_fmt->numChannels ; + psf->bytewidth = BITWIDTH2BYTES (comm_fmt->sampleSize) ; + psf->endian = SF_ENDIAN_BIG ; switch (comm_fmt->encoding) @@ -1046,7 +1120,6 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) break ; case GSM_MARKER : - psf->sf.format = SF_FORMAT_AIFF ; psf->sf.format = (SF_FORMAT_AIFF | SF_FORMAT_GSM610) ; break ; @@ -1058,84 +1131,78 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt) default : psf_log_printf (psf, "AIFC : Unimplemented format : %M\n", comm_fmt->encoding) ; - error = SFE_UNIMPLEMENTED ; + return SFE_UNIMPLEMENTED ; } ; - if (! psf->u.scbuf [0]) + if (! ubuf.scbuf [0]) psf_log_printf (psf, " Encoding : %M\n", comm_fmt->encoding) ; else - psf_log_printf (psf, " Encoding : %M => %s\n", comm_fmt->encoding, psf->u.scbuf) ; + psf_log_printf (psf, " Encoding : %M => %s\n", comm_fmt->encoding, ubuf.scbuf) ; - return error ; + return 0 ; } /* aiff_read_comm_chunk */ /*========================================================================================== */ -static int -aiff_rewrite_header (SF_PRIVATE *psf, AIFF_PRIVATE * paiff) +static void +aiff_rewrite_header (SF_PRIVATE *psf) { /* Assuming here that the header has already been written and just ** needs to be corrected for new data length. That means that we ** only change the length fields of the FORM and SSND chunks ; ** everything else can be skipped over. */ - int k, ch ; - int comm_size, comm_frames ; + int k, ch, comm_size, comm_frames ; psf_fseek (psf, 0, SEEK_SET) ; - psf_fread (psf->header, psf->dataoffset, 1, psf) ; + psf_fread (psf->header.ptr, psf->dataoffset, 1, psf) ; - psf->headindex = 0 ; + psf->header.indx = 0 ; - for (k = 0 ; k < paiff->chunk4.count ; k++) - { switch (paiff->chunk4.l [k].chunk) - { case FORM_MARKER : - psf_binheader_writef (psf, "Etm8", FORM_MARKER, psf->filelength - 8) ; - break ; + /* FORM chunk. */ + psf_binheader_writef (psf, "Etm8", BHWm (FORM_MARKER), BHW8 (psf->filelength - 8)) ; - case COMM_MARKER : - psf->headindex = paiff->chunk4.l [k].offset ; - comm_frames = psf->sf.frames ; - comm_size = paiff->chunk4.l [k].len ; - psf_binheader_writef (psf, "Em42t4", COMM_MARKER, comm_size, psf->sf.channels, comm_frames) ; - break ; + /* COMM chunk. */ + if ((k = psf_find_read_chunk_m32 (&psf->rchunks, COMM_MARKER)) >= 0) + { psf->header.indx = psf->rchunks.chunks [k].offset - 8 ; + comm_frames = psf->sf.frames ; + comm_size = psf->rchunks.chunks [k].len ; + psf_binheader_writef (psf, "Em42t4", BHWm (COMM_MARKER), BHW4 (comm_size), BHW2 (psf->sf.channels), BHW4 (comm_frames)) ; + } ; - case SSND_MARKER : - psf->headindex = paiff->chunk4.l [k].offset ; - psf_binheader_writef (psf, "Etm8", SSND_MARKER, psf->datalength + SIZEOF_SSND_CHUNK) ; - break ; + /* PEAK chunk. */ + if ((k = psf_find_read_chunk_m32 (&psf->rchunks, PEAK_MARKER)) >= 0) + { psf->header.indx = psf->rchunks.chunks [k].offset - 8 ; + psf_binheader_writef (psf, "Em4", BHWm (PEAK_MARKER), BHW4 (AIFF_PEAK_CHUNK_SIZE (psf->sf.channels))) ; + psf_binheader_writef (psf, "E44", BHW4 (1), BHW4 (time (NULL))) ; + for (ch = 0 ; ch < psf->sf.channels ; ch++) + psf_binheader_writef (psf, "Eft8", BHWf ((float) psf->peak_info->peaks [ch].value), BHW8 (psf->peak_info->peaks [ch].position)) ; + } ; - case PEAK_MARKER : - psf->headindex = paiff->chunk4.l [k].offset ; - psf_binheader_writef (psf, "Em4", PEAK_MARKER, AIFF_PEAK_CHUNK_SIZE (psf->sf.channels)) ; - psf_binheader_writef (psf, "E44", 1, time (NULL)) ; - for (ch = 0 ; ch < psf->sf.channels ; ch++) - psf_binheader_writef (psf, "Eft8", (float) psf->peak_info->peaks [ch].value, psf->peak_info->peaks [ch].position) ; - break ; - default : - /* There are a whole bunch of chunks we should just ignore. */ - break ; - } ; + /* SSND chunk. */ + if ((k = psf_find_read_chunk_m32 (&psf->rchunks, SSND_MARKER)) >= 0) + { psf->header.indx = psf->rchunks.chunks [k].offset - 8 ; + psf_binheader_writef (psf, "Etm8", BHWm (SSND_MARKER), BHW8 (psf->datalength + SIZEOF_SSND_CHUNK)) ; } ; /* Header mangling complete so write it out. */ psf_fseek (psf, 0, SEEK_SET) ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; - return 0 ; + return ; } /* aiff_rewrite_header */ static int aiff_write_header (SF_PRIVATE *psf, int calc_length) { sf_count_t current ; AIFF_PRIVATE *paiff ; - unsigned char comm_sample_rate [10], comm_zero_bytes [2] = { 0, 0 } ; - unsigned int comm_type, comm_size, comm_encoding, comm_frames = 0 ; + uint8_t comm_sample_rate [10], comm_zero_bytes [2] = { 0, 0 } ; + uint32_t comm_type, comm_size, comm_encoding, comm_frames = 0, uk ; int k, endian, has_data = SF_FALSE ; - short bit_width ; + int16_t bit_width ; if ((paiff = psf->container_data) == NULL) return SFE_INTERNAL ; @@ -1156,11 +1223,11 @@ aiff_write_header (SF_PRIVATE *psf, int calc_length) psf->sf.frames = psf->datalength / (psf->bytewidth * psf->sf.channels) ; } ; - if (psf->file.mode == SFM_RDWR && psf->dataoffset > 0 && paiff->chunk4.count > 0) - { int err = aiff_rewrite_header (psf, paiff) ; + if (psf->file.mode == SFM_RDWR && psf->dataoffset > 0 && psf->rchunks.count > 0) + { aiff_rewrite_header (psf) ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; - return err ; + return 0 ; } ; endian = SF_ENDIAN (psf->sf.format) ; @@ -1328,117 +1395,87 @@ aiff_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; - psf_binheader_writef (psf, "Etm8", FORM_MARKER, psf->filelength - 8) ; + psf_binheader_writef (psf, "Etm8", BHWm (FORM_MARKER), BHW8 (psf->filelength - 8)) ; /* Write AIFF/AIFC marker and COM chunk. */ if (comm_type == AIFC_MARKER) /* AIFC must have an FVER chunk. */ - psf_binheader_writef (psf, "Emm44", comm_type, FVER_MARKER, 4, 0xA2805140) ; + psf_binheader_writef (psf, "Emm44", BHWm (comm_type), BHWm (FVER_MARKER), BHW4 (4), BHW4 (0xA2805140)) ; else - psf_binheader_writef (psf, "Em", comm_type) ; + psf_binheader_writef (psf, "Em", BHWm (comm_type)) ; - paiff->comm_offset = psf->headindex - 8 ; + paiff->comm_offset = psf->header.indx - 8 ; memset (comm_sample_rate, 0, sizeof (comm_sample_rate)) ; uint2tenbytefloat (psf->sf.samplerate, comm_sample_rate) ; - psf_binheader_writef (psf, "Em42t42", COMM_MARKER, comm_size, psf->sf.channels, comm_frames, bit_width) ; - psf_binheader_writef (psf, "b", comm_sample_rate, sizeof (comm_sample_rate)) ; + psf_binheader_writef (psf, "Em42t42", BHWm (COMM_MARKER), BHW4 (comm_size), BHW2 (psf->sf.channels), BHW4 (comm_frames), BHW2 (bit_width)) ; + psf_binheader_writef (psf, "b", BHWv (comm_sample_rate), BHWz (sizeof (comm_sample_rate))) ; /* AIFC chunks have some extra data. */ if (comm_type == AIFC_MARKER) - psf_binheader_writef (psf, "mb", comm_encoding, comm_zero_bytes, sizeof (comm_zero_bytes)) ; + psf_binheader_writef (psf, "mb", BHWm (comm_encoding), BHWv (comm_zero_bytes), BHWz (sizeof (comm_zero_bytes))) ; if (psf->channel_map && paiff->chanmap_tag) - psf_binheader_writef (psf, "Em4444", CHAN_MARKER, 12, paiff->chanmap_tag, 0, 0) ; + psf_binheader_writef (psf, "Em4444", BHWm (CHAN_MARKER), BHW4 (12), BHW4 (paiff->chanmap_tag), BHW4 (0), BHW4 (0)) ; - if (psf->instrument != NULL) - { MARK_ID_POS m [4] ; - INST_CHUNK ch ; - unsigned short ct = 0 ; + /* Check if there's a INST chunk to write */ + if (psf->instrument != NULL && psf->cues != NULL) + { /* Huge chunk of code removed here because it had egregious errors that were + ** not detected by either the compiler or the tests. It was found when updating + ** the way psf_binheader_writef works. + */ + } + else if (psf->instrument == NULL && psf->cues != NULL) + { /* There are cues but no loops */ + uint32_t idx ; + int totalStringLength = 0, stringLength ; - memset (m, 0, sizeof (m)) ; - memset (&ch, 0, sizeof (ch)) ; - - ch.baseNote = psf->instrument->basenote ; - ch.detune = psf->instrument->detune ; - ch.lowNote = psf->instrument->key_lo ; - ch.highNote = psf->instrument->key_hi ; - ch.lowVelocity = psf->instrument->velocity_lo ; - ch.highVelocity = psf->instrument->velocity_hi ; - ch.gain = psf->instrument->gain ; - if (psf->instrument->loops [0].mode != SF_LOOP_NONE) - { ch.sustain_loop.playMode = 1 ; - ch.sustain_loop.beginLoop = ct ; - m [0].markerID = ct++ ; - m [0].position = psf->instrument->loops [0].start ; - ch.sustain_loop.endLoop = ct ; - m [1].markerID = ct++ ; - m [1].position = psf->instrument->loops [0].end ; - } ; - if (psf->instrument->loops [1].mode != SF_LOOP_NONE) - { ch.release_loop.playMode = 1 ; - ch.release_loop.beginLoop = ct ; - m [2].markerID = ct++ ; - m [2].position = psf->instrument->loops [1].start ; - ch.release_loop.endLoop = ct ; - m [3].markerID = ct++ ; - m [3].position = psf->instrument->loops [1].end ; - } - else - { ch.release_loop.playMode = 0 ; - ch.release_loop.beginLoop = 0 ; - ch.release_loop.endLoop = 0 ; + /* Here we count how many bytes will the pascal strings need */ + for (idx = 0 ; idx < psf->cues->cue_count ; idx++) + { stringLength = strlen (psf->cues->cue_points [idx].name) + 1 ; /* We'll count the first byte also of every pascal string */ + totalStringLength += stringLength + (stringLength % 2 == 0 ? 0 : 1) ; } ; - psf_binheader_writef (psf, "Em4111111", INST_MARKER, SIZEOF_INST_CHUNK, ch.baseNote, ch.detune, - ch.lowNote, ch.highNote, ch.lowVelocity, ch.highVelocity) ; - psf_binheader_writef (psf, "2222222", ch.gain, ch.sustain_loop.playMode, - ch.sustain_loop.beginLoop, ch.sustain_loop.endLoop, ch.release_loop.playMode, - ch.release_loop.beginLoop, ch.release_loop.endLoop) ; + psf_binheader_writef (psf, "Em42", + BHWm (MARK_MARKER), BHW4 (2 + psf->cues->cue_count * (2 + 4) + totalStringLength), BHW2 (psf->cues->cue_count)) ; - if (ct == 2) - psf_binheader_writef (psf, "Em42241b241b", - MARK_MARKER, 2 + 2 * (2 + 4 + 1 + 9), 2, - m [0].markerID, m [0].position, 8, "beg loop", make_size_t (9), - m [1].markerID, m [1].position, 8, "end loop", make_size_t (9)) ; - else if (ct == 4) - psf_binheader_writef (psf, "Em42 241b 241b 241b 241b", - MARK_MARKER, 2 + 4 * (2 + 4 + 1 + 9), 4, - m [0].markerID, m [0].position, 8, "beg loop", make_size_t (9), - m [1].markerID, m [1].position, 8, "end loop", make_size_t (9), - m [2].markerID, m [2].position, 8, "beg loop", make_size_t (9), - m [3].markerID, m [3].position, 8, "end loop", make_size_t (9)) ; + for (idx = 0 ; idx < psf->cues->cue_count ; idx++) + psf_binheader_writef (psf, "E24p", BHW2 (psf->cues->cue_points [idx].indx), BHW4 (psf->cues->cue_points [idx].sample_offset), BHWp (psf->cues->cue_points [idx].name)) ; } ; - if (psf->str_flags & SF_STR_LOCATE_START) + if (psf->strings.flags & SF_STR_LOCATE_START) aiff_write_strings (psf, SF_STR_LOCATE_START) ; if (psf->peak_info != NULL && psf->peak_info->peak_loc == SF_PEAK_START) - { psf_binheader_writef (psf, "Em4", PEAK_MARKER, AIFF_PEAK_CHUNK_SIZE (psf->sf.channels)) ; - psf_binheader_writef (psf, "E44", 1, time (NULL)) ; + { psf_binheader_writef (psf, "Em4", BHWm (PEAK_MARKER), BHW4 (AIFF_PEAK_CHUNK_SIZE (psf->sf.channels))) ; + psf_binheader_writef (psf, "E44", BHW4 (1), BHW4 (time (NULL))) ; for (k = 0 ; k < psf->sf.channels ; k++) - psf_binheader_writef (psf, "Eft8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ; + psf_binheader_writef (psf, "Eft8", BHWf ((float) psf->peak_info->peaks [k].value), BHW8 (psf->peak_info->peaks [k].position)) ; } ; + /* Write custom headers. */ + for (uk = 0 ; uk < psf->wchunks.used ; uk++) + psf_binheader_writef (psf, "Em4b", BHWm (psf->wchunks.chunks [uk].mark32), BHW4 (psf->wchunks.chunks [uk].len), BHWv (psf->wchunks.chunks [uk].data), BHWz (psf->wchunks.chunks [uk].len)) ; + /* Write SSND chunk. */ - paiff->ssnd_offset = psf->headindex ; - psf_binheader_writef (psf, "Etm844", SSND_MARKER, psf->datalength + SIZEOF_SSND_CHUNK, 0, 0) ; + paiff->ssnd_offset = psf->header.indx ; + psf_binheader_writef (psf, "Etm844", BHWm (SSND_MARKER), BHW8 (psf->datalength + SIZEOF_SSND_CHUNK), BHW4 (0), BHW4 (0)) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - if (has_data && psf->dataoffset != psf->headindex) + if (has_data && psf->dataoffset != psf->header.indx) return psf->error = SFE_INTERNAL ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (! has_data) psf_fseek (psf, psf->dataoffset, SEEK_SET) ; @@ -1453,30 +1490,30 @@ aiff_write_tailer (SF_PRIVATE *psf) { int k ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf->dataend = psf_fseek (psf, 0, SEEK_END) ; /* Make sure tailer data starts at even byte offset. Pad if necessary. */ if (psf->dataend % 2 == 1) - { psf_fwrite (psf->header, 1, 1, psf) ; + { psf_fwrite (psf->header.ptr, 1, 1, psf) ; psf->dataend ++ ; } ; if (psf->peak_info != NULL && psf->peak_info->peak_loc == SF_PEAK_END) - { psf_binheader_writef (psf, "Em4", PEAK_MARKER, AIFF_PEAK_CHUNK_SIZE (psf->sf.channels)) ; - psf_binheader_writef (psf, "E44", 1, time (NULL)) ; + { psf_binheader_writef (psf, "Em4", BHWm (PEAK_MARKER), BHW4 (AIFF_PEAK_CHUNK_SIZE (psf->sf.channels))) ; + psf_binheader_writef (psf, "E44", BHW4 (1), BHW4 (time (NULL))) ; for (k = 0 ; k < psf->sf.channels ; k++) - psf_binheader_writef (psf, "Eft8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ; + psf_binheader_writef (psf, "Eft8", BHWf ((float) psf->peak_info->peaks [k].value), BHW8 (psf->peak_info->peaks [k].position)) ; } ; - if (psf->str_flags & SF_STR_LOCATE_END) + if (psf->strings.flags & SF_STR_LOCATE_END) aiff_write_strings (psf, SF_STR_LOCATE_END) ; /* Write the tailer. */ - if (psf->headindex > 0) - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + if (psf->header.indx > 0) + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; return 0 ; } /* aiff_write_tailer */ @@ -1486,37 +1523,37 @@ aiff_write_strings (SF_PRIVATE *psf, int location) { int k, slen ; for (k = 0 ; k < SF_MAX_STRINGS ; k++) - { if (psf->strings [k].type == 0) + { if (psf->strings.data [k].type == 0) break ; - if (psf->strings [k].flags != location) + if (psf->strings.data [k].flags != location) continue ; - switch (psf->strings [k].type) + switch (psf->strings.data [k].type) { case SF_STR_SOFTWARE : - slen = strlen (psf->strings [k].str) ; - psf_binheader_writef (psf, "Em4mb", APPL_MARKER, slen + 4, m3ga_MARKER, psf->strings [k].str, make_size_t (slen + (slen & 1))) ; + slen = strlen (psf->strings.storage + psf->strings.data [k].offset) ; + psf_binheader_writef (psf, "Em4mb", BHWm (APPL_MARKER), BHW4 (slen + 4), BHWm (m3ga_MARKER), BHWv (psf->strings.storage + psf->strings.data [k].offset), BHWz (slen + (slen & 1))) ; break ; case SF_STR_TITLE : - psf_binheader_writef (psf, "EmS", NAME_MARKER, psf->strings [k].str) ; + psf_binheader_writef (psf, "EmS", BHWm (NAME_MARKER), BHWS (psf->strings.storage + psf->strings.data [k].offset)) ; break ; case SF_STR_COPYRIGHT : - psf_binheader_writef (psf, "EmS", c_MARKER, psf->strings [k].str) ; + psf_binheader_writef (psf, "EmS", BHWm (c_MARKER), BHWS (psf->strings.storage + psf->strings.data [k].offset)) ; break ; case SF_STR_ARTIST : - psf_binheader_writef (psf, "EmS", AUTH_MARKER, psf->strings [k].str) ; + psf_binheader_writef (psf, "EmS", BHWm (AUTH_MARKER), BHWS (psf->strings.storage + psf->strings.data [k].offset)) ; break ; case SF_STR_COMMENT : - psf_binheader_writef (psf, "EmS", ANNO_MARKER, psf->strings [k].str) ; + psf_binheader_writef (psf, "EmS", BHWm (ANNO_MARKER), BHWS (psf->strings.storage + psf->strings.data [k].offset)) ; break ; /* case SF_STR_DATE : - psf_binheader_writef (psf, "Ems", ICRD_MARKER, psf->strings [k].str) ; + psf_binheader_writef (psf, "Ems", BHWm (ICRD_MARKER), BHWs (psf->strings.data [k].str)) ; break ; */ } ; @@ -1541,13 +1578,11 @@ aiff_command (SF_PRIVATE * psf, int command, void * UNUSED (data), int UNUSED (d break ; } ; - - return 0 ; } /* aiff_command */ static const char* -get_loop_mode_str (short mode) +get_loop_mode_str (int16_t mode) { switch (mode) { case 0 : return "none" ; case 1 : return "forward" ; @@ -1557,8 +1592,8 @@ get_loop_mode_str (short mode) return "*** unknown" ; } /* get_loop_mode_str */ -static short -get_loop_mode (short mode) +static int16_t +get_loop_mode (int16_t mode) { switch (mode) { case 0 : return SF_LOOP_NONE ; case 1 : return SF_LOOP_FORWARD ; @@ -1578,7 +1613,7 @@ get_loop_mode (short mode) */ static int -tenbytefloat2int (unsigned char *bytes) +tenbytefloat2int (uint8_t *bytes) { int val = 3 ; if (bytes [0] & 0x80) /* Negative number. */ @@ -1603,8 +1638,8 @@ tenbytefloat2int (unsigned char *bytes) } /* tenbytefloat2int */ static void -uint2tenbytefloat (unsigned int num, unsigned char *bytes) -{ unsigned int mask = 0x40000000 ; +uint2tenbytefloat (uint32_t num, uint8_t *bytes) +{ uint32_t mask = 0x40000000 ; int count ; if (num <= 1) @@ -1621,13 +1656,13 @@ uint2tenbytefloat (unsigned int num, unsigned char *bytes) return ; } ; - for (count = 0 ; count <= 32 ; count ++) + for (count = 0 ; count < 32 ; count ++) { if (num & mask) break ; mask >>= 1 ; } ; - num <<= count + 1 ; + num = count < 31 ? num << (count + 1) : 0 ; bytes [1] = 29 - count ; bytes [2] = (num >> 24) & 0xFF ; bytes [3] = (num >> 16) & 0xFF ; @@ -1723,7 +1758,7 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword) psf_binheader_readf (psf, "j", dword - bytesread) ; if (map_info->channel_map != NULL) - { size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ; + { size_t chanmap_size = SF_MIN (psf->sf.channels, layout_tag & 0xffff) * sizeof (psf->channel_map [0]) ; free (psf->channel_map) ; @@ -1736,3 +1771,49 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword) return 0 ; } /* aiff_read_chanmap */ +/*============================================================================== +*/ + +static int +aiff_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) +{ return psf_save_write_chunk (&psf->wchunks, chunk_info) ; +} /* aiff_set_chunk */ + +static SF_CHUNK_ITERATOR * +aiff_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) +{ return psf_next_chunk_iterator (&psf->rchunks, iterator) ; +} /* aiff_next_chunk_iterator */ + +static int +aiff_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ int indx ; + + if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0) + return SFE_UNKNOWN_CHUNK ; + + chunk_info->datalen = psf->rchunks.chunks [indx].len ; + + return SFE_NO_ERROR ; +} /* aiff_get_chunk_size */ + +static int +aiff_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ sf_count_t pos ; + int indx ; + + if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0) + return SFE_UNKNOWN_CHUNK ; + + if (chunk_info->data == NULL) + return SFE_BAD_CHUNK_DATA_PTR ; + + chunk_info->id_size = psf->rchunks.chunks [indx].id_size ; + memcpy (chunk_info->id, psf->rchunks.chunks [indx].id, sizeof (chunk_info->id) / sizeof (*chunk_info->id)) ; + + pos = psf_ftell (psf) ; + psf_fseek (psf, psf->rchunks.chunks [indx].offset, SEEK_SET) ; + psf_fread (chunk_info->data, SF_MIN (chunk_info->datalen, psf->rchunks.chunks [indx].len), 1, psf) ; + psf_fseek (psf, pos, SEEK_SET) ; + + return SFE_NO_ERROR ; +} /* aiff_get_chunk_data */ diff --git a/lib-src/libsndfile/src/alac.c b/lib-src/libsndfile/src/alac.c new file mode 100644 index 000000000..f83dd2fae --- /dev/null +++ b/lib-src/libsndfile/src/alac.c @@ -0,0 +1,997 @@ +/* +** Copyright (C) 2011-2016 Erik de Castro Lopo +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include +#include + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" +#include "ALAC/alac_codec.h" +#include "ALAC/ALACBitUtilities.h" + +#define ALAC_MAX_FRAME_SIZE 8192 +#define ALAC_BYTE_BUFFER_SIZE 0x20000 +#define ALAC_MAX_CHANNEL_COUNT 8 // Same as kALACMaxChannels in /ALACAudioTypes.h + +typedef struct +{ uint32_t current, count, allocated ; + uint32_t packet_size [] ; +} PAKT_INFO ; + +typedef struct +{ sf_count_t input_data_pos ; + + PAKT_INFO * pakt_info ; + + int channels, final_write_block ; + + uint32_t frames_this_block, partial_block_frames, frames_per_block ; + uint32_t bits_per_sample, kuki_size ; + + + /* Can't have a decoder and an encoder at the same time so stick + ** them in an un-named union. + */ + union + { ALAC_DECODER decoder ; + ALAC_ENCODER encoder ; + } ; + + char enctmpname [512] ; + FILE *enctmp ; + + uint8_t byte_buffer [ALAC_MAX_CHANNEL_COUNT * ALAC_BYTE_BUFFER_SIZE] ; + + int buffer [] ; + +} ALAC_PRIVATE ; + +/*============================================================================================ +*/ + +static int alac_reader_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) ; +static int alac_writer_init (SF_PRIVATE *psf) ; + +static sf_count_t alac_reader_calc_frames (SF_PRIVATE *psf, ALAC_PRIVATE *plac) ; + +static sf_count_t alac_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; +static sf_count_t alac_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; +static sf_count_t alac_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; +static sf_count_t alac_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; + +static sf_count_t alac_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; +static sf_count_t alac_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; +static sf_count_t alac_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; +static sf_count_t alac_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; + +static sf_count_t alac_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; + +static int alac_close (SF_PRIVATE *psf) ; +static int alac_byterate (SF_PRIVATE *psf) ; + +static int alac_decode_block (SF_PRIVATE *psf, ALAC_PRIVATE *plac) ; +static int alac_encode_block (ALAC_PRIVATE *plac) ; + +static uint32_t alac_kuki_read (SF_PRIVATE * psf, uint32_t kuki_offset, uint8_t * kuki, size_t kuki_maxlen) ; + +static PAKT_INFO * alac_pakt_alloc (uint32_t initial_count) ; +static PAKT_INFO * alac_pakt_read_decode (SF_PRIVATE * psf, uint32_t pakt_offset) ; +static PAKT_INFO * alac_pakt_append (PAKT_INFO * info, uint32_t value) ; +static uint8_t * alac_pakt_encode (const SF_PRIVATE *psf, uint32_t * pakt_size) ; +static sf_count_t alac_pakt_block_offset (const PAKT_INFO *info, uint32_t block) ; + +static const char * alac_error_string (int error) ; + +/*============================================================================================ +** ALAC Reader initialisation function. +*/ + +int +alac_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) +{ int error ; + + if ((psf->codec_data = calloc (1, sizeof (ALAC_PRIVATE) + psf->sf.channels * sizeof (int) * ALAC_MAX_FRAME_SIZE)) == NULL) + return SFE_MALLOC_FAILED ; + + psf->codec_close = alac_close ; + + switch (psf->file.mode) + { case SFM_RDWR : + return SFE_BAD_MODE_RW ; + + case SFM_READ : + if ((error = alac_reader_init (psf, info))) + return error ; + break ; + + case SFM_WRITE : + if ((error = alac_writer_init (psf))) + return error ; + break ; + + default : + psf_log_printf (psf, "%s : Bad psf->file.mode.\n", __func__) ; + return SFE_INTERNAL ; + } ; + + psf->byterate = alac_byterate ; + + return 0 ; +} /* aiff_alac_init */ + +void +alac_get_desc_chunk_items (int subformat, uint32_t *fmt_flags, uint32_t *frames_per_packet) +{ switch (subformat) + { case SF_FORMAT_ALAC_16 : + *fmt_flags = 1 ; + break ; + case SF_FORMAT_ALAC_20 : + *fmt_flags = 2 ; + break ; + case SF_FORMAT_ALAC_24 : + *fmt_flags = 3 ; + break ; + case SF_FORMAT_ALAC_32 : + *fmt_flags = 4 ; + break ; + default : + break ; + } ; + *frames_per_packet = ALAC_FRAME_LENGTH ; +} /* alac_get_desc_chunk_items */ + +static int +alac_close (SF_PRIVATE *psf) +{ ALAC_PRIVATE *plac ; + BUF_UNION ubuf ; + + plac = psf->codec_data ; + + if (psf->file.mode == SFM_WRITE) + { ALAC_ENCODER *penc = &plac->encoder ; + SF_CHUNK_INFO chunk_info ; + sf_count_t readcount ; + uint8_t kuki_data [1024] ; + uint32_t pakt_size = 0, saved_partial_block_frames ; + + plac->final_write_block = 1 ; + saved_partial_block_frames = plac->partial_block_frames ; + + /* If a block has been partially assembled, write it out as the final block. */ + if (plac->partial_block_frames && plac->partial_block_frames < plac->frames_per_block) + alac_encode_block (plac) ; + + plac->partial_block_frames = saved_partial_block_frames ; + + alac_get_magic_cookie (penc, kuki_data, &plac->kuki_size) ; + + memset (&chunk_info, 0, sizeof (chunk_info)) ; + chunk_info.id_size = snprintf (chunk_info.id, sizeof (chunk_info.id), "kuki") ; + chunk_info.data = kuki_data ; + chunk_info.datalen = plac->kuki_size ; + psf_save_write_chunk (&psf->wchunks, &chunk_info) ; + + memset (&chunk_info, 0, sizeof (chunk_info)) ; + chunk_info.id_size = snprintf (chunk_info.id, sizeof (chunk_info.id), "pakt") ; + chunk_info.data = alac_pakt_encode (psf, &pakt_size) ; + chunk_info.datalen = pakt_size ; + psf_save_write_chunk (&psf->wchunks, &chunk_info) ; + + free (chunk_info.data) ; + chunk_info.data = NULL ; + + psf->write_header (psf, 1) ; + + if (plac->enctmp != NULL) + { fseek (plac->enctmp, 0, SEEK_SET) ; + + while ((readcount = fread (ubuf.ucbuf, 1, sizeof (ubuf.ucbuf), plac->enctmp)) > 0) + psf_fwrite (ubuf.ucbuf, 1, readcount, psf) ; + fclose (plac->enctmp) ; + remove (plac->enctmpname) ; + } ; + } ; + + if (plac->pakt_info) + free (plac->pakt_info) ; + plac->pakt_info = NULL ; + + return 0 ; +} /* alac_close */ + +static int +alac_byterate (SF_PRIVATE *psf) +{ + if (psf->file.mode == SFM_READ) + return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ; + + return -1 ; +} /* alac_byterate */ + +/*============================================================================================ +** ALAC initialisation Functions. +*/ + +static int +alac_reader_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) +{ ALAC_PRIVATE *plac ; + uint32_t kuki_size ; + int error ; + union { uint8_t kuki [512] ; uint32_t alignment ; } u ; + + if (info == NULL) + { psf_log_printf (psf, "%s : ALAC_DECODER_INFO is NULL.\n", __func__) ; + return SFE_INTERNAL ; + } ; + + if (info->frames_per_packet > ALAC_FRAME_LENGTH) + { psf_log_printf (psf, "*** Error : frames_per_packet (%u) is too big. ***\n", info->frames_per_packet) ; + return SFE_INTERNAL ; + } ; + + plac = psf->codec_data ; + + plac->channels = psf->sf.channels ; + plac->frames_per_block = info->frames_per_packet ; + plac->bits_per_sample = info->bits_per_sample ; + + if (plac->pakt_info != NULL) + free (plac->pakt_info) ; + plac->pakt_info = alac_pakt_read_decode (psf, info->pakt_offset) ; + + if (plac->pakt_info == NULL) + { psf_log_printf (psf, "%s : alac_pkt_read() returns NULL.\n", __func__) ; + return SFE_INTERNAL ; + } ; + + /* Read in the ALAC cookie data and pass it to the init function. */ + kuki_size = alac_kuki_read (psf, info->kuki_offset, u.kuki, sizeof (u.kuki)) ; + + if ((error = alac_decoder_init (&plac->decoder, u.kuki, kuki_size)) != ALAC_noErr) + { psf_log_printf (psf, "*** alac_decoder_init() returned %s. ***\n", alac_error_string (error)) ; + return SFE_INTERNAL ; + } ; + + + if (plac->decoder.mNumChannels != (unsigned) psf->sf.channels) + { psf_log_printf (psf, "*** Initialized decoder has %u channels, but it should be %d. ***\n", plac->decoder.mNumChannels, psf->sf.channels) ; + return SFE_INTERNAL ; + } ; + + switch (info->bits_per_sample) + { case 16 : + case 20 : + case 24 : + case 32 : + psf->read_short = alac_read_s ; + psf->read_int = alac_read_i ; + psf->read_float = alac_read_f ; + psf->read_double = alac_read_d ; + break ; + + default : + printf ("%s : info->bits_per_sample %u\n", __func__, info->bits_per_sample) ; + return SFE_UNSUPPORTED_ENCODING ; + } ; + + psf->codec_close = alac_close ; + psf->seek = alac_seek ; + + psf->sf.frames = alac_reader_calc_frames (psf, plac) ; + alac_seek (psf, SFM_READ, 0) ; + + return 0 ; +} /* alac_reader_init */ + +static int +alac_writer_init (SF_PRIVATE *psf) +{ ALAC_PRIVATE *plac ; + uint32_t alac_format_flags = 0 ; + + plac = psf->codec_data ; + + if (psf->file.mode != SFM_WRITE) + return SFE_BAD_MODE_RW ; + + plac->channels = psf->sf.channels ; + plac->kuki_size = alac_get_magic_cookie_size (psf->sf.channels) ; + + psf->write_short = alac_write_s ; + psf->write_int = alac_write_i ; + psf->write_float = alac_write_f ; + psf->write_double = alac_write_d ; + + switch (SF_CODEC (psf->sf.format)) + { case SF_FORMAT_ALAC_16 : + alac_format_flags = 1 ; + plac->bits_per_sample = 16 ; + break ; + + case SF_FORMAT_ALAC_20 : + alac_format_flags = 2 ; + plac->bits_per_sample = 20 ; + break ; + + case SF_FORMAT_ALAC_24 : + alac_format_flags = 3 ; + plac->bits_per_sample = 24 ; + break ; + + case SF_FORMAT_ALAC_32 : + alac_format_flags = 4 ; + plac->bits_per_sample = 32 ; + break ; + + default : + psf_log_printf (psf, "%s : Can't figure out bits per sample.\n", __func__) ; + return SFE_UNIMPLEMENTED ; + } ; + + plac->frames_per_block = ALAC_FRAME_LENGTH ; + + plac->pakt_info = alac_pakt_alloc (2000) ; + + if ((plac->enctmp = psf_open_tmpfile (plac->enctmpname, sizeof (plac->enctmpname))) == NULL) + { psf_log_printf (psf, "Error : Failed to open temp file '%s' : \n", plac->enctmpname, strerror (errno)) ; + return SFE_ALAC_FAIL_TMPFILE ; + } ; + + alac_encoder_init (&plac->encoder, psf->sf.samplerate, psf->sf.channels, alac_format_flags, ALAC_FRAME_LENGTH) ; + + return 0 ; +} /* alac_writer_init */ + +/*============================================================================================ +** ALAC block decoder and encoder. +*/ + +static inline uint32_t +alac_reader_next_packet_size (PAKT_INFO * info) +{ if (info->current >= info->count) + return 0 ; + return info->packet_size [info->current++] ; +} /* alac_reader_next_packet_size */ + +static sf_count_t +alac_reader_calc_frames (SF_PRIVATE *psf, ALAC_PRIVATE *plac) +{ sf_count_t frames = 0 ; + uint32_t current_pos = 1, blocks = 0 ; + + plac->pakt_info->current = 0 ; + + while (current_pos < psf->filelength && current_pos > 0) + { current_pos = alac_reader_next_packet_size (plac->pakt_info) ; + blocks = current_pos > 0 ? blocks + 1 : blocks ; + } ; + + if (blocks == 0) + return 0 ; + + /* Only count full blocks. */ + frames = plac->frames_per_block * (blocks - 1) ; + + alac_seek (psf, SFM_READ, frames) ; + alac_decode_block (psf, plac) ; + frames += plac->frames_this_block ; + + plac->pakt_info->current = 0 ; + + return frames ; +} /* alac_reader_calc_frames */ + +static int +alac_decode_block (SF_PRIVATE *psf, ALAC_PRIVATE *plac) +{ ALAC_DECODER *pdec = &plac->decoder ; + uint32_t packet_size ; + BitBuffer bit_buffer ; + + packet_size = alac_reader_next_packet_size (plac->pakt_info) ; + if (packet_size == 0) + { if (plac->pakt_info->current < plac->pakt_info->count) + psf_log_printf (psf, "packet_size is 0 (%d of %d)\n", plac->pakt_info->current, plac->pakt_info->count) ; + return 0 ; + } ; + + psf_fseek (psf, plac->input_data_pos, SEEK_SET) ; + + if (packet_size > sizeof (plac->byte_buffer)) + { psf_log_printf (psf, "%s : bad packet_size (%u)\n", __func__, packet_size) ; + return 0 ; + } ; + + if ((packet_size != psf_fread (plac->byte_buffer, 1, packet_size, psf))) + return 0 ; + + BitBufferInit (&bit_buffer, plac->byte_buffer, packet_size) ; + + plac->input_data_pos += packet_size ; + plac->frames_this_block = 0 ; + alac_decode (pdec, &bit_buffer, plac->buffer, plac->frames_per_block, &plac->frames_this_block) ; + + plac->partial_block_frames = 0 ; + + return 1 ; +} /* alac_decode_block */ + + +static int +alac_encode_block (ALAC_PRIVATE *plac) +{ ALAC_ENCODER *penc = &plac->encoder ; + uint32_t num_bytes = 0 ; + + alac_encode (penc, plac->partial_block_frames, plac->buffer, plac->byte_buffer, &num_bytes) ; + + if (fwrite (plac->byte_buffer, 1, num_bytes, plac->enctmp) != num_bytes) + return 0 ; + if ((plac->pakt_info = alac_pakt_append (plac->pakt_info, num_bytes)) == NULL) + return 0 ; + + plac->partial_block_frames = 0 ; + + return 1 ; +} /* alac_encode_block */ + +/*============================================================================================ +** ALAC read functions. +*/ + +static sf_count_t +alac_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) +{ ALAC_PRIVATE *plac ; + int *iptr ; + int k, readcount ; + sf_count_t total = 0 ; + + if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL) + return 0 ; + + while (len > 0) + { if (plac->partial_block_frames >= plac->frames_this_block && alac_decode_block (psf, plac) == 0) + break ; + + readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ; + readcount = readcount > len ? len : readcount ; + + iptr = plac->buffer + plac->partial_block_frames * plac->channels ; + + for (k = 0 ; k < readcount ; k++) + ptr [total + k] = iptr [k] >> 16 ; + + plac->partial_block_frames += readcount / plac->channels ; + total += readcount ; + len -= readcount ; + } ; + + return total ; +} /* alac_read_s */ + +static sf_count_t +alac_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) +{ ALAC_PRIVATE *plac ; + int *iptr ; + int k, readcount ; + sf_count_t total = 0 ; + + if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL) + return 0 ; + + while (len > 0) + { if (plac->partial_block_frames >= plac->frames_this_block && alac_decode_block (psf, plac) == 0) + break ; + + readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ; + readcount = readcount > len ? len : readcount ; + + iptr = plac->buffer + plac->partial_block_frames * plac->channels ; + + for (k = 0 ; k < readcount ; k++) + ptr [total + k] = iptr [k] ; + + plac->partial_block_frames += readcount / plac->channels ; + total += readcount ; + len -= readcount ; + } ; + + return total ; +} /* alac_read_i */ + +static sf_count_t +alac_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) +{ ALAC_PRIVATE *plac ; + int *iptr ; + int k, readcount ; + sf_count_t total = 0 ; + float normfact ; + + if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL) + return 0 ; + + normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ; + + while (len > 0) + { if (plac->partial_block_frames >= plac->frames_this_block && alac_decode_block (psf, plac) == 0) + break ; + + readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ; + readcount = readcount > len ? len : readcount ; + + iptr = plac->buffer + plac->partial_block_frames * plac->channels ; + + for (k = 0 ; k < readcount ; k++) + ptr [total + k] = normfact * iptr [k] ; + + plac->partial_block_frames += readcount / plac->channels ; + total += readcount ; + len -= readcount ; + } ; + + return total ; +} /* alac_read_f */ + +static sf_count_t +alac_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) +{ ALAC_PRIVATE *plac ; + int *iptr ; + int k, readcount ; + sf_count_t total = 0 ; + double normfact ; + + if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL) + return 0 ; + + normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ; + + while (len > 0) + { if (plac->partial_block_frames >= plac->frames_this_block && alac_decode_block (psf, plac) == 0) + break ; + + readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ; + readcount = readcount > len ? len : readcount ; + + iptr = plac->buffer + plac->partial_block_frames * plac->channels ; + + for (k = 0 ; k < readcount ; k++) + ptr [total + k] = normfact * iptr [k] ; + + plac->partial_block_frames += readcount / plac->channels ; + total += readcount ; + len -= readcount ; + } ; + + return total ; +} /* alac_read_d */ + +/*============================================================================================ +*/ + +static sf_count_t +alac_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) +{ ALAC_PRIVATE *plac ; + int newblock, newsample ; + + if (! psf->codec_data) + return 0 ; + plac = (ALAC_PRIVATE*) psf->codec_data ; + + if (psf->datalength < 0 || psf->dataoffset < 0) + { psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + if (offset == 0) + { psf_fseek (psf, psf->dataoffset, SEEK_SET) ; + + plac->frames_this_block = 0 ; + plac->input_data_pos = psf->dataoffset ; + plac->pakt_info->current = 0 ; + return 0 ; + } ; + + if (offset < 0 || offset > plac->pakt_info->count * plac->frames_per_block) + { psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + newblock = offset / plac->frames_per_block ; + newsample = offset % plac->frames_per_block ; + + if (mode == SFM_READ) + { plac->input_data_pos = psf->dataoffset + alac_pakt_block_offset (plac->pakt_info, newblock) ; + + plac->pakt_info->current = newblock ; + alac_decode_block (psf, plac) ; + plac->partial_block_frames = newsample ; + } + else + { /* What to do about write??? */ + psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + return newblock * plac->frames_per_block + newsample ; +} /* alac_seek */ + +/*========================================================================================== +** ALAC Write Functions. +*/ + +static sf_count_t +alac_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) +{ ALAC_PRIVATE *plac ; + int *iptr ; + int k, writecount ; + sf_count_t total = 0 ; + + if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL) + return 0 ; + + while (len > 0) + { writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ; + writecount = (writecount == 0 || writecount > len) ? len : writecount ; + + iptr = plac->buffer + plac->partial_block_frames * plac->channels ; + + for (k = 0 ; k < writecount ; k++) + iptr [k] = arith_shift_left (ptr [k], 16) ; + + plac->partial_block_frames += writecount / plac->channels ; + total += writecount ; + len -= writecount ; + ptr += writecount ; + + if (plac->partial_block_frames >= plac->frames_per_block) + alac_encode_block (plac) ; + } ; + + return total ; +} /* alac_write_s */ + +static sf_count_t +alac_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) +{ ALAC_PRIVATE *plac ; + int *iptr ; + int k, writecount ; + sf_count_t total = 0 ; + + if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL) + return 0 ; + + while (len > 0) + { writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ; + writecount = (writecount == 0 || writecount > len) ? len : writecount ; + + iptr = plac->buffer + plac->partial_block_frames * plac->channels ; + + for (k = 0 ; k < writecount ; k++) + iptr [k] = ptr [k] ; + + plac->partial_block_frames += writecount / plac->channels ; + total += writecount ; + len -= writecount ; + ptr += writecount ; + + if (plac->partial_block_frames >= plac->frames_per_block) + alac_encode_block (plac) ; + } ; + + return total ; +} /* alac_write_i */ + +static sf_count_t +alac_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) +{ ALAC_PRIVATE *plac ; + void (*convert) (const float *, int *t, int, int) ; + int *iptr ; + int writecount ; + sf_count_t total = 0 ; + + if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL) + return 0 ; + + convert = (psf->add_clipping) ? psf_f2i_clip_array : psf_f2i_array ; + + while (len > 0) + { writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ; + writecount = (writecount == 0 || writecount > len) ? len : writecount ; + + iptr = plac->buffer + plac->partial_block_frames * plac->channels ; + + convert (ptr, iptr, writecount, psf->norm_float) ; + + plac->partial_block_frames += writecount / plac->channels ; + total += writecount ; + len -= writecount ; + ptr += writecount ; + + if (plac->partial_block_frames >= plac->frames_per_block) + alac_encode_block (plac) ; + } ; + + return total ; +} /* alac_write_f */ + +static sf_count_t +alac_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) +{ ALAC_PRIVATE *plac ; + void (*convert) (const double *, int *t, int, int) ; + int *iptr ; + int writecount ; + sf_count_t total = 0 ; + + if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL) + return 0 ; + + convert = (psf->add_clipping) ? psf_d2i_clip_array : psf_d2i_array ; + + while (len > 0) + { writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ; + writecount = (writecount == 0 || writecount > len) ? len : writecount ; + + iptr = plac->buffer + plac->partial_block_frames * plac->channels ; + + convert (ptr, iptr, writecount, psf->norm_float) ; + + plac->partial_block_frames += writecount / plac->channels ; + total += writecount ; + len -= writecount ; + ptr += writecount ; + + if (plac->partial_block_frames >= plac->frames_per_block) + alac_encode_block (plac) ; + } ; + + return total ; +} /* alac_write_d */ + +/*============================================================================== +** PAKT_INFO handling. +*/ + +static PAKT_INFO * +alac_pakt_alloc (uint32_t initial_count) +{ PAKT_INFO * info ; + + if ((info = calloc (1, sizeof (PAKT_INFO) + initial_count * sizeof (info->packet_size [0]))) == NULL) + return NULL ; + + info->allocated = initial_count ; + info->current = 0 ; + info->count = 0 ; + + return info ; +} /* alac_pakt_alloc */ + +static PAKT_INFO * +alac_pakt_append (PAKT_INFO * info, uint32_t value) +{ + if (info->count >= info->allocated) + { PAKT_INFO * temp ; + uint32_t newcount = info->allocated + info->allocated / 2 ; + + if ((temp = realloc (info, sizeof (PAKT_INFO) + newcount * sizeof (info->packet_size [0]))) == NULL) + return NULL ; + + info = temp ; + info->allocated = newcount ; + } ; + + info->packet_size [info->count++] = value ; + return info ; +} /* alac_pakt_append */ + +static PAKT_INFO * +alac_pakt_read_decode (SF_PRIVATE * psf, uint32_t UNUSED (pakt_offset)) +{ SF_CHUNK_INFO chunk_info ; + PAKT_INFO * info = NULL ; + uint8_t *pakt_data = NULL ; + uint32_t bcount, value = 1, pakt_size ; + SF_CHUNK_ITERATOR * chunk_iterator ; + + + memset (&chunk_info, 0, sizeof (chunk_info)) ; + snprintf (chunk_info.id, sizeof (chunk_info.id), "pakt") ; + chunk_info.id_size = 4 ; + + if ((chunk_iterator = psf_get_chunk_iterator (psf, chunk_info.id)) == NULL) + { psf_log_printf (psf, "%s : no chunk iterator found\n", __func__) ; + free (chunk_info.data) ; + chunk_info.data = NULL ; + return NULL ; + } ; + + psf->get_chunk_size (psf, chunk_iterator, &chunk_info) ; + + pakt_size = chunk_info.datalen ; + chunk_info.data = pakt_data = malloc (pakt_size + 5) ; + + if ((bcount = psf->get_chunk_data (psf, chunk_iterator, &chunk_info)) != SF_ERR_NO_ERROR) + { while (chunk_iterator) + chunk_iterator = psf->next_chunk_iterator (psf, chunk_iterator) ; + free (chunk_info.data) ; + chunk_info.data = NULL ; + return NULL ; + } ; + + while (chunk_iterator) + chunk_iterator = psf->next_chunk_iterator (psf, chunk_iterator) ; + + info = alac_pakt_alloc (pakt_size / 4) ; + + /* Start at 24 bytes in, skipping over the 'pakt' chunks header. */ + for (bcount = 24 ; bcount < pakt_size && value != 0 ; ) + { uint8_t byte ; + int32_t count = 0 ; + + value = 0 ; + do + { byte = pakt_data [bcount + count] ; + value = (value << 7) + (byte & 0x7F) ; + + count ++ ; + if (count > 5 || bcount + count > pakt_size) + { printf ("%s %d : Ooops! count %d bcount %d\n", __func__, __LINE__, count, bcount) ; + value = 0 ; + break ; + } ; + } + while (byte & 0x80) ; + + bcount += count ; + + if ((info = alac_pakt_append (info, value)) == NULL) + goto FreeExit ; + } ; + + free (pakt_data) ; + + return info ; + +FreeExit : + free (pakt_data) ; + free (info) ; + return NULL ; +} /* alac_pakt_read_decode */ + +static uint8_t * +alac_pakt_encode (const SF_PRIVATE *psf, uint32_t * pakt_size_out) +{ const ALAC_PRIVATE *plac ; + const PAKT_INFO *info ; + uint8_t *data ; + uint32_t k, allocated, pakt_size ; + + plac = psf->codec_data ; + info = plac->pakt_info ; + + allocated = 100 + 2 * info->count ; + if ((data = calloc (1, allocated)) == NULL) + return NULL ; + + psf_put_be64 (data, 0, info->count) ; + psf_put_be64 (data, 8, psf->sf.frames) ; + psf_put_be32 (data, 20, kALACDefaultFramesPerPacket - plac->partial_block_frames) ; + + /* Real 'pakt' data starts after 24 byte header. */ + pakt_size = 24 ; + + for (k = 0 ; k < info->count ; k++) + { int32_t value = info->packet_size [k] ; + + if ((value & 0x7f) == value) + { data [pakt_size++] = value ; + continue ; + } ; + + if ((value & 0x3fff) == value) + { data [pakt_size++] = (value >> 7) | 0x80 ; + data [pakt_size++] = value & 0x7f ; + continue ; + } ; + + if ((value & 0x1fffff) == value) + { data [pakt_size++] = (value >> 14) | 0x80 ; + data [pakt_size++] = ((value >> 7) & 0x7f) | 0x80 ; + data [pakt_size++] = value & 0x7f ; + continue ; + } ; + + if ((value & 0x0fffffff) == value) + { data [pakt_size++] = (value >> 21) | 0x80 ; + data [pakt_size++] = ((value >> 14) & 0x7f) | 0x80 ; + data [pakt_size++] = ((value >> 7) & 0x7f) | 0x80 ; + data [pakt_size++] = value & 0x7f ; + continue ; + } ; + + *pakt_size_out = 0 ; + free (data) ; + return NULL ; + } ; + + *pakt_size_out = pakt_size ; + return data ; +} /* alac_pakt_encode */ + +static sf_count_t +alac_pakt_block_offset (const PAKT_INFO *info, uint32_t block) +{ sf_count_t offset = 0 ; + uint32_t k ; + + for (k = 0 ; k < block ; k++) + offset += info->packet_size [k] ; + + return offset ; +} /* alac_pakt_block_offset */ + +static uint32_t +alac_kuki_read (SF_PRIVATE * psf, uint32_t kuki_offset, uint8_t * kuki, size_t kuki_maxlen) +{ uint32_t marker ; + uint64_t kuki_size ; + + if (psf_fseek (psf, kuki_offset, SEEK_SET) != kuki_offset) + return 0 ; + + psf_fread (&marker, 1, sizeof (marker), psf) ; + if (marker != MAKE_MARKER ('k', 'u', 'k', 'i')) + return 0 ; + + psf_fread (&kuki_size, 1, sizeof (kuki_size), psf) ; + kuki_size = BE2H_64 (kuki_size) ; + + if (kuki_size == 0 || kuki_size > kuki_maxlen) + { psf_log_printf (psf, "%s : Bad size (%D) of 'kuki' chunk.\n", __func__, kuki_size) ; + return 0 ; + } ; + + psf_fread (kuki, 1, kuki_size, psf) ; + + return kuki_size ; +} /* alac_kuki_read */ + +#define CASE_NAME(x) case x : return #x ; break ; + +static const char * +alac_error_string (int error) +{ static char errstr [128] ; + switch (error) + { CASE_NAME (kALAC_UnimplementedError) ; + CASE_NAME (kALAC_FileNotFoundError) ; + CASE_NAME (kALAC_ParamError) ; + CASE_NAME (kALAC_MemFullError) ; + CASE_NAME (fALAC_FrameLengthError) ; + + /* Added for libsndfile */ + CASE_NAME (kALAC_BadBitWidth) ; + CASE_NAME (kALAC_IncompatibleVersion) ; + CASE_NAME (kALAC_BadSpecificConfigSize) ; + CASE_NAME (kALAC_ZeroChannelCount) ; + CASE_NAME (kALAC_NumSamplesTooBig) ; + CASE_NAME (kALAC_UnsupportedElement) ; + default : + break ; + } ; + + snprintf (errstr, sizeof (errstr), "Unknown error %d", error) ; + return errstr ; +} /* alac_error_string */ + diff --git a/lib-src/libsndfile/src/alaw.c b/lib-src/libsndfile/src/alaw.c index 6d06b4bb0..4220224c0 100644 --- a/lib-src/libsndfile/src/alaw.c +++ b/lib-src/libsndfile/src/alaw.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2013 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -19,6 +19,7 @@ #include "sfconfig.h" #include +#include #include "sndfile.h" #include "common.h" @@ -286,7 +287,7 @@ unsigned char alaw_encode [2048 + 1] = 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, - 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a + 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa } ; /* alaw_encode */ static inline void @@ -298,7 +299,7 @@ alaw2s_array (unsigned char *buffer, int count, short *ptr) static inline void alaw2i_array (unsigned char *buffer, int count, int *ptr) { while (--count >= 0) - ptr [count] = alaw_decode [(int) buffer [count]] << 16 ; + ptr [count] = ((uint32_t) alaw_decode [(int) buffer [count]]) << 16 ; } /* alaw2i_array */ static inline void @@ -326,7 +327,9 @@ s2alaw_array (const short *ptr, int count, unsigned char *buffer) static inline void i2alaw_array (const int *ptr, int count, unsigned char *buffer) { while (--count >= 0) - { if (ptr [count] >= 0) + { if (ptr [count] == INT_MIN) + buffer [count] = alaw_encode [INT_MAX >> (16 + 4)] ; + else if (ptr [count] >= 0) buffer [count] = alaw_encode [ptr [count] >> (16 + 4)] ; else buffer [count] = 0x7F & alaw_encode [- ptr [count] >> (16 + 4)] ; @@ -346,7 +349,9 @@ f2alaw_array (const float *ptr, int count, unsigned char *buffer, float normfact static inline void d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfact) { while (--count >= 0) - { if (ptr [count] >= 0) + { if (!isfinite (ptr [count])) + buffer [count] = 0 ; + else if (ptr [count] >= 0) buffer [count] = alaw_encode [lrint (normfact * ptr [count])] ; else buffer [count] = 0x7F & alaw_encode [- lrint (normfact * ptr [count])] ; @@ -358,16 +363,17 @@ d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfa static sf_count_t alaw_read_alaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ; - alaw2s_array (psf->u.ucbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ; + alaw2s_array (ubuf.ucbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -379,16 +385,17 @@ alaw_read_alaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t alaw_read_alaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ; - alaw2i_array (psf->u.ucbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ; + alaw2i_array (ubuf.ucbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -400,19 +407,20 @@ alaw_read_alaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t alaw_read_alaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ; - alaw2f_array (psf->u.ucbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ; + alaw2f_array (ubuf.ucbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -424,18 +432,19 @@ alaw_read_alaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t alaw_read_alaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double) ? 1.0 / ((double) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ; - alaw2d_array (psf->u.ucbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ; + alaw2d_array (ubuf.ucbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -450,16 +459,17 @@ alaw_read_alaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t alaw_write_s2alaw (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2alaw_array (ptr + total, bufferlen, psf->u.ucbuf) ; - writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ; + s2alaw_array (ptr + total, bufferlen, ubuf.ucbuf) ; + writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -471,16 +481,17 @@ alaw_write_s2alaw (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t alaw_write_i2alaw (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2alaw_array (ptr + total, bufferlen, psf->u.ucbuf) ; - writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ; + i2alaw_array (ptr + total, bufferlen, ubuf.ucbuf) ; + writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -492,19 +503,20 @@ alaw_write_i2alaw (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t alaw_write_f2alaw (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) / 16.0 : 1.0 / 16 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - f2alaw_array (ptr + total, bufferlen, psf->u.ucbuf, normfact) ; - writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ; + f2alaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ; + writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -516,19 +528,20 @@ alaw_write_f2alaw (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t alaw_write_d2alaw (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double) ? (1.0 * 0x7FFF) / 16.0 : 1.0 / 16.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - d2alaw_array (ptr + total, bufferlen, psf->u.ucbuf, normfact) ; - writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ; + d2alaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ; + writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; diff --git a/lib-src/libsndfile/src/au.c b/lib-src/libsndfile/src/au.c index 0ac3bf3c2..62bd691d6 100644 --- a/lib-src/libsndfile/src/au.c +++ b/lib-src/libsndfile/src/au.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -81,8 +81,8 @@ typedef struct { int dataoffset ; int datasize ; int encoding ; - int samplerate ; - int channels ; + int samplerate ; + int channels ; } AU_FMT ; @@ -211,8 +211,6 @@ au_write_header (SF_PRIVATE *psf, int calc_length) psf->datalength = psf->filelength - psf->dataoffset ; if (psf->dataend) psf->datalength -= psf->filelength - psf->dataend ; - - psf->sf.frames = psf->datalength / (psf->bytewidth * psf->sf.channels) ; } ; encoding = au_format_to_encoding (SF_CODEC (psf->sf.format)) ; @@ -220,8 +218,8 @@ au_write_header (SF_PRIVATE *psf, int calc_length) return (psf->error = SFE_BAD_OPEN_FORMAT) ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; /* ** Only attempt to seek if we are not writng to a pipe. If we are @@ -241,23 +239,23 @@ au_write_header (SF_PRIVATE *psf, int calc_length) datalength = (int) (psf->datalength & 0x7FFFFFFF) ; if (psf->endian == SF_ENDIAN_BIG) - { psf_binheader_writef (psf, "Em4", DOTSND_MARKER, AU_DATA_OFFSET) ; - psf_binheader_writef (psf, "E4444", datalength, encoding, psf->sf.samplerate, psf->sf.channels) ; + { psf_binheader_writef (psf, "Em4", BHWm (DOTSND_MARKER), BHW4 (AU_DATA_OFFSET)) ; + psf_binheader_writef (psf, "E4444", BHW4 (datalength), BHW4 (encoding), BHW4 (psf->sf.samplerate), BHW4 (psf->sf.channels)) ; } else if (psf->endian == SF_ENDIAN_LITTLE) - { psf_binheader_writef (psf, "em4", DNSDOT_MARKER, AU_DATA_OFFSET) ; - psf_binheader_writef (psf, "e4444", datalength, encoding, psf->sf.samplerate, psf->sf.channels) ; + { psf_binheader_writef (psf, "em4", BHWm (DNSDOT_MARKER), BHW4 (AU_DATA_OFFSET)) ; + psf_binheader_writef (psf, "e4444", BHW4 (datalength), BHW4 (encoding), BHW4 (psf->sf.samplerate), BHW4 (psf->sf.channels)) ; } else return (psf->error = SFE_BAD_OPEN_FORMAT) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; @@ -439,8 +437,12 @@ au_read_header (SF_PRIVATE *psf) { psf_log_printf (psf, " Channels : %d **** should be >= 1\n", au_fmt.channels) ; return SFE_CHANNEL_COUNT_ZERO ; } - else - psf_log_printf (psf, " Channels : %d\n", au_fmt.channels) ; + else if (au_fmt.channels > SF_MAX_CHANNELS) + { psf_log_printf (psf, " Channels : %d **** should be <= %d\n", au_fmt.channels, SF_MAX_CHANNELS) ; + return SFE_CHANNEL_COUNT ; + } ; + + psf_log_printf (psf, " Channels : %d\n", au_fmt.channels) ; psf->blockwidth = psf->sf.channels * psf->bytewidth ; diff --git a/lib-src/libsndfile/src/audio_detect.c b/lib-src/libsndfile/src/audio_detect.c index 775077e7c..b2671e8d8 100644 --- a/lib-src/libsndfile/src/audio_detect.c +++ b/lib-src/libsndfile/src/audio_detect.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2012 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -24,6 +24,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -60,7 +62,7 @@ audio_detect (SF_PRIVATE * psf, AUDIO_DETECT *ad, const unsigned char * data, in " be_int_24_32 : %d\n", vote.le_float, vote.be_float, vote.le_int_24_32, vote.be_int_24_32) ; - if (0) puts (psf->logbuffer) ; + if (0) puts (psf->parselog.buf) ; if (ad->endianness == SF_ENDIAN_LITTLE && vote.le_float > (3 * datalen) / 4) { /* Almost certainly 32 bit floats. */ diff --git a/lib-src/libsndfile/src/avr.c b/lib-src/libsndfile/src/avr.c index dd09b46c3..5d9ecbe28 100644 --- a/lib-src/libsndfile/src/avr.c +++ b/lib-src/libsndfile/src/avr.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2004-2011 Erik de Castro Lopo +** Copyright (C) 2004-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -89,8 +89,7 @@ avr_open (SF_PRIVATE *psf) return SFE_BAD_OPEN_FORMAT ; if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) - { psf->endian = SF_ENDIAN (psf->sf.format) ; - psf->endian = SF_ENDIAN_BIG ; + { psf->endian = SF_ENDIAN_BIG ; if (avr_write_header (psf, SF_FALSE)) return psf->error ; @@ -202,8 +201,8 @@ avr_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; /* ** Only attempt to seek if we are not writng to a pipe. If we are @@ -212,23 +211,23 @@ avr_write_header (SF_PRIVATE *psf, int calc_length) if (psf->is_pipe == SF_FALSE) psf_fseek (psf, 0, SEEK_SET) ; - psf_binheader_writef (psf, "Emz22", TWOBIT_MARKER, make_size_t (8), - psf->sf.channels == 2 ? 0xFFFF : 0, psf->bytewidth * 8) ; + psf_binheader_writef (psf, "Emz22", BHWm (TWOBIT_MARKER), BHWz (8), + BHW2 (psf->sf.channels == 2 ? 0xFFFF : 0), BHW2 (psf->bytewidth * 8)) ; sign = ((SF_CODEC (psf->sf.format)) == SF_FORMAT_PCM_U8) ? 0 : 0xFFFF ; - psf_binheader_writef (psf, "E222", sign, 0, 0xFFFF) ; - psf_binheader_writef (psf, "E4444", psf->sf.samplerate, psf->sf.frames, 0, 0) ; + psf_binheader_writef (psf, "E222", BHW2 (sign), BHW2 (0), BHW2 (0xFFFF)) ; + psf_binheader_writef (psf, "E4444", BHW4 (psf->sf.samplerate), BHW4 (psf->sf.frames), BHW4 (0), BHW4 (0)) ; - psf_binheader_writef (psf, "E222zz", 0, 0, 0, make_size_t (20), make_size_t (64)) ; + psf_binheader_writef (psf, "E222zz", BHW2 (0), BHW2 (0), BHW2 (0), BHWz (20), BHWz (64)) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; diff --git a/lib-src/libsndfile/src/binheader_writef_check.py b/lib-src/libsndfile/src/binheader_writef_check.py index adfc5f96e..09ebc92e0 100755 --- a/lib-src/libsndfile/src/binheader_writef_check.py +++ b/lib-src/libsndfile/src/binheader_writef_check.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (C) 2006-2011 Erik de Castro Lopo +# Copyright (C) 2006-2017 Erik de Castro Lopo # # All rights reserved. # @@ -42,75 +42,73 @@ import re, string, sys _whitespace_re = re.compile ("\s+", re.MULTILINE) def find_binheader_writefs (data): - lst = re.findall ('psf_binheader_writef\s*\(\s*[a-zA-Z_]+\s*,\s*\"[^;]+;', data, re.MULTILINE) - return [_whitespace_re.sub (" ", x) for x in lst] + lst = re.findall ('psf_binheader_writef\s*\(\s*[a-zA-Z_]+\s*,\s*\"[^;]+;', data, re.MULTILINE) + return [_whitespace_re.sub (" ", x) for x in lst] def find_format_string (s): - fmt = re.search ('"([^"]+)"', s) - if not fmt: - print "Bad format in :\n\n\t%s\n\n" % s - sys.exit (1) - fmt = fmt.groups () - if len (fmt) != 1: - print "Bad format in :\n\n\t%s\n\n" % s - sys.exit (1) - return _whitespace_re.sub ("", fmt [0]) + fmt = re.search ('"([^"]+)"', s) + if not fmt: + print ("Bad format in :\n\n\t%s\n\n" % s) + sys.exit (1) + fmt = fmt.groups () + if len (fmt) != 1: + print ("Bad format in :\n\n\t%s\n\n" % s) + sys.exit (1) + return _whitespace_re.sub ("", fmt [0]) def get_param_list (data): - dlist = re.search ("\((.+)\)\s*;", data) - dlist = dlist.groups ()[0] - dlist = string.split (dlist, ",") - dlist = [string.strip (x) for x in dlist] - return dlist [2:] + dlist = re.search ("\((.+)\)\s*;", data) + dlist = dlist.groups ()[0] + dlist = dlist.split(",") + dlist = [x.strip() for x in dlist] + return dlist [2:] def handle_file (fname): - errors = 0 - data = open (fname, "r").read () + errors = 0 + data = open (fname, "r").read () - writefs = find_binheader_writefs (data) - for item in writefs: - fmt = find_format_string (item) - params = get_param_list (item) - param_index = 0 + # return errors - # print item + writefs = find_binheader_writefs (data) + for item in writefs: + fmt = find_format_string (item) + params = get_param_list (item) + param_index = 0 - for ch in fmt: - if ch in 'Eet ': - continue + # print item - # print " param [%d] %c : %s" % (param_index, ch, params [param_index]) + for ch in fmt: + if ch in 'Eet ': + continue - if ch != 'b': - param_index += 1 - continue + if ch == 'b': + if params [param_index][:4] == "BHWv" and params [param_index + 1][:4] == "BHWz": + param_index += 2 + continue - # print item - # print " param [%d] %c : %s <-> %s" % (param_index, ch, params [param_index], params [param_index + 1]) + if "BHW" + ch == params [param_index][:4]: + param_index += 1 + continue - if string.find (params [param_index + 1], "sizeof") < 0 \ - and string.find (params [param_index + 1], "make_size_t") < 0 \ - and string.find (params [param_index + 1], "strlen") < 0: - if errors == 0: print - print "\n%s :" % fname - print " param [%d] %c : %s <-> %s" % (param_index, ch, params [param_index], params [param_index + 1]) - print " %s" % item - errors += 1 - param_index += 2 + if errors == 0: sys.stdout.write ("\n") + print ("\n%s: error for format specifier '%c' (index %d) in:\n %s\n" % (fname, ch, param_index, item)) + errors += 1 + # Break out of 'for ch in fmt' loop + break - return errors + return errors #=============================================================================== if len (sys.argv) > 1: - print "\n binheader_writef_check :", - sys.stdout.flush () - errors = 0 - for fname in sys.argv [1:]: - errors += handle_file (fname) - if errors > 0: - print "\nErrors : %d\n" % errors - sys.exit (1) + sys.stdout.write ("\n binheader_writef_check : ") + sys.stdout.flush () + errors = 0 + for fname in sys.argv [1:]: + errors += handle_file (fname) + if errors > 0: + print ("\nErrors : %d\n" % errors) + sys.exit (1) -print "ok\n" +print ("ok\n") diff --git a/lib-src/libsndfile/src/broadcast.c b/lib-src/libsndfile/src/broadcast.c index c47a2269e..16575bb54 100644 --- a/lib-src/libsndfile/src/broadcast.c +++ b/lib-src/libsndfile/src/broadcast.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2006-2011 Erik de Castro Lopo +** Copyright (C) 2006-2016 Erik de Castro Lopo ** Copyright (C) 2006 Paul Davis ** ** This program is free software; you can redistribute it and/or modify @@ -60,11 +60,12 @@ broadcast_var_set (SF_PRIVATE *psf, const SF_BROADCAST_INFO * info, size_t datas if (psf->broadcast_16k == NULL) { if ((psf->broadcast_16k = broadcast_var_alloc ()) == NULL) - { psf->error = SFE_MALLOC_FAILED ; + { psf->error = SFE_MALLOC_FAILED ; return SF_FALSE ; } ; } ; + /* Only copy the first part of the struct. */ memcpy (psf->broadcast_16k, info, offsetof (SF_BROADCAST_INFO, coding_history)) ; psf_strlcpy_crlf (psf->broadcast_16k->coding_history, info->coding_history, sizeof (psf->broadcast_16k->coding_history), datasize - offsetof (SF_BROADCAST_INFO, coding_history)) ; @@ -75,19 +76,18 @@ broadcast_var_set (SF_PRIVATE *psf, const SF_BROADCAST_INFO * info, size_t datas if (psf->file.mode == SFM_WRITE) { char added_history [256] ; - size_t added_history_len ; - added_history_len = gen_coding_history (added_history, sizeof (added_history), &(psf->sf)) ; + gen_coding_history (added_history, sizeof (added_history), &(psf->sf)) ; psf_strlcat (psf->broadcast_16k->coding_history, sizeof (psf->broadcast_16k->coding_history), added_history) ; } ; /* Force coding_history_size to be even. */ len = strlen (psf->broadcast_16k->coding_history) ; - len += (len & 1) ? 1 : 2 ; + len += (len & 1) ? 1 : 0 ; psf->broadcast_16k->coding_history_size = len ; /* Currently writing this version. */ - psf->broadcast_16k->version = 1 ; + psf->broadcast_16k->version = 2 ; return SF_TRUE ; } /* broadcast_var_set */ @@ -121,16 +121,16 @@ gen_coding_history (char * added_history, int added_history_max, const SF_INFO * ** Parameter Variable string Unit ** ========================================================================================== ** Coding Algorithm A= + ** MPEG2L1, MPEG2L2, MPEG2L3> ** Sampling frequency F=<11000,22050,24000,32000,44100,48000> [Hz] ** Bit-rate B= + ** 13818-3)> ** Word Length W=<8, 12, 14, 16, 18, 20, 22, 24> [bits] ** Mode M= ** Text, free string T= + ** This string should contain no commas (ASCII + ** 2Chex). Examples of the contents: ID-No; codec + ** type; A/D type> */ switch (psfinfo->channels) @@ -180,12 +180,11 @@ gen_coding_history (char * added_history, int added_history_max, const SF_INFO * } ; count = snprintf (added_history, added_history_max, - "A=PCM,F=%u,W=%hu,M=%s,T=%s-%s\r\n", - psfinfo->samplerate, (unsigned short)width, chnstr, PACKAGE, VERSION) ; + "A=PCM,F=%u,W=%d,M=%s,T=%s-%s\r\n", + psfinfo->samplerate, width, chnstr, PACKAGE_NAME, PACKAGE_VERSION) ; if (count >= added_history_max) return 0 ; return count ; } /* gen_coding_history */ - diff --git a/lib-src/libsndfile/src/caf.c b/lib-src/libsndfile/src/caf.c index f73c5855e..133731d13 100644 --- a/lib-src/libsndfile/src/caf.c +++ b/lib-src/libsndfile/src/caf.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2005-2011 Erik de Castro Lopo +** Copyright (C) 2005-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -75,17 +75,19 @@ */ typedef struct -{ unsigned char srate [8] ; - unsigned int fmt_id ; - unsigned int fmt_flags ; - unsigned int pkt_bytes ; - unsigned int pkt_frames ; - unsigned int channels_per_frame ; - unsigned int bits_per_chan ; +{ uint8_t srate [8] ; + uint32_t fmt_id ; + uint32_t fmt_flags ; + uint32_t pkt_bytes ; + uint32_t frames_per_packet ; + uint32_t channels_per_frame ; + uint32_t bits_per_chan ; } DESC_CHUNK ; typedef struct -{ int chanmap_tag ; +{ int chanmap_tag ; + + ALAC_DECODER_INFO alac ; } CAF_PRIVATE ; /*------------------------------------------------------------------------------ @@ -95,8 +97,17 @@ typedef struct static int caf_close (SF_PRIVATE *psf) ; static int caf_read_header (SF_PRIVATE *psf) ; static int caf_write_header (SF_PRIVATE *psf, int calc_length) ; +static int caf_write_tailer (SF_PRIVATE *psf) ; static int caf_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; static int caf_read_chanmap (SF_PRIVATE * psf, sf_count_t chunk_size) ; +static int caf_read_strings (SF_PRIVATE * psf, sf_count_t chunk_size) ; +static void caf_write_strings (SF_PRIVATE * psf, int location) ; + + +static int caf_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) ; +static SF_CHUNK_ITERATOR * caf_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) ; +static int caf_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; +static int caf_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; /*------------------------------------------------------------------------------ ** Public function. @@ -104,18 +115,25 @@ static int caf_read_chanmap (SF_PRIVATE * psf, sf_count_t chunk_size) ; int caf_open (SF_PRIVATE *psf) -{ int subformat, format, error = 0 ; +{ CAF_PRIVATE * pcaf ; + int subformat, format, error = 0 ; + + if ((psf->container_data = calloc (1, sizeof (CAF_PRIVATE))) == NULL) + return SFE_MALLOC_FAILED ; + + pcaf = psf->container_data ; if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0)) { if ((error = caf_read_header (psf))) return error ; + + psf->next_chunk_iterator = caf_next_chunk_iterator ; + psf->get_chunk_size = caf_get_chunk_size ; + psf->get_chunk_data = caf_get_chunk_data ; } ; subformat = SF_CODEC (psf->sf.format) ; - if ((psf->container_data = calloc (1, sizeof (CAF_PRIVATE))) == NULL) - return SFE_MALLOC_FAILED ; - if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) { if (psf->is_pipe) return SFE_NO_PIPE_WRITE ; @@ -133,7 +151,7 @@ caf_open (SF_PRIVATE *psf) psf->sf.frames = 0 ; } ; - psf->str_flags = SF_STR_ALLOW_START ; + psf->strings.flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ; /* ** By default, add the peak chunk to floating point files. Default behaviour @@ -148,7 +166,8 @@ caf_open (SF_PRIVATE *psf) if ((error = caf_write_header (psf, SF_FALSE)) != 0) return error ; - psf->write_header = caf_write_header ; + psf->write_header = caf_write_header ; + psf->set_chunk = caf_set_chunk ; } ; psf->container_close = caf_close ; @@ -178,6 +197,18 @@ caf_open (SF_PRIVATE *psf) case SF_FORMAT_DOUBLE : error = double64_init (psf) ; break ; + + case SF_FORMAT_ALAC_16 : + case SF_FORMAT_ALAC_20 : + case SF_FORMAT_ALAC_24 : + case SF_FORMAT_ALAC_32 : + if (psf->file.mode == SFM_READ) + /* Only pass the ALAC_DECODER_INFO in read mode. */ + error = alac_init (psf, &pcaf->alac) ; + else + error = alac_init (psf, NULL) ; + break ; + /* Lite remove end */ default : @@ -191,7 +222,9 @@ static int caf_close (SF_PRIVATE *psf) { if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) + { caf_write_tailer (psf) ; caf_write_header (psf, SF_TRUE) ; + } ; return 0 ; } /* caf_close */ @@ -220,11 +253,42 @@ caf_command (SF_PRIVATE * psf, int command, void * UNUSED (data), int UNUSED (da static int decode_desc_chunk (SF_PRIVATE *psf, const DESC_CHUNK *desc) -{ int format ; +{ int format = SF_FORMAT_CAF ; psf->sf.channels = desc->channels_per_frame ; - format = SF_FORMAT_CAF | (psf->endian == SF_ENDIAN_LITTLE ? SF_ENDIAN_LITTLE : 0) ; + if (desc->fmt_id == alac_MARKER) + { CAF_PRIVATE *pcaf ; + + if ((pcaf = psf->container_data) != NULL) + { switch (desc->fmt_flags) + { case 1 : + pcaf->alac.bits_per_sample = 16 ; + format |= SF_FORMAT_ALAC_16 ; + break ; + case 2 : + pcaf->alac.bits_per_sample = 20 ; + format |= SF_FORMAT_ALAC_20 ; + break ; + case 3 : + pcaf->alac.bits_per_sample = 24 ; + format |= SF_FORMAT_ALAC_24 ; + break ; + case 4 : + pcaf->alac.bits_per_sample = 32 ; + format |= SF_FORMAT_ALAC_32 ; + break ; + default : + psf_log_printf (psf, "Bad ALAC format flag value of %d\n", desc->fmt_flags) ; + } ; + + pcaf->alac.frames_per_packet = desc->frames_per_packet ; + } ; + + return format ; + } ; + + format |= psf->endian == SF_ENDIAN_LITTLE ? SF_ENDIAN_LITTLE : 0 ; if (desc->fmt_id == lpcm_MARKER && desc->fmt_flags & 1) { /* Floating point data. */ @@ -238,12 +302,7 @@ decode_desc_chunk (SF_PRIVATE *psf, const DESC_CHUNK *desc) } ; } ; - if ((desc->fmt_flags & 1) != 0) - { psf_log_printf (psf, "**** Ooops, 'desc' chunk suggests float data, but other info invalid.\n") ; - return 0 ; - } ; - - if (desc->fmt_id == lpcm_MARKER) + if (desc->fmt_id == lpcm_MARKER && (desc->fmt_flags & 1) == 0) { /* Integer data. */ if (desc->bits_per_chan == 32 && desc->pkt_bytes == 4 * desc->channels_per_frame) { psf->bytewidth = 4 ; @@ -273,17 +332,24 @@ decode_desc_chunk (SF_PRIVATE *psf, const DESC_CHUNK *desc) return format | SF_FORMAT_ULAW ; } ; + psf_log_printf (psf, "**** Unknown format identifier.\n") ; + return 0 ; } /* decode_desc_chunk */ static int caf_read_header (SF_PRIVATE *psf) -{ DESC_CHUNK desc ; +{ CAF_PRIVATE *pcaf ; + BUF_UNION ubuf ; + DESC_CHUNK desc ; sf_count_t chunk_size ; double srate ; short version, flags ; int marker, k, have_data = 0, error ; + if ((pcaf = psf->container_data) == NULL) + return SFE_INTERNAL ; + memset (&desc, 0, sizeof (desc)) ; /* Set position to start of file to begin reading header. */ @@ -292,10 +358,10 @@ caf_read_header (SF_PRIVATE *psf) if (marker != caff_MARKER) return SFE_CAF_NOT_CAF ; - psf_binheader_readf (psf, "mE8b", &marker, &chunk_size, psf->u.ucbuf, 8) ; - srate = double64_be_read (psf->u.ucbuf) ; - snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%5.3f", srate) ; - psf_log_printf (psf, "%M : %D\n Sample rate : %s\n", marker, chunk_size, psf->u.cbuf) ; + psf_binheader_readf (psf, "mE8b", &marker, &chunk_size, ubuf.ucbuf, 8) ; + srate = double64_be_read (ubuf.ucbuf) ; + snprintf (ubuf.cbuf, sizeof (ubuf.cbuf), "%5.3f", srate) ; + psf_log_printf (psf, "%M : %D\n Sample rate : %s\n", marker, chunk_size, ubuf.cbuf) ; if (marker != desc_MARKER) return SFE_CAF_NO_DESC ; @@ -306,11 +372,11 @@ caf_read_header (SF_PRIVATE *psf) psf->sf.samplerate = lrint (srate) ; - psf_binheader_readf (psf, "mE44444", &desc.fmt_id, &desc.fmt_flags, &desc.pkt_bytes, &desc.pkt_frames, + psf_binheader_readf (psf, "mE44444", &desc.fmt_id, &desc.fmt_flags, &desc.pkt_bytes, &desc.frames_per_packet, &desc.channels_per_frame, &desc.bits_per_chan) ; psf_log_printf (psf, " Format id : %M\n Format flags : %x\n Bytes / packet : %u\n" " Frames / packet : %u\n Channels / frame : %u\n Bits / channel : %u\n", - desc.fmt_id, desc.fmt_flags, desc.pkt_bytes, desc.pkt_frames, desc.channels_per_frame, desc.bits_per_chan) ; + desc.fmt_id, desc.fmt_flags, desc.pkt_bytes, desc.frames_per_packet, desc.channels_per_frame, desc.bits_per_chan) ; if (desc.channels_per_frame > SF_MAX_CHANNELS) { psf_log_printf (psf, "**** Bad channels per frame value %u.\n", desc.channels_per_frame) ; @@ -322,14 +388,30 @@ caf_read_header (SF_PRIVATE *psf) psf->sf.channels = desc.channels_per_frame ; - while (have_data == 0 && psf_ftell (psf) < psf->filelength - SIGNED_SIZEOF (marker)) - { psf_binheader_readf (psf, "mE8", &marker, &chunk_size) ; + while (1) + { marker = 0 ; + chunk_size = 0 ; + + psf_binheader_readf (psf, "mE8", &marker, &chunk_size) ; + if (marker == 0) + { sf_count_t pos = psf_ftell (psf) ; + psf_log_printf (psf, "Have 0 marker at position %D (0x%x).\n", pos, pos) ; + break ; + } ; + if (chunk_size < 0) + { psf_log_printf (psf, "%M : %D *** Should be >= 0 ***\n", marker, chunk_size) ; + break ; + } ; + if (chunk_size > psf->filelength) + break ; + + psf_store_read_chunk_u32 (&psf->rchunks, marker, psf_ftell (psf), chunk_size) ; switch (marker) { case peak_MARKER : psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ; if (chunk_size != CAF_PEAK_CHUNK_SIZE (psf->sf.channels)) - { psf_binheader_readf (psf, "j", (int) chunk_size) ; + { psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ; psf_log_printf (psf, "*** File PEAK chunk %D should be %d.\n", chunk_size, CAF_PEAK_CHUNK_SIZE (psf->sf.channels)) ; return SFE_CAF_BAD_PEAK ; } ; @@ -350,8 +432,8 @@ caf_read_header (SF_PRIVATE *psf) psf->peak_info->peaks [k].value = value ; psf->peak_info->peaks [k].position = position ; - snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), " %2d %-12" PRId64 " %g\n", k, position, value) ; - psf_log_printf (psf, psf->u.cbuf) ; + snprintf (ubuf.cbuf, sizeof (ubuf.cbuf), " %2d %-12" PRId64 " %g\n", k, position, value) ; + psf_log_printf (psf, ubuf.cbuf) ; } ; psf->peak_info->peak_loc = SF_PEAK_START ; @@ -360,7 +442,7 @@ caf_read_header (SF_PRIVATE *psf) case chan_MARKER : if (chunk_size < 12) { psf_log_printf (psf, "%M : %D (should be >= 12)\n", marker, chunk_size) ; - psf_binheader_readf (psf, "j", (int) chunk_size) ; + psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ; break ; } @@ -372,20 +454,102 @@ caf_read_header (SF_PRIVATE *psf) case free_MARKER : psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ; - psf_binheader_readf (psf, "j", (int) chunk_size) ; + psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ; break ; case data_MARKER : - psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ; psf_binheader_readf (psf, "E4", &k) ; + if (chunk_size == -1) + { psf_log_printf (psf, "%M : -1\n") ; + chunk_size = psf->filelength - psf->header.indx ; + } + else if (psf->filelength > 0 && chunk_size > psf->filelength - psf->header.indx + 10) + { psf_log_printf (psf, "%M : %D (should be %D)\n", marker, chunk_size, psf->filelength - psf->header.indx - 8) ; + psf->datalength = psf->filelength - psf->header.indx - 8 ; + } + else + { psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ; + /* Subtract the 4 bytes of the 'edit' field above. */ + psf->datalength = chunk_size - 4 ; + } ; + psf_log_printf (psf, " edit : %u\n", k) ; + + psf->dataoffset = psf->header.indx ; + if (psf->datalength + psf->dataoffset < psf->filelength) + psf->dataend = psf->datalength + psf->dataoffset ; + + psf_binheader_readf (psf, "j", make_size_t (psf->datalength)) ; have_data = 1 ; break ; - default : - psf_log_printf (psf, " %M : %D (skipped)\n", marker, chunk_size) ; - psf_binheader_readf (psf, "j", (int) chunk_size) ; + case kuki_MARKER : + psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ; + pcaf->alac.kuki_offset = psf_ftell (psf) - 12 ; + psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ; break ; + + case pakt_MARKER : + if (chunk_size < 24) + { psf_log_printf (psf, "%M : %D (should be > 24)\n", marker, chunk_size) ; + return SFE_MALFORMED_FILE ; + } + else if (chunk_size > psf->filelength - psf->header.indx) + { psf_log_printf (psf, "%M : %D (should be < %D)\n", marker, chunk_size, psf->filelength - psf->header.indx) ; + return SFE_MALFORMED_FILE ; + } + else + psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ; + + psf_binheader_readf (psf, "E8844", &pcaf->alac.packets, &pcaf->alac.valid_frames, + &pcaf->alac.priming_frames, &pcaf->alac.remainder_frames) ; + + psf_log_printf (psf, + " Packets : %D\n" + " Valid frames : %D\n" + " Priming frames : %d\n" + " Remainder frames : %d\n", + pcaf->alac.packets, pcaf->alac.valid_frames, pcaf->alac.priming_frames, + pcaf->alac.remainder_frames + ) ; + + if (pcaf->alac.packets == 0 && pcaf->alac.valid_frames == 0 + && pcaf->alac.priming_frames == 0 && pcaf->alac.remainder_frames == 0) + psf_log_printf (psf, "*** 'pakt' chunk header is all zero.\n") ; + + pcaf->alac.pakt_offset = psf_ftell (psf) - 12 ; + psf_binheader_readf (psf, "j", make_size_t (chunk_size) - 24) ; + break ; + + case info_MARKER : + if (chunk_size < 4) + { psf_log_printf (psf, "%M : %D (should be > 4)\n", marker, chunk_size) ; + return SFE_MALFORMED_FILE ; + } + else if (chunk_size > psf->filelength - psf->header.indx) + { psf_log_printf (psf, "%M : %D (should be < %D)\n", marker, chunk_size, psf->filelength - psf->header.indx) ; + return SFE_MALFORMED_FILE ; + } ; + psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ; + if (chunk_size > 4) + caf_read_strings (psf, chunk_size - 4) ; + break ; + + default : + psf_log_printf (psf, "%M : %D (skipped)\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ; + break ; + } ; + + if (marker != data_MARKER && chunk_size >= 0xffffff00) + break ; + + if (! psf->sf.seekable && have_data) + break ; + + if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (chunk_size)) + { psf_log_printf (psf, "End\n") ; + break ; } ; } ; @@ -394,12 +558,10 @@ caf_read_header (SF_PRIVATE *psf) return SFE_MALFORMED_FILE ; } ; - psf_log_printf (psf, "End\n") ; - - psf->dataoffset = psf_ftell (psf) ; - psf->datalength = psf->filelength - psf->dataoffset ; psf->endian = (desc.fmt_flags & 2) ? SF_ENDIAN_LITTLE : SF_ENDIAN_BIG ; + psf_fseek (psf, psf->dataoffset, SEEK_SET) ; + if ((psf->sf.format = decode_desc_chunk (psf, &desc)) == 0) return SFE_UNSUPPORTED_ENCODING ; @@ -414,10 +576,12 @@ caf_read_header (SF_PRIVATE *psf) static int caf_write_header (SF_PRIVATE *psf, int calc_length) -{ CAF_PRIVATE *pcaf ; +{ BUF_UNION ubuf ; + CAF_PRIVATE *pcaf ; DESC_CHUNK desc ; - sf_count_t current, free_len ; - int subformat ; + sf_count_t current ; + uint32_t uk ; + int subformat, append_free_block = SF_TRUE ; if ((pcaf = psf->container_data) == NULL) return SFE_INTERNAL ; @@ -439,18 +603,18 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; /* 'caff' marker, version and flags. */ - psf_binheader_writef (psf, "Em22", caff_MARKER, 1, 0) ; + psf_binheader_writef (psf, "Em22", BHWm (caff_MARKER), BHW2 (1), BHW2 (0)) ; /* 'desc' marker and chunk size. */ - psf_binheader_writef (psf, "Em8", desc_MARKER, (sf_count_t) (sizeof (DESC_CHUNK))) ; + psf_binheader_writef (psf, "Em8", BHWm (desc_MARKER), BHW8 ((sf_count_t) (sizeof (DESC_CHUNK)))) ; - double64_be_write (1.0 * psf->sf.samplerate, psf->u.ucbuf) ; - psf_binheader_writef (psf, "b", psf->u.ucbuf, make_size_t (8)) ; + double64_be_write (1.0 * psf->sf.samplerate, ubuf.ucbuf) ; + psf_binheader_writef (psf, "b", BHWv (ubuf.ucbuf), BHWz (8)) ; subformat = SF_CODEC (psf->sf.format) ; @@ -472,7 +636,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) desc.fmt_id = lpcm_MARKER ; psf->bytewidth = 1 ; desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; - desc.pkt_frames = 1 ; + desc.frames_per_packet = 1 ; desc.channels_per_frame = psf->sf.channels ; desc.bits_per_chan = 8 ; break ; @@ -481,7 +645,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) desc.fmt_id = lpcm_MARKER ; psf->bytewidth = 2 ; desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; - desc.pkt_frames = 1 ; + desc.frames_per_packet = 1 ; desc.channels_per_frame = psf->sf.channels ; desc.bits_per_chan = 16 ; break ; @@ -489,7 +653,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) case SF_FORMAT_PCM_24 : psf->bytewidth = 3 ; desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; - desc.pkt_frames = 1 ; + desc.frames_per_packet = 1 ; desc.channels_per_frame = psf->sf.channels ; desc.bits_per_chan = 24 ; desc.fmt_id = lpcm_MARKER ; @@ -499,7 +663,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) desc.fmt_id = lpcm_MARKER ; psf->bytewidth = 4 ; desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; - desc.pkt_frames = 1 ; + desc.frames_per_packet = 1 ; desc.channels_per_frame = psf->sf.channels ; desc.bits_per_chan = 32 ; break ; @@ -509,7 +673,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) desc.fmt_flags |= 1 ; psf->bytewidth = 4 ; desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; - desc.pkt_frames = 1 ; + desc.frames_per_packet = 1 ; desc.channels_per_frame = psf->sf.channels ; desc.bits_per_chan = 32 ; break ; @@ -519,7 +683,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) desc.fmt_flags |= 1 ; psf->bytewidth = 8 ; desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; - desc.pkt_frames = 1 ; + desc.frames_per_packet = 1 ; desc.channels_per_frame = psf->sf.channels ; desc.bits_per_chan = 64 ; break ; @@ -528,7 +692,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) desc.fmt_id = alaw_MARKER ; psf->bytewidth = 1 ; desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; - desc.pkt_frames = 1 ; + desc.frames_per_packet = 1 ; desc.channels_per_frame = psf->sf.channels ; desc.bits_per_chan = 8 ; break ; @@ -537,45 +701,59 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) desc.fmt_id = ulaw_MARKER ; psf->bytewidth = 1 ; desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; - desc.pkt_frames = 1 ; + desc.frames_per_packet = 1 ; desc.channels_per_frame = psf->sf.channels ; desc.bits_per_chan = 8 ; break ; + case SF_FORMAT_ALAC_16 : + case SF_FORMAT_ALAC_20 : + case SF_FORMAT_ALAC_24 : + case SF_FORMAT_ALAC_32 : + desc.fmt_id = alac_MARKER ; + desc.pkt_bytes = psf->bytewidth * psf->sf.channels ; + desc.channels_per_frame = psf->sf.channels ; + alac_get_desc_chunk_items (subformat, &desc.fmt_flags, &desc.frames_per_packet) ; + append_free_block = SF_FALSE ; + break ; + default : return SFE_UNIMPLEMENTED ; } ; - psf_binheader_writef (psf, "mE44444", desc.fmt_id, desc.fmt_flags, desc.pkt_bytes, desc.pkt_frames, desc.channels_per_frame, desc.bits_per_chan) ; + psf_binheader_writef (psf, "mE44444", BHWm (desc.fmt_id), BHW4 (desc.fmt_flags), BHW4 (desc.pkt_bytes), BHW4 (desc.frames_per_packet), BHW4 (desc.channels_per_frame), BHW4 (desc.bits_per_chan)) ; -#if 0 - if (psf->str_flags & SF_STR_LOCATE_START) - caf_write_strings (psf, SF_STR_LOCATE_START) ; -#endif + caf_write_strings (psf, SF_STR_LOCATE_START) ; if (psf->peak_info != NULL) { int k ; - psf_binheader_writef (psf, "Em84", peak_MARKER, (sf_count_t) CAF_PEAK_CHUNK_SIZE (psf->sf.channels), psf->peak_info->edit_number) ; + psf_binheader_writef (psf, "Em84", BHWm (peak_MARKER), BHW8 ((sf_count_t) CAF_PEAK_CHUNK_SIZE (psf->sf.channels)), BHW4 (psf->peak_info->edit_number)) ; for (k = 0 ; k < psf->sf.channels ; k++) - psf_binheader_writef (psf, "Ef8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ; + psf_binheader_writef (psf, "Ef8", BHWf ((float) psf->peak_info->peaks [k].value), BHW8 (psf->peak_info->peaks [k].position)) ; } ; if (psf->channel_map && pcaf->chanmap_tag) - psf_binheader_writef (psf, "Em8444", chan_MARKER, (sf_count_t) 12, pcaf->chanmap_tag, 0, 0) ; + psf_binheader_writef (psf, "Em8444", BHWm (chan_MARKER), BHW8 ((sf_count_t) 12), BHW4 (pcaf->chanmap_tag), BHW4 (0), BHW4 (0)) ; - /* Add free chunk so that the actual audio data starts at a multiple 0x1000. */ - free_len = 0x1000 - psf->headindex - 16 - 12 ; - while (free_len < 0) - free_len += 0x1000 ; - psf_binheader_writef (psf, "Em8z", free_MARKER, free_len, (int) free_len) ; + /* Write custom headers. */ + for (uk = 0 ; uk < psf->wchunks.used ; uk++) + psf_binheader_writef (psf, "m44b", BHWm ((int) psf->wchunks.chunks [uk].mark32), BHW4 (0), BHW4 (psf->wchunks.chunks [uk].len), BHWv (psf->wchunks.chunks [uk].data), BHWz (psf->wchunks.chunks [uk].len)) ; - psf_binheader_writef (psf, "Em84", data_MARKER, psf->datalength, 0) ; + if (append_free_block) + { /* Add free chunk so that the actual audio data starts at a multiple 0x1000. */ + sf_count_t free_len = 0x1000 - psf->header.indx - 16 - 12 ; + while (free_len < 0) + free_len += 0x1000 ; + psf_binheader_writef (psf, "Em8z", BHWm (free_MARKER), BHW8 (free_len), BHWz (free_len)) ; + } ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_binheader_writef (psf, "Em84", BHWm (data_MARKER), BHW8 (psf->datalength + 4), BHW4 (0)) ; + + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current < psf->dataoffset) psf_fseek (psf, psf->dataoffset, SEEK_SET) ; else if (current > 0) @@ -584,6 +762,36 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) return psf->error ; } /* caf_write_header */ +static int +caf_write_tailer (SF_PRIVATE *psf) +{ + /* Reset the current header buffer length to zero. */ + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; + + if (psf->bytewidth > 0 && psf->sf.seekable == SF_TRUE) + { psf->datalength = psf->sf.frames * psf->bytewidth * psf->sf.channels ; + psf->dataend = psf->dataoffset + psf->datalength ; + } ; + + if (psf->dataend > 0) + psf_fseek (psf, psf->dataend, SEEK_SET) ; + else + psf->dataend = psf_fseek (psf, 0, SEEK_END) ; + + if (psf->dataend & 1) + psf_binheader_writef (psf, "z", BHWz (1)) ; + + if (psf->strings.flags & SF_STR_LOCATE_END) + caf_write_strings (psf, SF_STR_LOCATE_END) ; + + /* Write the tailer. */ + if (psf->header.indx > 0) + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; + + return 0 ; +} /* caf_write_tailer */ + static int caf_read_chanmap (SF_PRIVATE * psf, sf_count_t chunk_size) { const AIFF_CAF_CHANNEL_MAP * map_info ; @@ -601,8 +809,8 @@ caf_read_chanmap (SF_PRIVATE * psf, sf_count_t chunk_size) if (bytesread < chunk_size) psf_binheader_readf (psf, "j", chunk_size - bytesread) ; - if (map_info->channel_map != NULL) - { size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ; + if (map_info && map_info->channel_map != NULL) + { size_t chanmap_size = SF_MIN (psf->sf.channels, layout_tag & 0xff) * sizeof (psf->channel_map [0]) ; free (psf->channel_map) ; @@ -615,3 +823,211 @@ caf_read_chanmap (SF_PRIVATE * psf, sf_count_t chunk_size) return 0 ; } /* caf_read_chanmap */ + +static uint32_t +string_hash32 (const char * str) +{ uint32_t hash = 0x87654321 ; + + while (str [0]) + { hash = hash * 333 + str [0] ; + str ++ ; + } ; + + return hash ; +} /* string_hash32 */ + +static int +caf_read_strings (SF_PRIVATE * psf, sf_count_t chunk_size) +{ char *buf ; + char *key, *value ; + uint32_t count, hash ; + + if ((buf = malloc (chunk_size + 1)) == NULL) + return (psf->error = SFE_MALLOC_FAILED) ; + + psf_binheader_readf (psf, "E4b", &count, buf, make_size_t (chunk_size)) ; + psf_log_printf (psf, " count: %u\n", count) ; + + /* Force terminate `buf` to make sure. */ + buf [chunk_size] = 0 ; + + for (key = buf ; key < buf + chunk_size ; ) + { value = key + strlen (key) + 1 ; + if (value > buf + chunk_size) + break ; + psf_log_printf (psf, " %-12s : %s\n", key, value) ; + + hash = string_hash32 (key) ; + switch (hash) + { case 0xC4861943 : /* 'title' */ + psf_store_string (psf, SF_STR_TITLE, value) ; + break ; + case 0xAD47A394 : /* 'software' */ + psf_store_string (psf, SF_STR_SOFTWARE, value) ; + break ; + case 0x5D178E2A : /* 'copyright' */ + psf_store_string (psf, SF_STR_COPYRIGHT, value) ; + break ; + case 0x60E4D0C8 : /* 'artist' */ + psf_store_string (psf, SF_STR_ARTIST, value) ; + break ; + case 0x83B5D16A : /* 'genre' */ + psf_store_string (psf, SF_STR_GENRE, value) ; + break ; + case 0x15E5FC88 : /* 'comment' */ + case 0x7C297D5B : /* 'comments' */ + psf_store_string (psf, SF_STR_COMMENT, value) ; + break ; + case 0x24A7C347 : /* 'tracknumber' */ + psf_store_string (psf, SF_STR_TRACKNUMBER, value) ; + break ; + case 0x50A31EB7 : /* 'date' */ + psf_store_string (psf, SF_STR_DATE, value) ; + break ; + case 0x6583545A : /* 'album' */ + psf_store_string (psf, SF_STR_ALBUM, value) ; + break ; + case 0xE7C64B6C : /* 'license' */ + psf_store_string (psf, SF_STR_LICENSE, value) ; + break ; + default : + psf_log_printf (psf, " Unhandled hash 0x%x : /* '%s' */\n", hash, key) ; + break ; + } ; + + key = value + strlen (value) + 1 ; + } ; + + free (buf) ; + + return 0 ; +} /* caf_read_strings */ + +struct put_buffer +{ uint32_t index ; + char s [16 * 1024] ; +} ; + +static uint32_t +put_key_value (struct put_buffer * buf, const char * key, const char * value) +{ uint32_t written ; + + if (buf->index + strlen (key) + strlen (value) + 2 > sizeof (buf->s)) + return 0 ; + + written = snprintf (buf->s + buf->index, sizeof (buf->s) - buf->index, "%s%c%s%c", key, 0, value, 0) ; + + if (buf->index + written >= sizeof (buf->s)) + return 0 ; + + buf->index += written ; + return 1 ; +} /* put_key_value */ + +static void +caf_write_strings (SF_PRIVATE * psf, int location) +{ struct put_buffer buf ; + const char * cptr ; + uint32_t k, string_count = 0 ; + + memset (&buf, 0, sizeof (buf)) ; + + for (k = 0 ; k < SF_MAX_STRINGS ; k++) + { if (psf->strings.data [k].type == 0) + break ; + + if (psf->strings.data [k].flags != location) + continue ; + + if ((cptr = psf_get_string (psf, psf->strings.data [k].type)) == NULL) + continue ; + + switch (psf->strings.data [k].type) + { case SF_STR_TITLE : + string_count += put_key_value (&buf, "title", cptr) ; + break ; + case SF_STR_COPYRIGHT : + string_count += put_key_value (&buf, "copyright", cptr) ; + break ; + case SF_STR_SOFTWARE : + string_count += put_key_value (&buf, "software", cptr) ; + break ; + case SF_STR_ARTIST : + string_count += put_key_value (&buf, "artist", cptr) ; + break ; + case SF_STR_COMMENT : + string_count += put_key_value (&buf, "comment", cptr) ; + break ; + case SF_STR_DATE : + string_count += put_key_value (&buf, "date", cptr) ; + break ; + case SF_STR_ALBUM : + string_count += put_key_value (&buf, "album", cptr) ; + break ; + case SF_STR_LICENSE : + string_count += put_key_value (&buf, "license", cptr) ; + break ; + case SF_STR_TRACKNUMBER : + string_count += put_key_value (&buf, "tracknumber", cptr) ; + break ; + case SF_STR_GENRE : + string_count += put_key_value (&buf, "genre", cptr) ; + break ; + + default : + break ; + } ; + } ; + + if (string_count == 0 || buf.index == 0) + return ; + + psf_binheader_writef (psf, "Em84b", BHWm (info_MARKER), BHW8 (buf.index + 4), BHW4 (string_count), BHWv (buf.s), BHWz (buf.index)) ; +} /* caf_write_strings */ + +/*============================================================================== +*/ + +static int +caf_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) +{ return psf_save_write_chunk (&psf->wchunks, chunk_info) ; +} /* caf_set_chunk */ + +static SF_CHUNK_ITERATOR * +caf_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) +{ return psf_next_chunk_iterator (&psf->rchunks, iterator) ; +} /* caf_next_chunk_iterator */ + +static int +caf_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ int indx ; + + if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0) + return SFE_UNKNOWN_CHUNK ; + + chunk_info->datalen = psf->rchunks.chunks [indx].len ; + + return SFE_NO_ERROR ; +} /* caf_get_chunk_size */ + +static int +caf_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ int indx ; + sf_count_t pos ; + + if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0) + return SFE_UNKNOWN_CHUNK ; + + if (chunk_info->data == NULL) + return SFE_BAD_CHUNK_DATA_PTR ; + + chunk_info->id_size = psf->rchunks.chunks [indx].id_size ; + memcpy (chunk_info->id, psf->rchunks.chunks [indx].id, sizeof (chunk_info->id) / sizeof (*chunk_info->id)) ; + + pos = psf_ftell (psf) ; + psf_fseek (psf, psf->rchunks.chunks [indx].offset, SEEK_SET) ; + psf_fread (chunk_info->data, SF_MIN (chunk_info->datalen, psf->rchunks.chunks [indx].len), 1, psf) ; + psf_fseek (psf, pos, SEEK_SET) ; + + return SFE_NO_ERROR ; +} /* caf_get_chunk_data */ diff --git a/lib-src/libsndfile/src/cart.c b/lib-src/libsndfile/src/cart.c new file mode 100644 index 000000000..a56ed60e5 --- /dev/null +++ b/lib-src/libsndfile/src/cart.c @@ -0,0 +1,101 @@ +/* +** Copyright (C) 2012 Chris Roberts +** Copyright (C) 2006-2013 Erik de Castro Lopo +** Copyright (C) 2006 Paul Davis +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include +#include "common.h" + + + +static inline size_t +cart_min_size (const SF_CART_INFO* info) +{ if (info == NULL) + return 0 ; + + return offsetof (SF_CART_INFO, tag_text) + info->tag_text_size ; +} /* cart_min_size */ + +SF_CART_INFO_16K* +cart_var_alloc (void) +{ SF_CART_INFO_16K* thing ; + thing = malloc (sizeof (SF_CART_INFO_16K)) ; + return thing ; +} /* cart_var_alloc */ + +int +cart_var_set (SF_PRIVATE *psf, const SF_CART_INFO * info, size_t datasize) +{ size_t len ; + + if (info == NULL) + return SF_FALSE ; + + if (cart_min_size (info) > datasize) + { psf->error = SFE_BAD_CART_INFO_SIZE ; + return SF_FALSE ; + } ; + + if (datasize >= sizeof (SF_CART_INFO_16K)) + { psf->error = SFE_BAD_CART_INFO_TOO_BIG ; + return SF_FALSE ; + } ; + + if (psf->cart_16k == NULL) + { if ((psf->cart_16k = cart_var_alloc ()) == NULL) + { psf->error = SFE_MALLOC_FAILED ; + return SF_FALSE ; + } ; + } ; + + memcpy (psf->cart_16k, info, offsetof (SF_CART_INFO, tag_text)) ; + psf_strlcpy_crlf (psf->cart_16k->tag_text, info->tag_text, sizeof (psf->cart_16k->tag_text), datasize - offsetof (SF_CART_INFO, tag_text)) ; + + len = strlen (psf->cart_16k->tag_text) ; + + if (len > 0 && psf->cart_16k->tag_text [len - 1] != '\n') + psf_strlcat (psf->cart_16k->tag_text, sizeof (psf->cart_16k->tag_text), "\r\n") ; + + /* Force tag_text_size to be even. */ + len = strlen (psf->cart_16k->tag_text) ; + len += (len & 1) ? 1 : 2 ; + + psf->cart_16k->tag_text_size = len ; + + return SF_TRUE ; +} /* cart_var_set */ + + +int +cart_var_get (SF_PRIVATE *psf, SF_CART_INFO * data, size_t datasize) +{ size_t size ; + if (psf->cart_16k == NULL) + return SF_FALSE ; + + size = SF_MIN (datasize, cart_min_size ((const SF_CART_INFO *) psf->cart_16k)) ; + + memcpy (data, psf->cart_16k, size) ; + + return SF_TRUE ; +} /* cart_var_get */ + + diff --git a/lib-src/libsndfile/src/chanmap.c b/lib-src/libsndfile/src/chanmap.c index 9a9f7f0f1..c06702ca0 100644 --- a/lib-src/libsndfile/src/chanmap.c +++ b/lib-src/libsndfile/src/chanmap.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2009-2011 Erik de Castro Lopo +** Copyright (C) 2009-2014 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -228,7 +228,7 @@ aiff_caf_find_channel_layout_tag (const int *chan_map, int channels) { const AIFF_CAF_CHANNEL_MAP * curr_map ; unsigned k, len ; - if (channels < 1 || channels > ARRAY_LEN (map)) + if (channels < 1 || channels >= ARRAY_LEN (map)) return 0 ; curr_map = map [channels].map ; @@ -248,7 +248,7 @@ aiff_caf_of_channel_layout_tag (int tag) unsigned k, len ; int channels = tag & 0xffff ; - if (channels < 0 || channels > ARRAY_LEN (map)) + if (channels < 0 || channels >= ARRAY_LEN (map)) return NULL ; curr_map = map [channels].map ; diff --git a/lib-src/libsndfile/src/chunk.c b/lib-src/libsndfile/src/chunk.c index dc17aaeab..471c5a443 100644 --- a/lib-src/libsndfile/src/chunk.c +++ b/lib-src/libsndfile/src/chunk.c @@ -1,5 +1,6 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo +** Copyright (C) 2012 IOhannes m zmoelnig, IEM ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -25,30 +26,231 @@ #include "sfendian.h" #include "common.h" +static int64_t +hash_of_str (const char * str) +{ int64_t marker = 0 ; + int k ; -void -pchk4_store (PRIV_CHUNK4 * pchk, int marker, sf_count_t offset, sf_count_t len) -{ - if (pchk->count >= ARRAY_LEN (pchk->l)) - return ; + for (k = 0 ; str [k] ; k++) + marker = marker * 0x7f + ((const uint8_t *) str) [k] ; - pchk->l [pchk->count].chunk = marker ; - pchk->l [pchk->count].offset = offset ; - pchk->l [pchk->count].len = len ; + return marker ; +} /* hash_of_str */ - pchk->count ++ ; +SF_CHUNK_ITERATOR * +psf_get_chunk_iterator (SF_PRIVATE * psf, const char * marker_str) +{ const READ_CHUNKS * pchk = &psf->rchunks ; + int idx ; - return ; -} /* pchk4_store */ + if (marker_str) + idx = psf_find_read_chunk_str (pchk, marker_str) ; + else + idx = pchk->used > 0 ? 0 : -1 ; + + if (idx < 0) + return NULL ; + + if (psf->iterator == NULL) + { psf->iterator = calloc (1, sizeof (SF_CHUNK_ITERATOR)) ; + if (psf->iterator == NULL) + return NULL ; + } ; + + psf->iterator->sndfile = (SNDFILE *) psf ; + + if (marker_str) + { int64_t hash ; + size_t marker_len ; + union + { uint32_t marker ; + char str [5] ; + } u ; + + snprintf (u.str, sizeof (u.str), "%s", marker_str) ; + + marker_len = strlen (marker_str) ; + if (marker_len > 64) + marker_len = 64 ; + + hash = marker_len > 4 ? hash_of_str (marker_str) : u.marker ; + + memcpy (psf->iterator->id, marker_str, marker_len) ; + psf->iterator->id_size = marker_len ; + psf->iterator->hash = hash ; + } + + psf->iterator->current = idx ; + + return psf->iterator ; +} /* psf_get_chunk_iterator */ + +SF_CHUNK_ITERATOR * +psf_next_chunk_iterator (const READ_CHUNKS * pchk , SF_CHUNK_ITERATOR * iterator) +{ uint64_t hash = iterator->hash ; + uint32_t k ; + + iterator->current++ ; + + if (hash) + { for (k = iterator->current ; k < pchk->used ; k++) + if (pchk->chunks [k].hash == hash) + { iterator->current = k ; + return iterator ; + } + } + else if (iterator->current < pchk->used) + return iterator ; + + /* No match, clear iterator and return NULL */ + memset (iterator, 0, sizeof (*iterator)) ; + return NULL ; +} /* psf_next_chunk_iterator */ + +static int +psf_store_read_chunk (READ_CHUNKS * pchk, const READ_CHUNK * rchunk) +{ if (pchk->count == 0) + { pchk->used = 0 ; + pchk->count = 20 ; + pchk->chunks = calloc (pchk->count, sizeof (READ_CHUNK)) ; + } + else if (pchk->used > pchk->count) + return SFE_INTERNAL ; + else if (pchk->used == pchk->count) + { READ_CHUNK * old_ptr = pchk->chunks ; + int new_count = 3 * (pchk->count + 1) / 2 ; + + pchk->chunks = realloc (old_ptr, new_count * sizeof (READ_CHUNK)) ; + if (pchk->chunks == NULL) + { pchk->chunks = old_ptr ; + return SFE_MALLOC_FAILED ; + } ; + pchk->count = new_count ; + } ; + + pchk->chunks [pchk->used] = *rchunk ; + + pchk->used ++ ; + + return SFE_NO_ERROR ; +} /* psf_store_read_chunk */ int -pchk4_find (PRIV_CHUNK4 * pchk, int marker) -{ int k ; +psf_store_read_chunk_u32 (READ_CHUNKS * pchk, uint32_t marker, sf_count_t offset, uint32_t len) +{ READ_CHUNK rchunk ; - for (k = 0 ; k < pchk->count ; k++) - if (pchk->l [k].chunk == marker) + memset (&rchunk, 0, sizeof (rchunk)) ; + + rchunk.hash = marker ; + rchunk.mark32 = marker ; + rchunk.offset = offset ; + rchunk.len = len ; + + rchunk.id_size = 4 ; + memcpy (rchunk.id, &marker, rchunk.id_size) ; + + return psf_store_read_chunk (pchk, &rchunk) ; +} /* psf_store_read_chunk_u32 */ + +int +psf_find_read_chunk_str (const READ_CHUNKS * pchk, const char * marker_str) +{ uint64_t hash ; + uint32_t k ; + union + { uint32_t marker ; + char str [5] ; + } u ; + + snprintf (u.str, sizeof (u.str), "%s", marker_str) ; + + hash = strlen (marker_str) > 4 ? hash_of_str (marker_str) : u.marker ; + + for (k = 0 ; k < pchk->used ; k++) + if (pchk->chunks [k].hash == hash) return k ; return -1 ; -} /* pchk4_find */ +} /* psf_find_read_chunk_str */ + +int +psf_find_read_chunk_m32 (const READ_CHUNKS * pchk, uint32_t marker) +{ uint32_t k ; + + for (k = 0 ; k < pchk->used ; k++) + if (pchk->chunks [k].mark32 == marker) + return k ; + + return -1 ; +} /* psf_find_read_chunk_m32 */ +int +psf_find_read_chunk_iterator (const READ_CHUNKS * pchk, const SF_CHUNK_ITERATOR * marker) +{ if (marker->current < pchk->used) + return marker->current ; + + return -1 ; +} /* psf_find_read_chunk_iterator */ + +int +psf_store_read_chunk_str (READ_CHUNKS * pchk, const char * marker_str, sf_count_t offset, uint32_t len) +{ READ_CHUNK rchunk ; + union + { uint32_t marker ; + char str [5] ; + } u ; + size_t marker_len ; + + memset (&rchunk, 0, sizeof (rchunk)) ; + snprintf (u.str, sizeof (u.str), "%s", marker_str) ; + + marker_len = strlen (marker_str) ; + + rchunk.hash = marker_len > 4 ? hash_of_str (marker_str) : u.marker ; + rchunk.mark32 = u.marker ; + rchunk.offset = offset ; + rchunk.len = len ; + + rchunk.id_size = marker_len > 64 ? 64 : marker_len ; + memcpy (rchunk.id, marker_str, rchunk.id_size) ; + + return psf_store_read_chunk (pchk, &rchunk) ; +} /* psf_store_read_chunk_str */ + +int +psf_save_write_chunk (WRITE_CHUNKS * pchk, const SF_CHUNK_INFO * chunk_info) +{ union + { uint32_t marker ; + char str [5] ; + /* Update snprintf() format string below when changing this */ + } u ; + uint32_t len ; + + if (pchk->count == 0) + { pchk->used = 0 ; + pchk->count = 20 ; + pchk->chunks = calloc (pchk->count, sizeof (WRITE_CHUNK)) ; + } + else if (pchk->used >= pchk->count) + { WRITE_CHUNK * old_ptr = pchk->chunks ; + int new_count = 3 * (pchk->count + 1) / 2 ; + + pchk->chunks = realloc (old_ptr, new_count * sizeof (WRITE_CHUNK)) ; + if (pchk->chunks == NULL) + { pchk->chunks = old_ptr ; + return SFE_MALLOC_FAILED ; + } ; + } ; + + len = chunk_info->datalen ; + while (len & 3) len ++ ; + + snprintf (u.str, sizeof (u.str), "%.4s", chunk_info->id) ; + + pchk->chunks [pchk->used].hash = strlen (chunk_info->id) > 4 ? hash_of_str (chunk_info->id) : u.marker ; + pchk->chunks [pchk->used].mark32 = u.marker ; + pchk->chunks [pchk->used].len = len ; + pchk->chunks [pchk->used].data = psf_memdup (chunk_info->data, chunk_info->datalen) ; + + pchk->used ++ ; + + return SFE_NO_ERROR ; +} /* psf_save_write_chunk */ diff --git a/lib-src/libsndfile/src/command.c b/lib-src/libsndfile/src/command.c index aae2a2716..bab5ca3e1 100644 --- a/lib-src/libsndfile/src/command.c +++ b/lib-src/libsndfile/src/command.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -47,11 +47,15 @@ static SF_FORMAT_INFO const simple_formats [] = "AU (Sun/Next 8-bit u-law)", "au" }, + { SF_FORMAT_CAF | SF_FORMAT_ALAC_16, + "CAF (Apple 16 bit ALAC)", "caf" + }, + { SF_FORMAT_CAF | SF_FORMAT_PCM_16, "CAF (Apple 16 bit PCM)", "caf" }, -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS { SF_FORMAT_FLAC | SF_FORMAT_PCM_16, "FLAC 16 bit", "flac" }, @@ -61,7 +65,11 @@ static SF_FORMAT_INFO const simple_formats [] = "OKI Dialogic VOX ADPCM", "vox" }, -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS + { SF_FORMAT_OGG | SF_FORMAT_OPUS, + "Ogg Opus (Xiph Foundation)", "opus" + }, + { SF_FORMAT_OGG | SF_FORMAT_VORBIS, "Ogg Vorbis (Xiph Foundation)", "oga" }, @@ -115,22 +123,22 @@ static SF_FORMAT_INFO const major_formats [] = { { SF_FORMAT_AIFF, "AIFF (Apple/SGI)", "aiff" }, { SF_FORMAT_AU, "AU (Sun/NeXT)", "au" }, - { SF_FORMAT_AVR, "AVR (Audio Visual Research)", "avr" }, - { SF_FORMAT_CAF, "CAF (Apple Core Audio File)", "caf" }, -#if HAVE_EXTERNAL_LIBS - { SF_FORMAT_FLAC, "FLAC (FLAC Lossless Audio Codec)", "flac" }, + { SF_FORMAT_AVR, "AVR (Audio Visual Research)", "avr" }, + { SF_FORMAT_CAF, "CAF (Apple Core Audio File)", "caf" }, +#if HAVE_EXTERNAL_XIPH_LIBS + { SF_FORMAT_FLAC, "FLAC (Free Lossless Audio Codec)", "flac" }, #endif { SF_FORMAT_HTK, "HTK (HMM Tool Kit)", "htk" }, { SF_FORMAT_SVX, "IFF (Amiga IFF/SVX8/SV16)", "iff" }, { SF_FORMAT_MAT4, "MAT4 (GNU Octave 2.0 / Matlab 4.2)", "mat" }, { SF_FORMAT_MAT5, "MAT5 (GNU Octave 2.1 / Matlab 5.0)", "mat" }, { SF_FORMAT_MPC2K, "MPC (Akai MPC 2k)", "mpc" }, -#if HAVE_EXTERNAL_LIBS - { SF_FORMAT_OGG, "OGG (OGG Container format)", "oga" }, +#if HAVE_EXTERNAL_XIPH_LIBS + { SF_FORMAT_OGG, "OGG (OGG Container format)", "oga" }, #endif { SF_FORMAT_PAF, "PAF (Ensoniq PARIS)", "paf" }, { SF_FORMAT_PVF, "PVF (Portable Voice Format)", "pvf" }, - { SF_FORMAT_RAW, "RAW (header-less)", "raw" }, + { SF_FORMAT_RAW, "RAW (header-less)", "raw" }, { SF_FORMAT_RF64, "RF64 (RIFF 64)", "rf64" }, { SF_FORMAT_SD2, "SD2 (Sound Designer II)", "sd2" }, { SF_FORMAT_SDS, "SDS (Midi Sample Dump Standard)", "sds" }, @@ -138,7 +146,7 @@ static SF_FORMAT_INFO const major_formats [] = { SF_FORMAT_VOC, "VOC (Creative Labs)", "voc" }, { SF_FORMAT_W64, "W64 (SoundFoundry WAVE 64)", "w64" }, { SF_FORMAT_WAV, "WAV (Microsoft)", "wav" }, - { SF_FORMAT_NIST, "WAV (NIST Sphere)", "wav" }, + { SF_FORMAT_NIST, "WAV (NIST Sphere)", "wav" }, { SF_FORMAT_WAVEX, "WAVEX (Microsoft)", "wav" }, { SF_FORMAT_WVE, "WVE (Psion Series 3)", "wve" }, { SF_FORMAT_XI, "XI (FastTracker 2)", "xi" }, @@ -188,18 +196,29 @@ static SF_FORMAT_INFO subtype_formats [] = { SF_FORMAT_G721_32, "32kbs G721 ADPCM", NULL }, { SF_FORMAT_G723_24, "24kbs G723 ADPCM", NULL }, + { SF_FORMAT_G723_40, "40kbs G723 ADPCM", NULL }, { SF_FORMAT_DWVW_12, "12 bit DWVW", NULL }, { SF_FORMAT_DWVW_16, "16 bit DWVW", NULL }, { SF_FORMAT_DWVW_24, "24 bit DWVW", NULL }, { SF_FORMAT_VOX_ADPCM, "VOX ADPCM", "vox" }, + { SF_FORMAT_NMS_ADPCM_16, "16kbs NMS ADPCM", NULL }, + { SF_FORMAT_NMS_ADPCM_24, "24kbs NMS ADPCM", NULL }, + { SF_FORMAT_NMS_ADPCM_32, "32kbs NMS ADPCM", NULL }, + { SF_FORMAT_DPCM_16, "16 bit DPCM", NULL }, { SF_FORMAT_DPCM_8, "8 bit DPCM", NULL }, -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS { SF_FORMAT_VORBIS, "Vorbis", NULL }, + { SF_FORMAT_OPUS, "Opus", NULL }, #endif + + { SF_FORMAT_ALAC_16, "16 bit ALAC", NULL }, + { SF_FORMAT_ALAC_20, "20 bit ALAC", NULL }, + { SF_FORMAT_ALAC_24, "24 bit ALAC", NULL }, + { SF_FORMAT_ALAC_32, "32 bit ALAC", NULL }, } ; /* subtype_formats */ int @@ -212,7 +231,9 @@ psf_get_format_subtype (SF_FORMAT_INFO *data) { int indx ; if (data->format < 0 || data->format >= (SIGNED_SIZEOF (subtype_formats) / SIGNED_SIZEOF (SF_FORMAT_INFO))) + { data->format = 0 ; return SFE_BAD_COMMAND_PARAM ; + } ; indx = data->format ; memcpy (data, &(subtype_formats [indx]), sizeof (SF_FORMAT_INFO)) ; @@ -258,7 +279,8 @@ psf_get_format_info (SF_FORMAT_INFO *data) double psf_calc_signal_max (SF_PRIVATE *psf, int normalize) -{ sf_count_t position ; +{ BUF_UNION ubuf ; + sf_count_t position ; double max_val, temp, *data ; int k, len, readcount, save_state ; @@ -282,8 +304,9 @@ psf_calc_signal_max (SF_PRIVATE *psf, int normalize) /* Go to start of file. */ sf_seek ((SNDFILE*) psf, 0, SEEK_SET) ; - data = psf->u.dbuf ; - len = ARRAY_LEN (psf->u.dbuf) ; + data = ubuf.dbuf ; + /* Make sure len is an integer multiple of the channel count. */ + len = ARRAY_LEN (ubuf.dbuf) - (ARRAY_LEN (ubuf.dbuf) % psf->sf.channels) ; for (readcount = 1, max_val = 0.0 ; readcount > 0 ; /* nothing */) { readcount = sf_read_double ((SNDFILE*) psf, data, len) ; @@ -302,7 +325,8 @@ psf_calc_signal_max (SF_PRIVATE *psf, int normalize) int psf_calc_max_all_channels (SF_PRIVATE *psf, double *peaks, int normalize) -{ sf_count_t position ; +{ BUF_UNION ubuf ; + sf_count_t position ; double temp, *data ; int k, len, readcount, save_state ; int chan ; @@ -323,9 +347,9 @@ psf_calc_max_all_channels (SF_PRIVATE *psf, double *peaks, int normalize) position = sf_seek ((SNDFILE*) psf, 0, SEEK_CUR) ; /* Get current position in file */ sf_seek ((SNDFILE*) psf, 0, SEEK_SET) ; /* Go to start of file. */ - len = ARRAY_LEN (psf->u.dbuf) ; + len = ARRAY_LEN (ubuf.dbuf) - (ARRAY_LEN (ubuf.dbuf) % psf->sf.channels) ; - data = psf->u.dbuf ; + data = ubuf.dbuf ; chan = 0 ; readcount = len ; diff --git a/lib-src/libsndfile/src/common.c b/lib-src/libsndfile/src/common.c index 050ae4b6b..35e82f1df 100644 --- a/lib-src/libsndfile/src/common.c +++ b/lib-src/libsndfile/src/common.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2019 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -16,45 +16,96 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include -#include -#include -#include -#include -#include -#ifdef HAVE_SYS_TIME_H -#include +#include +#include +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" #endif +#include +#include +#include +#if HAVE_SYS_TIME_H +#include +#endif +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" -#include "sndfile.h" -#include "sfendian.h" -#include "common.h" +#define INITIAL_HEADER_SIZE 256 + +/* Allocate and initialize the SF_PRIVATE struct. */ +SF_PRIVATE * +psf_allocate (void) +{ SF_PRIVATE * psf ; + + if ((psf = calloc (1, sizeof (SF_PRIVATE))) == NULL) + return NULL ; + + if ((psf->header.ptr = calloc (1, INITIAL_HEADER_SIZE)) == NULL) + { free (psf) ; + return NULL ; + } ; + psf->header.len = INITIAL_HEADER_SIZE ; + + return psf ; +} /* psf_allocate */ + +static int +psf_bump_header_allocation (SF_PRIVATE * psf, sf_count_t needed) +{ + sf_count_t newlen, smallest = INITIAL_HEADER_SIZE ; + void * ptr ; + + newlen = (needed > psf->header.len) ? 2 * SF_MAX (needed, smallest) : 2 * psf->header.len ; + + if (newlen > 100 * 1024) + { psf_log_printf (psf, "Request for header allocation of %D denied.\n", newlen) ; + return 1 ; + } + + if ((ptr = realloc (psf->header.ptr, newlen)) == NULL) + { psf_log_printf (psf, "realloc (%p, %D) failed\n", psf->header.ptr, newlen) ; + psf->error = SFE_MALLOC_FAILED ; + return 1 ; + } ; + + /* Always zero-out new header memory to avoid un-initializer memory accesses. */ + if (newlen > psf->header.len) + memset ((char *) ptr + psf->header.len, 0, newlen - psf->header.len) ; + + psf->header.ptr = ptr ; + psf->header.len = newlen ; + return 0 ; +} /* psf_bump_header_allocation */ /*----------------------------------------------------------------------------------------------- -** psf_log_printf allows libsndfile internal functions to print to an internal logbuffer which +** psf_log_printf allows libsndfile internal functions to print to an internal parselog which ** can later be displayed. ** The format specifiers are as for printf but without the field width and other modifiers. -** Printing is performed to the logbuffer char array of the SF_PRIVATE struct. +** Printing is performed to the parselog char array of the SF_PRIVATE struct. ** Printing is done in such a way as to guarantee that the log never overflows the end of the -** logbuffer array. +** parselog array. */ static inline void log_putchar (SF_PRIVATE *psf, char ch) -{ if (psf->logindex < SIGNED_SIZEOF (psf->logbuffer) - 1) - { psf->logbuffer [psf->logindex++] = ch ; - psf->logbuffer [psf->logindex] = 0 ; +{ if (psf->parselog.indx < SIGNED_SIZEOF (psf->parselog.buf) - 1) + { psf->parselog.buf [psf->parselog.indx++] = ch ; + psf->parselog.buf [psf->parselog.indx] = 0 ; } ; return ; } /* log_putchar */ void psf_log_printf (SF_PRIVATE *psf, const char *format, ...) -{ va_list ap ; - unsigned int u ; - int d, tens, shift, width, width_specifier, left_align ; - char c, *strptr, istr [5], lead_char, sign_char ; +{ va_list ap ; + uint32_t u ; + int d, tens, shift, width, width_specifier, left_align, slen ; + char c, *strptr, istr [5], lead_char, sign_char ; va_start (ap, format) ; @@ -111,7 +162,8 @@ psf_log_printf (SF_PRIVATE *psf, const char *format, ...) strptr = va_arg (ap, char *) ; if (strptr == NULL) break ; - width_specifier -= strlen (strptr) ; + slen = strlen (strptr) ; + width_specifier = width_specifier >= slen ? width_specifier - slen : 0 ; if (left_align == SF_FALSE) while (width_specifier -- > 0) log_putchar (psf, ' ') ; @@ -268,7 +320,7 @@ psf_log_printf (SF_PRIVATE *psf, const char *format, ...) } ; shift = 28 ; width = (width_specifier < 8) ? 8 : width_specifier ; - while (! ((0xF << shift) & d)) + while (! ((((uint32_t) 0xF) << shift) & d)) { shift -= 4 ; width -- ; } ; @@ -333,9 +385,12 @@ psf_asciiheader_printf (SF_PRIVATE *psf, const char *format, ...) int maxlen ; char *start ; - maxlen = strlen ((char*) psf->header) ; - start = ((char*) psf->header) + maxlen ; - maxlen = sizeof (psf->header) - maxlen ; + if (! format) + return ; + + maxlen = strlen ((char*) psf->header.ptr) ; + start = ((char*) psf->header.ptr) + maxlen ; + maxlen = psf->header.len - maxlen ; va_start (argptr, format) ; vsnprintf (start, maxlen, format, argptr) ; @@ -344,7 +399,7 @@ psf_asciiheader_printf (SF_PRIVATE *psf, const char *format, ...) /* Make sure the string is properly terminated. */ start [maxlen - 1] = 0 ; - psf->headindex = strlen ((char*) psf->header) ; + psf->header.indx = strlen ((char*) psf->header.ptr) ; return ; } /* psf_asciiheader_printf */ @@ -369,6 +424,8 @@ psf_asciiheader_printf (SF_PRIVATE *psf, const char *format, ...) ** ** s - string preceded by a four byte length ** S - string including null terminator +** p - a Pascal string +** ** f - floating point data ** d - double precision floating point data ** h - 16 binary bytes value @@ -395,30 +452,25 @@ psf_asciiheader_printf (SF_PRIVATE *psf, const char *format, ...) static inline void header_put_byte (SF_PRIVATE *psf, char x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 1) - psf->header [psf->headindex++] = x ; +{ psf->header.ptr [psf->header.indx++] = x ; } /* header_put_byte */ #if (CPU_IS_BIG_ENDIAN == 1) static inline void header_put_marker (SF_PRIVATE *psf, int x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 4) - { psf->header [psf->headindex++] = (x >> 24) ; - psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = x ; - } ; +{ psf->header.ptr [psf->header.indx++] = (x >> 24) ; + psf->header.ptr [psf->header.indx++] = (x >> 16) ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = x ; } /* header_put_marker */ #elif (CPU_IS_LITTLE_ENDIAN == 1) static inline void header_put_marker (SF_PRIVATE *psf, int x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 4) - { psf->header [psf->headindex++] = x ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 24) ; - } ; +{ psf->header.ptr [psf->header.indx++] = x ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = (x >> 16) ; + psf->header.ptr [psf->header.indx++] = (x >> 24) ; } /* header_put_marker */ #else @@ -428,120 +480,74 @@ header_put_marker (SF_PRIVATE *psf, int x) static inline void header_put_be_short (SF_PRIVATE *psf, int x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 2) - { psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = x ; - } ; +{ psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = x ; } /* header_put_be_short */ static inline void header_put_le_short (SF_PRIVATE *psf, int x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 2) - { psf->header [psf->headindex++] = x ; - psf->header [psf->headindex++] = (x >> 8) ; - } ; +{ psf->header.ptr [psf->header.indx++] = x ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; } /* header_put_le_short */ static inline void header_put_be_3byte (SF_PRIVATE *psf, int x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 3) - { psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = x ; - } ; +{ psf->header.ptr [psf->header.indx++] = (x >> 16) ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = x ; } /* header_put_be_3byte */ static inline void header_put_le_3byte (SF_PRIVATE *psf, int x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 3) - { psf->header [psf->headindex++] = x ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = (x >> 16) ; - } ; +{ psf->header.ptr [psf->header.indx++] = x ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = (x >> 16) ; } /* header_put_le_3byte */ static inline void header_put_be_int (SF_PRIVATE *psf, int x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 4) - { psf->header [psf->headindex++] = (x >> 24) ; - psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = x ; - } ; +{ psf->header.ptr [psf->header.indx++] = (x >> 24) ; + psf->header.ptr [psf->header.indx++] = (x >> 16) ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = x ; } /* header_put_be_int */ static inline void header_put_le_int (SF_PRIVATE *psf, int x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 4) - { psf->header [psf->headindex++] = x ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 24) ; - } ; +{ psf->header.ptr [psf->header.indx++] = x ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = (x >> 16) ; + psf->header.ptr [psf->header.indx++] = (x >> 24) ; } /* header_put_le_int */ -#if (SIZEOF_SF_COUNT_T == 4) +#if (SIZEOF_SF_COUNT_T == 8) static inline void header_put_be_8byte (SF_PRIVATE *psf, sf_count_t x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 8) - { psf->header [psf->headindex++] = 0 ; - psf->header [psf->headindex++] = 0 ; - psf->header [psf->headindex++] = 0 ; - psf->header [psf->headindex++] = 0 ; - psf->header [psf->headindex++] = (x >> 24) ; - psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = x ; - } ; +{ psf->header.ptr [psf->header.indx++] = (x >> 56) ; + psf->header.ptr [psf->header.indx++] = (x >> 48) ; + psf->header.ptr [psf->header.indx++] = (x >> 40) ; + psf->header.ptr [psf->header.indx++] = (x >> 32) ; + psf->header.ptr [psf->header.indx++] = (x >> 24) ; + psf->header.ptr [psf->header.indx++] = (x >> 16) ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = x ; } /* header_put_be_8byte */ static inline void header_put_le_8byte (SF_PRIVATE *psf, sf_count_t x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 8) - { psf->header [psf->headindex++] = x ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 24) ; - psf->header [psf->headindex++] = 0 ; - psf->header [psf->headindex++] = 0 ; - psf->header [psf->headindex++] = 0 ; - psf->header [psf->headindex++] = 0 ; - } ; -} /* header_put_le_8byte */ - -#elif (SIZEOF_SF_COUNT_T == 8) - -static inline void -header_put_be_8byte (SF_PRIVATE *psf, sf_count_t x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 8) - { psf->header [psf->headindex++] = (x >> 56) ; - psf->header [psf->headindex++] = (x >> 48) ; - psf->header [psf->headindex++] = (x >> 40) ; - psf->header [psf->headindex++] = (x >> 32) ; - psf->header [psf->headindex++] = (x >> 24) ; - psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = x ; - } ; -} /* header_put_be_8byte */ - -static inline void -header_put_le_8byte (SF_PRIVATE *psf, sf_count_t x) -{ if (psf->headindex < SIGNED_SIZEOF (psf->header) - 8) - { psf->header [psf->headindex++] = x ; - psf->header [psf->headindex++] = (x >> 8) ; - psf->header [psf->headindex++] = (x >> 16) ; - psf->header [psf->headindex++] = (x >> 24) ; - psf->header [psf->headindex++] = (x >> 32) ; - psf->header [psf->headindex++] = (x >> 40) ; - psf->header [psf->headindex++] = (x >> 48) ; - psf->header [psf->headindex++] = (x >> 56) ; - } ; +{ psf->header.ptr [psf->header.indx++] = x ; + psf->header.ptr [psf->header.indx++] = (x >> 8) ; + psf->header.ptr [psf->header.indx++] = (x >> 16) ; + psf->header.ptr [psf->header.indx++] = (x >> 24) ; + psf->header.ptr [psf->header.indx++] = (x >> 32) ; + psf->header.ptr [psf->header.indx++] = (x >> 40) ; + psf->header.ptr [psf->header.indx++] = (x >> 48) ; + psf->header.ptr [psf->header.indx++] = (x >> 56) ; } /* header_put_le_8byte */ #else -#error "SIZEOF_SF_COUNT_T is not defined." +#error "SIZEOF_SF_COUNT_T != 8" #endif int @@ -555,14 +561,19 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) void *bindata ; size_t size ; char c, *strptr ; - int count = 0, trunc_8to4 ; + int count = 0, trunc_8to4 = SF_FALSE ; - trunc_8to4 = SF_FALSE ; + if (! format) + return psf_ftell (psf) ; va_start (argptr, format) ; while ((c = *format++)) - { switch (c) + { + if (psf->header.indx + 16 >= psf->header.len && psf_bump_header_allocation (psf, 16)) + return count ; + + switch (c) { case ' ' : /* Do nothing. Just used to space out format string. */ break ; @@ -653,20 +664,20 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) /* Floats are passed as doubles. Is this always true? */ floatdata = (float) va_arg (argptr, double) ; if (psf->rwf_endian == SF_ENDIAN_BIG) - float32_be_write (floatdata, psf->header + psf->headindex) ; + float32_be_write (floatdata, psf->header.ptr + psf->header.indx) ; else - float32_le_write (floatdata, psf->header + psf->headindex) ; - psf->headindex += 4 ; + float32_le_write (floatdata, psf->header.ptr + psf->header.indx) ; + psf->header.indx += 4 ; count += 4 ; break ; case 'd' : doubledata = va_arg (argptr, double) ; if (psf->rwf_endian == SF_ENDIAN_BIG) - double64_be_write (doubledata, psf->header + psf->headindex) ; + double64_be_write (doubledata, psf->header.ptr + psf->header.indx) ; else - double64_le_write (doubledata, psf->header + psf->headindex) ; - psf->headindex += 8 ; + double64_le_write (doubledata, psf->header.ptr + psf->header.indx) ; + psf->header.indx += 8 ; count += 8 ; break ; @@ -674,14 +685,18 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) /* Write a C string (guaranteed to have a zero terminator). */ strptr = va_arg (argptr, char *) ; size = strlen (strptr) + 1 ; - size += (size & 1) ; + + if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1))) + return count ; + if (psf->rwf_endian == SF_ENDIAN_BIG) - header_put_be_int (psf, size) ; + header_put_be_int (psf, size + (size & 1)) ; else - header_put_le_int (psf, size) ; - memcpy (&(psf->header [psf->headindex]), strptr, size) ; - psf->headindex += size ; - psf->header [psf->headindex - 1] = 0 ; + header_put_le_int (psf, size + (size & 1)) ; + memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ; + size += (size & 1) ; + psf->header.indx += size ; + psf->header.ptr [psf->header.indx - 1] = 0 ; count += 4 + size ; break ; @@ -692,46 +707,85 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) */ strptr = va_arg (argptr, char *) ; size = strlen (strptr) ; + if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1))) + return count ; if (psf->rwf_endian == SF_ENDIAN_BIG) header_put_be_int (psf, size) ; else header_put_le_int (psf, size) ; - memcpy (&(psf->header [psf->headindex]), strptr, size + 1) ; + memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + (size & 1)) ; size += (size & 1) ; - psf->headindex += size ; - psf->header [psf->headindex] = 0 ; + psf->header.indx += size ; count += 4 + size ; break ; + case 'p' : + /* Write a PASCAL string (as used by AIFF files). + */ + strptr = va_arg (argptr, char *) ; + size = strlen (strptr) ; + size = (size & 1) ? size : size + 1 ; + size = (size > 254) ? 254 : size ; + + if (psf->header.indx + 1 + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, 1 + size)) + return count ; + + header_put_byte (psf, size) ; + memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ; + psf->header.indx += size ; + count += 1 + size ; + break ; + case 'b' : bindata = va_arg (argptr, void *) ; size = va_arg (argptr, size_t) ; - memcpy (&(psf->header [psf->headindex]), bindata, size) ; - psf->headindex += size ; + + if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) + return count ; + + memcpy (&(psf->header.ptr [psf->header.indx]), bindata, size) ; + psf->header.indx += size ; count += size ; break ; case 'z' : size = va_arg (argptr, size_t) ; + + if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) + return count ; + count += size ; while (size) - { psf->header [psf->headindex] = 0 ; - psf->headindex ++ ; + { psf->header.ptr [psf->header.indx] = 0 ; + psf->header.indx ++ ; size -- ; } ; break ; case 'h' : bindata = va_arg (argptr, void *) ; - memcpy (&(psf->header [psf->headindex]), bindata, 16) ; - psf->headindex += 16 ; + memcpy (&(psf->header.ptr [psf->header.indx]), bindata, 16) ; + psf->header.indx += 16 ; count += 16 ; break ; - case 'j' : + case 'j' : /* Jump forwards/backwards by specified amount. */ size = va_arg (argptr, size_t) ; - psf->headindex += size ; - count = size ; + + if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) + return count ; + + psf->header.indx += size ; + count += size ; + break ; + + case 'o' : /* Jump to specified offset. */ + size = va_arg (argptr, size_t) ; + + if ((sf_count_t) size >= psf->header.len && psf_bump_header_allocation (psf, size)) + return count ; + + psf->header.indx = size ; break ; default : @@ -757,38 +811,38 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) */ #if (CPU_IS_BIG_ENDIAN == 1) -#define GET_MARKER(ptr) ( ((ptr) [0] << 24) | ((ptr) [1] << 16) | \ - ((ptr) [2] << 8) | ((ptr) [3]) ) +#define GET_MARKER(ptr) ( (((uint32_t) (ptr) [0]) << 24) | ((ptr) [1] << 16) | \ + ((ptr) [2] << 8) | ((ptr) [3])) #elif (CPU_IS_LITTLE_ENDIAN == 1) #define GET_MARKER(ptr) ( ((ptr) [0]) | ((ptr) [1] << 8) | \ - ((ptr) [2] << 16) | ((ptr) [3] << 24) ) + ((ptr) [2] << 16) | (((uint32_t) (ptr) [3]) << 24)) #else # error "Cannot determine endian-ness of processor." #endif -#define GET_LE_SHORT(ptr) ( ((ptr) [1] << 8) | ((ptr) [0]) ) -#define GET_BE_SHORT(ptr) ( ((ptr) [0] << 8) | ((ptr) [1]) ) +#define GET_LE_SHORT(ptr) (((ptr) [1] << 8) | ((ptr) [0])) +#define GET_BE_SHORT(ptr) (((ptr) [0] << 8) | ((ptr) [1])) -#define GET_LE_3BYTE(ptr) ( ((ptr) [2] << 16) | ((ptr) [1] << 8) | ((ptr) [0]) ) -#define GET_BE_3BYTE(ptr) ( ((ptr) [0] << 16) | ((ptr) [1] << 8) | ((ptr) [2]) ) +#define GET_LE_3BYTE(ptr) ( ((ptr) [2] << 16) | ((ptr) [1] << 8) | ((ptr) [0])) +#define GET_BE_3BYTE(ptr) ( ((ptr) [0] << 16) | ((ptr) [1] << 8) | ((ptr) [2])) -#define GET_LE_INT(ptr) ( ((ptr) [3] << 24) | ((ptr) [2] << 16) | \ - ((ptr) [1] << 8) | ((ptr) [0]) ) +#define GET_LE_INT(ptr) ( ((ptr) [3] << 24) | ((ptr) [2] << 16) | \ + ((ptr) [1] << 8) | ((ptr) [0])) -#define GET_BE_INT(ptr) ( ((ptr) [0] << 24) | ((ptr) [1] << 16) | \ - ((ptr) [2] << 8) | ((ptr) [3]) ) +#define GET_BE_INT(ptr) ( ((ptr) [0] << 24) | ((ptr) [1] << 16) | \ + ((ptr) [2] << 8) | ((ptr) [3])) -#define GET_LE_8BYTE(ptr) ( (((sf_count_t) (ptr) [7]) << 56) | (((sf_count_t) (ptr) [6]) << 48) | \ - (((sf_count_t) (ptr) [5]) << 40) | (((sf_count_t) (ptr) [4]) << 32) | \ - (((sf_count_t) (ptr) [3]) << 24) | (((sf_count_t) (ptr) [2]) << 16) | \ - (((sf_count_t) (ptr) [1]) << 8 ) | ((ptr) [0])) +#define GET_LE_8BYTE(ptr) ( (((sf_count_t) (ptr) [7]) << 56) | (((sf_count_t) (ptr) [6]) << 48) | \ + (((sf_count_t) (ptr) [5]) << 40) | (((sf_count_t) (ptr) [4]) << 32) | \ + (((sf_count_t) (ptr) [3]) << 24) | (((sf_count_t) (ptr) [2]) << 16) | \ + (((sf_count_t) (ptr) [1]) << 8) | ((ptr) [0])) -#define GET_BE_8BYTE(ptr) ( (((sf_count_t) (ptr) [0]) << 56) | (((sf_count_t) (ptr) [1]) << 48) | \ - (((sf_count_t) (ptr) [2]) << 40) | (((sf_count_t) (ptr) [3]) << 32) | \ - (((sf_count_t) (ptr) [4]) << 24) | (((sf_count_t) (ptr) [5]) << 16) | \ - (((sf_count_t) (ptr) [6]) << 8 ) | ((ptr) [7])) +#define GET_BE_8BYTE(ptr) ( (((sf_count_t) (ptr) [0]) << 56) | (((sf_count_t) (ptr) [1]) << 48) | \ + (((sf_count_t) (ptr) [2]) << 40) | (((sf_count_t) (ptr) [3]) << 32) | \ + (((sf_count_t) (ptr) [4]) << 24) | (((sf_count_t) (ptr) [5]) << 16) | \ + (((sf_count_t) (ptr) [6]) << 8) | ((ptr) [7])) @@ -796,36 +850,20 @@ static int header_read (SF_PRIVATE *psf, void *ptr, int bytes) { int count = 0 ; - if (psf->headindex >= SIGNED_SIZEOF (psf->header)) - { memset (ptr, 0, SIGNED_SIZEOF (psf->header) - psf->headindex) ; + if (psf->header.indx + bytes >= psf->header.len && psf_bump_header_allocation (psf, bytes)) + return count ; - /* This is the best that we can do. */ - psf_fseek (psf, bytes, SEEK_CUR) ; - return bytes ; - } ; - - if (psf->headindex + bytes > SIGNED_SIZEOF (psf->header)) - { int most ; - - most = SIGNED_SIZEOF (psf->header) - psf->headindex ; - psf_fread (psf->header + psf->headend, 1, most, psf) ; - memset ((char *) ptr + most, 0, bytes - most) ; - - psf_fseek (psf, bytes - most, SEEK_CUR) ; - return bytes ; - } ; - - if (psf->headindex + bytes > psf->headend) - { count = psf_fread (psf->header + psf->headend, 1, bytes - (psf->headend - psf->headindex), psf) ; - if (count != bytes - (int) (psf->headend - psf->headindex)) + if (psf->header.indx + bytes > psf->header.end) + { count = psf_fread (psf->header.ptr + psf->header.end, 1, bytes - (psf->header.end - psf->header.indx), psf) ; + if (count != bytes - (int) (psf->header.end - psf->header.indx)) { psf_log_printf (psf, "Error : psf_fread returned short count.\n") ; - return 0 ; + return count ; } ; - psf->headend += count ; + psf->header.end += count ; } ; - memcpy (ptr, psf->header + psf->headindex, bytes) ; - psf->headindex += bytes ; + memcpy (ptr, psf->header.ptr + psf->header.indx, bytes) ; + psf->header.indx += bytes ; return bytes ; } /* header_read */ @@ -833,42 +871,46 @@ header_read (SF_PRIVATE *psf, void *ptr, int bytes) static void header_seek (SF_PRIVATE *psf, sf_count_t position, int whence) { - switch (whence) { case SEEK_SET : - if (position > SIGNED_SIZEOF (psf->header)) + if (psf->header.indx + position >= psf->header.len) + psf_bump_header_allocation (psf, position) ; + if (position > psf->header.len) { /* Too much header to cache so just seek instead. */ psf_fseek (psf, position, whence) ; return ; } ; - if (position > psf->headend) - psf->headend += psf_fread (psf->header + psf->headend, 1, position - psf->headend, psf) ; - psf->headindex = position ; + if (position > psf->header.end) + psf->header.end += psf_fread (psf->header.ptr + psf->header.end, 1, position - psf->header.end, psf) ; + psf->header.indx = position ; break ; case SEEK_CUR : - if (psf->headindex + position < 0) + if (psf->header.indx + position >= psf->header.len) + psf_bump_header_allocation (psf, position) ; + + if (psf->header.indx + position < 0) break ; - if (psf->headindex >= SIGNED_SIZEOF (psf->header)) + if (psf->header.indx >= psf->header.len) { psf_fseek (psf, position, whence) ; return ; } ; - if (psf->headindex + position <= psf->headend) - { psf->headindex += position ; + if (psf->header.indx + position <= psf->header.end) + { psf->header.indx += position ; break ; } ; - if (psf->headindex + position > SIGNED_SIZEOF (psf->header)) + if (psf->header.indx + position > psf->header.len) { /* Need to jump this without caching it. */ - psf->headindex = psf->headend ; + psf->header.indx = psf->header.end ; psf_fseek (psf, position, SEEK_CUR) ; break ; } ; - psf->headend += psf_fread (psf->header + psf->headend, 1, position - (psf->headend - psf->headindex), psf) ; - psf->headindex = psf->headend ; + psf->header.end += psf_fread (psf->header.ptr + psf->header.end, 1, position - (psf->header.end - psf->header.indx), psf) ; + psf->header.indx = psf->header.end ; break ; case SEEK_END : @@ -882,18 +924,20 @@ header_seek (SF_PRIVATE *psf, sf_count_t position, int whence) static int header_gets (SF_PRIVATE *psf, char *ptr, int bufsize) -{ - int k ; +{ int k ; + + if (psf->header.indx + bufsize >= psf->header.len && psf_bump_header_allocation (psf, bufsize)) + return 0 ; for (k = 0 ; k < bufsize - 1 ; k++) - { if (psf->headindex < psf->headend) - { ptr [k] = psf->header [psf->headindex] ; - psf->headindex ++ ; + { if (psf->header.indx < psf->header.end) + { ptr [k] = psf->header.ptr [psf->header.indx] ; + psf->header.indx ++ ; } else - { psf->headend += psf_fread (psf->header + psf->headend, 1, 1, psf) ; - ptr [k] = psf->header [psf->headindex] ; - psf->headindex = psf->headend ; + { psf->header.end += psf_fread (psf->header.ptr + psf->header.end, 1, 1, psf) ; + ptr [k] = psf->header.ptr [psf->header.indx] ; + psf->header.indx = psf->header.end ; } ; if (ptr [k] == '\n') @@ -916,7 +960,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) float *floatptr ; double *doubleptr ; char c ; - int byte_count = 0, count ; + int byte_count = 0, count = 0 ; if (! format) return psf_ftell (psf) ; @@ -924,7 +968,11 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) va_start (argptr, format) ; while ((c = *format++)) - { switch (c) + { + if (psf->header.indx + 16 >= psf->header.len && psf_bump_header_allocation (psf, 16)) + return count ; + + switch (c) { case 'e' : /* All conversions are now from LE to host. */ psf->rwf_endian = SF_ENDIAN_LITTLE ; break ; @@ -933,8 +981,9 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) psf->rwf_endian = SF_ENDIAN_BIG ; break ; - case 'm' : + case 'm' : /* 4 byte marker value eg 'RIFF' */ intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; ucptr = (unsigned char*) intptr ; byte_count += header_read (psf, ucptr, sizeof (int)) ; *intptr = GET_MARKER (ucptr) ; @@ -942,6 +991,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) case 'h' : intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; ucptr = (unsigned char*) intptr ; byte_count += header_read (psf, sixteen_bytes, sizeof (sixteen_bytes)) ; { int k ; @@ -958,7 +1008,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) byte_count += header_read (psf, charptr, sizeof (char)) ; break ; - case '2' : + case '2' : /* 2 byte value with the current endian-ness */ shortptr = va_arg (argptr, unsigned short*) ; *shortptr = 0 ; ucptr = (unsigned char*) shortptr ; @@ -969,7 +1019,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) *shortptr = GET_LE_SHORT (ucptr) ; break ; - case '3' : + case '3' : /* 3 byte value with the current endian-ness */ intptr = va_arg (argptr, unsigned int*) ; *intptr = 0 ; byte_count += header_read (psf, sixteen_bytes, 3) ; @@ -979,25 +1029,25 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) *intptr = GET_LE_3BYTE (sixteen_bytes) ; break ; - case '4' : + case '4' : /* 4 byte value with the current endian-ness */ intptr = va_arg (argptr, unsigned int*) ; *intptr = 0 ; ucptr = (unsigned char*) intptr ; byte_count += header_read (psf, ucptr, sizeof (int)) ; if (psf->rwf_endian == SF_ENDIAN_BIG) - *intptr = GET_BE_INT (ucptr) ; + *intptr = psf_get_be32 (ucptr, 0) ; else - *intptr = GET_LE_INT (ucptr) ; + *intptr = psf_get_le32 (ucptr, 0) ; break ; - case '8' : + case '8' : /* 8 byte value with the current endian-ness */ countptr = va_arg (argptr, sf_count_t *) ; *countptr = 0 ; byte_count += header_read (psf, sixteen_bytes, 8) ; if (psf->rwf_endian == SF_ENDIAN_BIG) - countdata = GET_BE_8BYTE (sixteen_bytes) ; + countdata = psf_get_be64 (sixteen_bytes, 0) ; else - countdata = GET_LE_8BYTE (sixteen_bytes) ; + countdata = psf_get_le64 (sixteen_bytes, 0) ; *countptr = countdata ; break ; @@ -1027,25 +1077,29 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) strptr = va_arg (argptr, char *) ; size = strlen (strptr) + 1 ; size += (size & 1) ; - longdata = H2LE_INT (size) ; + longdata = H2LE_32 (size) ; get_int (psf, longdata) ; - memcpy (&(psf->header [psf->headindex]), strptr, size) ; - psf->headindex += size ; + memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ; + psf->header.indx += size ; */ break ; - case 'b' : + case 'b' : /* Raw bytes */ charptr = va_arg (argptr, char*) ; count = va_arg (argptr, size_t) ; - if (count > 0) - byte_count += header_read (psf, charptr, count) ; + memset (charptr, 0, count) ; + byte_count += header_read (psf, charptr, count) ; break ; case 'G' : charptr = va_arg (argptr, char*) ; count = va_arg (argptr, size_t) ; - if (count > 0) - byte_count += header_gets (psf, charptr, count) ; + memset (charptr, 0, count) ; + + if (psf->header.indx + count >= psf->header.len && psf_bump_header_allocation (psf, count)) + return 0 ; + + byte_count += header_gets (psf, charptr, count) ; break ; case 'z' : @@ -1053,22 +1107,20 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) /* size = va_arg (argptr, size_t) ; while (size) - { psf->header [psf->headindex] = 0 ; - psf->headindex ++ ; + { psf->header.ptr [psf->header.indx] = 0 ; + psf->header.indx ++ ; size -- ; } ; */ break ; - case 'p' : - /* Get the seek position first. */ + case 'p' : /* Seek to position from start. */ count = va_arg (argptr, size_t) ; header_seek (psf, count, SEEK_SET) ; byte_count = count ; break ; - case 'j' : - /* Get the seek position first. */ + case 'j' : /* Seek to position from current position. */ count = va_arg (argptr, size_t) ; header_seek (psf, count, SEEK_CUR) ; byte_count += count ; @@ -1152,7 +1204,10 @@ psf_log_SF_INFO (SF_PRIVATE *psf) { psf_log_printf (psf, "---------------------------------\n") ; psf_log_printf (psf, " Sample rate : %d\n", psf->sf.samplerate) ; - psf_log_printf (psf, " Frames : %D\n", psf->sf.frames) ; + if (psf->sf.frames == SF_COUNT_MAX) + psf_log_printf (psf, " Frames : unknown\n") ; + else + psf_log_printf (psf, " Frames : %D\n", psf->sf.frames) ; psf_log_printf (psf, " Channels : %d\n", psf->sf.channels) ; psf_log_printf (psf, " Format : 0x%X\n", psf->sf.format) ; @@ -1184,6 +1239,57 @@ psf_memset (void *s, int c, sf_count_t len) return s ; } /* psf_memset */ + +/* +** Clang refuses to do sizeof (SF_CUES_VAR (cue_count)) so we have to manually +** bodgy something up instead. +*/ + +typedef SF_CUES_VAR (0) SF_CUES_0 ; + +/* calculate size of SF_CUES struct given number of cues */ +#define SF_CUES_VAR_SIZE(count) (sizeof (SF_CUES_0) + count * sizeof (SF_CUE_POINT)) + +/* calculate number of cues in SF_CUES struct given data size */ +#define SF_CUES_COUNT(datasize) (((datasize) - sizeof (uint32_t)) / sizeof (SF_CUE_POINT)) + +SF_CUES * +psf_cues_alloc (uint32_t cue_count) +{ SF_CUES *pcues = calloc (1, SF_CUES_VAR_SIZE (cue_count)) ; + + pcues->cue_count = cue_count ; + return pcues ; +} /* psf_cues_alloc */ + +SF_CUES * +psf_cues_dup (const void * ptr, size_t datasize) +{ const SF_CUES *pcues = ptr ; + SF_CUES *pnew = NULL ; + + if (pcues->cue_count <= SF_CUES_COUNT (datasize)) + { /* check that passed-in datasize is consistent with cue_count in passed-in SF_CUES struct */ + pnew = psf_cues_alloc (pcues->cue_count) ; + memcpy (pnew, pcues, SF_CUES_VAR_SIZE (pcues->cue_count)) ; + } + + return pnew ; +} /* psf_cues_dup */ + +void +psf_get_cues (SF_PRIVATE * psf, void * data, size_t datasize) +{ + if (psf->cues) + { uint32_t cue_count = SF_CUES_COUNT (datasize) ; + + cue_count = SF_MIN (cue_count, psf->cues->cue_count) ; + memcpy (data, psf->cues, SF_CUES_VAR_SIZE (cue_count)) ; + ((SF_CUES*) data)->cue_count = cue_count ; + } ; + + return ; +} /* psf_get_cues */ + + SF_INSTRUMENT * psf_instrument_alloc (void) { SF_INSTRUMENT *instr ; @@ -1295,10 +1401,10 @@ u_bitwidth_to_subformat (int bits) int32_t psf_rand_int32 (void) -{ static int32_t value = -1 ; +{ static uint64_t value = 0 ; int k, count ; - if (value == -1) + if (value == 0) { #if HAVE_GETTIMEOFDAY struct timeval tv ; @@ -1311,9 +1417,9 @@ psf_rand_int32 (void) count = 4 + (value & 7) ; for (k = 0 ; k < count ; k++) - value = 11117 * value + 211231 ; + value = (11117 * value + 211231) & 0x7fffffff ; - return value ; + return (int32_t) value ; } /* psf_rand_int32 */ void @@ -1367,6 +1473,28 @@ psf_strlcpy_crlf (char *dest, const char *src, size_t destmax, size_t srcmax) *dest = 0 ; } /* psf_strlcpy_crlf */ +sf_count_t +psf_decode_frame_count (SF_PRIVATE *psf) +{ sf_count_t count, readlen, total = 0 ; + BUF_UNION ubuf ; + + /* If we're reading from a pipe or the file is too long, just return SF_COUNT_MAX. */ + if (psf_is_pipe (psf) || psf->datalength > 0x1000000) + return SF_COUNT_MAX ; + + psf_fseek (psf, psf->dataoffset, SEEK_SET) ; + + readlen = ARRAY_LEN (ubuf.ibuf) / psf->sf.channels ; + readlen *= psf->sf.channels ; + + while ((count = psf->read_int (psf, ubuf.ibuf, readlen)) > 0) + total += count ; + + psf_fseek (psf, psf->dataoffset, SEEK_SET) ; + + return total / psf->sf.channels ; +} /* psf_decode_frame_count */ + /*============================================================================== */ @@ -1421,6 +1549,9 @@ str_of_minor_format (int format) CASE_NAME (SF_FORMAT_MS_ADPCM) ; CASE_NAME (SF_FORMAT_GSM610) ; CASE_NAME (SF_FORMAT_VOX_ADPCM) ; + CASE_NAME (SF_FORMAT_NMS_ADPCM_16) ; + CASE_NAME (SF_FORMAT_NMS_ADPCM_24) ; + CASE_NAME (SF_FORMAT_NMS_ADPCM_32) ; CASE_NAME (SF_FORMAT_G721_32) ; CASE_NAME (SF_FORMAT_G723_24) ; CASE_NAME (SF_FORMAT_G723_40) ; @@ -1465,3 +1596,169 @@ str_of_endianness (int end) /* Zero length string for SF_ENDIAN_FILE. */ return "" ; } /* str_of_endianness */ + +/*============================================================================== +*/ + +void +psf_f2s_array (const float *src, short *dest, int count, int normalize) +{ float normfact ; + + normfact = normalize ? (1.0 * 0x7FFF) : 1.0 ; + while (--count >= 0) + dest [count] = lrintf (src [count] * normfact) ; + + return ; +} /* psf_f2s_array */ + +void +psf_f2s_clip_array (const float *src, short *dest, int count, int normalize) +{ float normfact, scaled_value ; + + normfact = normalize ? (1.0 * 0x8000) : 1.0 ; + + while (--count >= 0) + { scaled_value = src [count] * normfact ; + if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFF)) + { dest [count] = 0x7FFF ; + continue ; + } ; + if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000)) + { dest [count] = 0x8000 ; + continue ; + } ; + + dest [count] = lrintf (scaled_value) ; + } ; + + return ; +} /* psf_f2s_clip_array */ + +void +psf_d2s_array (const double *src, short *dest, int count, int normalize) +{ double normfact ; + + normfact = normalize ? (1.0 * 0x7FFF) : 1.0 ; + while (--count >= 0) + dest [count] = lrint (src [count] * normfact) ; + + return ; +} /* psf_f2s_array */ + +void +psf_d2s_clip_array (const double *src, short *dest, int count, int normalize) +{ double normfact, scaled_value ; + + normfact = normalize ? (1.0 * 0x8000) : 1.0 ; + + while (--count >= 0) + { scaled_value = src [count] * normfact ; + if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFF)) + { dest [count] = 0x7FFF ; + continue ; + } ; + if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000)) + { dest [count] = 0x8000 ; + continue ; + } ; + + dest [count] = lrint (scaled_value) ; + } ; + + return ; +} /* psf_d2s_clip_array */ + + +void +psf_f2i_array (const float *src, int *dest, int count, int normalize) +{ float normfact ; + + normfact = normalize ? (1.0 * 0x7FFFFFFF) : 1.0 ; + while (--count >= 0) + dest [count] = lrintf (src [count] * normfact) ; + + return ; +} /* psf_f2i_array */ + +void +psf_f2i_clip_array (const float *src, int *dest, int count, int normalize) +{ float normfact, scaled_value ; + + normfact = normalize ? (8.0 * 0x10000000) : 1.0 ; + + while (--count >= 0) + { scaled_value = src [count] * normfact ; + if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFFFFFF)) + { dest [count] = 0x7FFFFFFF ; + continue ; + } ; + if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x10000000)) + { dest [count] = 0x80000000 ; + continue ; + } ; + + dest [count] = lrintf (scaled_value) ; + } ; + + return ; +} /* psf_f2i_clip_array */ + +void +psf_d2i_array (const double *src, int *dest, int count, int normalize) +{ double normfact ; + + normfact = normalize ? (1.0 * 0x7FFFFFFF) : 1.0 ; + while (--count >= 0) + dest [count] = lrint (src [count] * normfact) ; + + return ; +} /* psf_f2i_array */ + +void +psf_d2i_clip_array (const double *src, int *dest, int count, int normalize) +{ double normfact, scaled_value ; + + normfact = normalize ? (8.0 * 0x10000000) : 1.0 ; + + while (--count >= 0) + { scaled_value = src [count] * normfact ; + if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFFFFFF)) + { dest [count] = 0x7FFFFFFF ; + continue ; + } ; + if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x10000000)) + { dest [count] = 0x80000000 ; + continue ; + } ; + + dest [count] = lrint (scaled_value) ; + } ; + + return ; +} /* psf_d2i_clip_array */ + +FILE * +psf_open_tmpfile (char * fname, size_t fnamelen) +{ const char * tmpdir ; + FILE * file ; + + if (OS_IS_WIN32) + tmpdir = getenv ("TEMP") ; + else + { tmpdir = getenv ("TMPDIR") ; + tmpdir = tmpdir == NULL ? "/tmp" : tmpdir ; + } ; + + if (tmpdir && access (tmpdir, R_OK | W_OK | X_OK) == 0) + { snprintf (fname, fnamelen, "%s/%x%x-alac.tmp", tmpdir, psf_rand_int32 (), psf_rand_int32 ()) ; + if ((file = fopen (fname, "wb+")) != NULL) + return file ; + } ; + + snprintf (fname, fnamelen, "%x%x-alac.tmp", psf_rand_int32 (), psf_rand_int32 ()) ; + if ((file = fopen (fname, "wb+")) != NULL) + return file ; + + memset (fname, 0, fnamelen) ; + return NULL ; +} /* psf_open_tmpfile */ diff --git a/lib-src/libsndfile/src/common.h b/lib-src/libsndfile/src/common.h index fc0f28f36..6694c1373 100644 --- a/lib-src/libsndfile/src/common.h +++ b/lib-src/libsndfile/src/common.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2018 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -29,6 +29,9 @@ #elif HAVE_INTTYPES_H #include #endif +#if HAVE_SYS_TYPES_H +#include +#endif #ifndef SNDFILE_H #include "sndfile.h" @@ -38,7 +41,9 @@ #error "This code is not designed to be compiled with a C++ compiler." #endif -#if (SIZEOF_LONG == 8) +#ifdef INT64_C +# define SF_PLATFORM_S64(x) INT64_C (x) +#elif (SIZEOF_LONG == 8) # define SF_PLATFORM_S64(x) x##l #elif (SIZEOF_LONG_LONG == 8) # define SF_PLATFORM_S64(x) x##ll @@ -70,16 +75,14 @@ # define WARN_UNUSED #endif -#define SF_BUFFER_LEN (8192*2) -#define SF_FILENAME_LEN (512) +#define SF_BUFFER_LEN (8192) +#define SF_FILENAME_LEN (1024) #define SF_SYSERR_LEN (256) #define SF_MAX_STRINGS (32) -#define SF_STR_BUFFER_LEN (8192) -#define SF_HEADER_LEN (4100 + SF_STR_BUFFER_LEN) +#define SF_PARSELOG_LEN (2048) #define PSF_SEEK_ERROR ((sf_count_t) -1) - #define BITWIDTH2BYTES(x) (((x) + 7) / 8) /* For some reason sizeof returns an unsigned value which causes @@ -92,42 +95,65 @@ #define NOT(x) (! (x)) -#if (COMPILER_IS_GCC == 1) -#define SF_MAX(x,y) ({ \ +#if COMPILER_IS_GCC +#define SF_MAX(x, y) ({ \ typeof (x) sf_max_x1 = (x) ; \ typeof (y) sf_max_y1 = (y) ; \ (void) (&sf_max_x1 == &sf_max_y1) ; \ sf_max_x1 > sf_max_y1 ? sf_max_x1 : sf_max_y1 ; }) -#define SF_MIN(x,y) ({ \ +#define SF_MIN(x, y) ({ \ typeof (x) sf_min_x2 = (x) ; \ typeof (y) sf_min_y2 = (y) ; \ (void) (&sf_min_x2 == &sf_min_y2) ; \ sf_min_x2 < sf_min_y2 ? sf_min_x2 : sf_min_y2 ; }) #else -#define SF_MAX(a,b) ((a) > (b) ? (a) : (b)) -#define SF_MIN(a,b) ((a) < (b) ? (a) : (b)) +#define SF_MAX(a, b) ((a) > (b) ? (a) : (b)) +#define SF_MIN(a, b) ((a) < (b) ? (a) : (b)) #endif -#define SF_MAX_CHANNELS 256 +#define COMPILE_TIME_ASSERT(e) (sizeof (struct { int : - !! (e) ; })) -#define SF_ASSERT(expr) \ - { if (! (expr)) \ - { printf ("%s %d : assert '" #expr "' failed!\n", __FILE__, __LINE__) ;\ - exit (1) ; \ - } ;\ - } +#define SF_MAX_CHANNELS 1024 + /* -* Macros for spliting the format file of SF_INFI into contrainer type, +* Macros for spliting the format file of SF_INFO into container type, ** codec type and endian-ness. */ #define SF_CONTAINER(x) ((x) & SF_FORMAT_TYPEMASK) #define SF_CODEC(x) ((x) & SF_FORMAT_SUBMASK) #define SF_ENDIAN(x) ((x) & SF_FORMAT_ENDMASK) +/* +** Binheader cast macros. +*/ + +#define BHW1(x) ((uint8_t) (x)) +#define BHW2(x) ((uint16_t) (x)) +#define BHW3(x) ((uint32_t) (x)) +#define BHW4(x) ((uint32_t) (x)) +#define BHW8(x) ((uint64_t) (x)) + +#define BHWm(x) ((uint32_t) (x)) +#define BHWS(x) ((char *) (x)) + +#define BHWf(x) ((double) (x)) +#define BHWd(x) ((double) (x)) + +#define BHWh(x) ((void *) (x)) +#define BHWj(x) ((size_t) (x)) +#define BHWp(x) ((char *) (x)) +#define BHWo(x) ((size_t) (x)) +#define BHWs(x) ((char *) (x)) +#define BHWv(x) ((const void *) (x)) +#define BHWz(x) ((size_t) (x)) + +/*------------------------------------------------------------------------------ +*/ + enum { /* PEAK chunk location. */ SF_PEAK_START = 42, @@ -158,6 +184,8 @@ enum enum { /* Work in progress. */ + SF_FORMAT_SPEEX = 0x5000000, + SF_FORMAT_OGGFLAC = 0x5000001, /* Formats supported read only. */ SF_FORMAT_TXW = 0x4030000, /* Yamaha TX16 sampler file */ @@ -177,6 +205,22 @@ enum SF_FORMAT_PCM_N = 0x1030 } ; +/*--------------------------------------------------------------------------------------- +*/ + +typedef struct +{ unsigned kuki_offset ; + unsigned pakt_offset ; + + unsigned bits_per_sample ; + unsigned frames_per_packet ; + + int64_t packets ; + int64_t valid_frames ; + int32_t priming_frames ; + int32_t remainder_frames ; +} ALAC_DECODER_INFO ; + /*--------------------------------------------------------------------------------------- ** PEAK_CHUNK - This chunk type is common to both AIFF and WAVE files although their ** endian encodings are different. @@ -198,19 +242,8 @@ typedef struct /* CAF */ unsigned int edit_number ; -#if HAVE_FLEXIBLE_ARRAY /* the per channel peak info */ PEAK_POS peaks [] ; -#else - /* - ** This is not ISO compliant C. It works on some compilers which - ** don't support the ISO standard flexible struct array which is - ** used above. If your compiler doesn't like this I suggest you find - ** youself a 1999 ISO C standards compilant compiler. GCC-3.X is - ** highly recommended. - */ - PEAK_POS peaks [0] ; -#endif } PEAK_INFO ; static inline PEAK_INFO * @@ -221,22 +254,66 @@ peak_info_calloc (int channels) typedef struct { int type ; int flags ; - char *str ; + size_t offset ; } STR_DATA ; +typedef struct +{ uint64_t hash ; + char id [64] ; + unsigned id_size ; + uint32_t mark32 ; + sf_count_t offset ; + uint32_t len ; +} READ_CHUNK ; + +typedef struct +{ uint64_t hash ; + uint32_t mark32 ; + uint32_t len ; + void *data ; +} WRITE_CHUNK ; + +typedef struct +{ uint32_t count ; + uint32_t used ; + READ_CHUNK *chunks ; +} READ_CHUNKS ; +typedef struct +{ uint32_t count ; + uint32_t used ; + WRITE_CHUNK *chunks ; +} WRITE_CHUNKS ; + +struct SF_CHUNK_ITERATOR +{ uint32_t current ; + int64_t hash ; + char id [64] ; + unsigned id_size ; + SNDFILE *sndfile ; +} ; + static inline size_t make_size_t (int x) { return (size_t) x ; -} /* size_t_of_int */ +} /* make_size_t */ typedef SF_BROADCAST_INFO_VAR (16 * 1024) SF_BROADCAST_INFO_16K ; +typedef SF_CART_INFO_VAR (16 * 1024) SF_CART_INFO_16K ; + #if SIZEOF_WCHAR_T == 2 typedef wchar_t sfwchar_t ; #else typedef int16_t sfwchar_t ; #endif + +static inline void * +psf_memdup (const void *src, size_t n) +{ void * mem = calloc (1, n & 3 ? n + 4 - (n & 3) : n) ; + return memcpy (mem, src, n) ; +} /* psf_memdup */ + /* ** This version of isprint specifically ignores any locale info. Its used for ** determining which characters can be printed in things like hexdumps. @@ -287,6 +364,24 @@ typedef struct } PSF_FILE ; + +typedef union +{ double dbuf [SF_BUFFER_LEN / sizeof (double)] ; +#if (defined (SIZEOF_INT64_T) && (SIZEOF_INT64_T == 8)) + int64_t lbuf [SF_BUFFER_LEN / sizeof (int64_t)] ; +#else + long lbuf [SF_BUFFER_LEN / sizeof (double)] ; +#endif + float fbuf [SF_BUFFER_LEN / sizeof (float)] ; + int ibuf [SF_BUFFER_LEN / sizeof (int)] ; + short sbuf [SF_BUFFER_LEN / sizeof (short)] ; + char cbuf [SF_BUFFER_LEN / sizeof (char)] ; + signed char scbuf [SF_BUFFER_LEN / sizeof (signed char)] ; + unsigned char ucbuf [SF_BUFFER_LEN / sizeof (signed char)] ; +} BUF_UNION ; + + + typedef struct sf_private_tag { /* Canary in a coal mine. */ @@ -296,52 +391,42 @@ typedef struct sf_private_tag char c [16] ; } canary ; - /* Force the compiler to double align the start of buffer. */ - union - { double dbuf [SF_BUFFER_LEN / sizeof (double)] ; -#if (defined (SIZEOF_INT64_T) && (SIZEOF_INT64_T == 8)) - int64_t lbuf [SF_BUFFER_LEN / sizeof (int64_t)] ; -#else - long lbuf [SF_BUFFER_LEN / sizeof (double)] ; -#endif - float fbuf [SF_BUFFER_LEN / sizeof (float)] ; - int ibuf [SF_BUFFER_LEN / sizeof (int)] ; - short sbuf [SF_BUFFER_LEN / sizeof (short)] ; - char cbuf [SF_BUFFER_LEN / sizeof (char)] ; - signed char scbuf [SF_BUFFER_LEN / sizeof (signed char)] ; - unsigned char ucbuf [SF_BUFFER_LEN / sizeof (signed char)] ; - } u ; - - PSF_FILE file, rsrc ; char syserr [SF_SYSERR_LEN] ; - /* logbuffer and logindex should only be changed within the logging functions + /* parselog and indx should only be changed within the logging functions ** of common.c */ - char logbuffer [SF_BUFFER_LEN] ; - unsigned char header [SF_HEADER_LEN] ; /* Must be unsigned */ + struct + { char buf [SF_PARSELOG_LEN] ; + int indx ; + } parselog ; + + + struct + { unsigned char * ptr ; + sf_count_t indx, end, len ; + } header ; + int rwf_endian ; /* Header endian-ness flag. */ /* Storage and housekeeping data for adding/reading strings from ** sound files. */ - STR_DATA strings [SF_MAX_STRINGS] ; - char str_storage [SF_STR_BUFFER_LEN] ; - char *str_end ; - int str_flags ; + struct + { STR_DATA data [SF_MAX_STRINGS] ; + char *storage ; + size_t storage_len ; + size_t storage_used ; + uint32_t flags ; + } strings ; /* Guard value. If this changes the buffers above have overflowed. */ int Magick ; unsigned unique_id ; - /* Index variables for maintaining logbuffer and header above. */ - int logindex ; - int headindex, headend ; - int has_text ; - int error ; int endian ; /* File endianness : SF_ENDIAN_LITTLE or SF_ENDIAN_BIG. */ @@ -368,6 +453,9 @@ typedef struct sf_private_tag int have_written ; /* Has a single write been done to the file? */ PEAK_INFO *peak_info ; + /* Cue Marker Info */ + SF_CUES *cues ; + /* Loop Info */ SF_LOOP_INFO *loop_info ; SF_INSTRUMENT *instrument ; @@ -375,6 +463,9 @@ typedef struct sf_private_tag /* Broadcast (EBU) Info */ SF_BROADCAST_INFO_16K *broadcast_16k ; + /* Cart (AES46) Info */ + SF_CART_INFO_16K *cart_16k ; + /* Channel map data (if present) : an array of ints. */ int *channel_map ; @@ -429,6 +520,7 @@ typedef struct sf_private_tag sf_count_t (*seek) (struct sf_private_tag*, int mode, sf_count_t samples_from_start) ; int (*write_header) (struct sf_private_tag*, int calc_length) ; int (*command) (struct sf_private_tag*, int command, void *data, int datasize) ; + int (*byterate) (struct sf_private_tag*) ; /* ** Separate close functions for the codec and the container. @@ -443,6 +535,17 @@ typedef struct sf_private_tag int virtual_io ; SF_VIRTUAL_IO vio ; void *vio_user_data ; + + /* Chunk get/set. */ + SF_CHUNK_ITERATOR *iterator ; + + READ_CHUNKS rchunks ; + WRITE_CHUNKS wchunks ; + + int (*set_chunk) (struct sf_private_tag*, const SF_CHUNK_INFO * chunk_info) ; + SF_CHUNK_ITERATOR * (*next_chunk_iterator) (struct sf_private_tag*, SF_CHUNK_ITERATOR * iterator) ; + int (*get_chunk_size) (struct sf_private_tag*, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; + int (*get_chunk_data) (struct sf_private_tag*, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; } SF_PRIVATE ; @@ -465,11 +568,11 @@ enum SFE_BAD_FILE_PTR, SFE_BAD_INT_PTR, SFE_BAD_STAT_SIZE, + SFE_NO_TEMP_DIR, SFE_MALLOC_FAILED, SFE_UNIMPLEMENTED, SFE_BAD_READ_ALIGN, SFE_BAD_WRITE_ALIGN, - SFE_UNKNOWN_FORMAT, SFE_NOT_READMODE, SFE_NOT_WRITEMODE, SFE_BAD_MODE_RW, @@ -484,6 +587,7 @@ enum SFE_BAD_ENDIAN, SFE_CHANNEL_COUNT_ZERO, SFE_CHANNEL_COUNT, + SFE_CHANNEL_COUNT_BAD, SFE_BAD_VIRTUAL_IO, @@ -504,6 +608,8 @@ enum SFE_CMD_HAS_DATA, SFE_BAD_BROADCAST_INFO_SIZE, SFE_BAD_BROADCAST_INFO_TOO_BIG, + SFE_BAD_CART_INFO_SIZE, + SFE_BAD_CART_INFO_TOO_BIG, SFE_STR_NO_SUPPORT, SFE_STR_NOT_WRITE, @@ -528,9 +634,11 @@ enum SFE_WAV_BAD_LIST, SFE_WAV_ADPCM_NOT4BIT, SFE_WAV_ADPCM_CHANNELS, + SFE_WAV_ADPCM_SAMPLES, SFE_WAV_GSM610_FORMAT, SFE_WAV_UNKNOWN_CHUNK, SFE_WAV_WVPK_DATA, + SFE_WAV_NMS_FORMAT, SFE_AIFF_NO_FORM, SFE_AIFF_AIFF_NO_FORM, @@ -557,6 +665,7 @@ enum SFE_PAF_VERSION, SFE_PAF_UNKNOWN_FORMAT, SFE_PAF_SHORT_HEADER, + SFE_PAF_BAD_CHANNELS, SFE_SVX_NO_FORM, SFE_SVX_NO_BODY, @@ -604,6 +713,7 @@ enum SFE_DWVW_BAD_BITWIDTH, SFE_G72X_NOT_MONO, + SFE_NMS_ADPCM_NOT_MONO, SFE_XI_BAD_HEADER, SFE_XI_EXCESS_SAMPLES, @@ -627,6 +737,7 @@ enum SFE_FLAC_INIT_DECODER, SFE_FLAC_LOST_SYNC, SFE_FLAC_BAD_SAMPLE_RATE, + SFE_FLAC_CHANNEL_COUNT_CHANGED, SFE_FLAC_UNKOWN_ERROR, SFE_WVE_NOT_WVE, @@ -635,10 +746,26 @@ enum SFE_VORBIS_ENCODER_BUG, SFE_RF64_NOT_RF64, + SFE_RF64_PEAK_B4_FMT, + SFE_RF64_NO_DATA, + + SFE_BAD_CHUNK_PTR, + SFE_UNKNOWN_CHUNK, + SFE_BAD_CHUNK_FORMAT, + SFE_BAD_CHUNK_MARKER, + SFE_BAD_CHUNK_DATA_PTR, + SFE_ALAC_FAIL_TMPFILE, + SFE_FILENAME_TOO_LONG, + SFE_NEGATIVE_RW_LEN, + + SFE_OPUS_BAD_SAMPLERATE, SFE_MAX_ERROR /* This must be last in list. */ } ; +/* Allocate and initialize the SF_PRIVATE struct. */ +SF_PRIVATE * psf_allocate (void) ; + int subformat_to_bytewidth (int format) ; int s_bitwidth_to_subformat (int bits) ; int u_bitwidth_to_subformat (int bits) ; @@ -646,13 +773,13 @@ int u_bitwidth_to_subformat (int bits) ; /* Functions for reading and writing floats and doubles on processors ** with non-IEEE floats/doubles. */ -float float32_be_read (unsigned char *cptr) ; -float float32_le_read (unsigned char *cptr) ; +float float32_be_read (const unsigned char *cptr) ; +float float32_le_read (const unsigned char *cptr) ; void float32_be_write (float in, unsigned char *out) ; void float32_le_write (float in, unsigned char *out) ; -double double64_be_read (unsigned char *cptr) ; -double double64_le_read (unsigned char *cptr) ; +double double64_be_read (const unsigned char *cptr) ; +double double64_le_read (const unsigned char *cptr) ; void double64_be_write (double in, unsigned char *out) ; void double64_le_write (double in, unsigned char *out) ; @@ -666,6 +793,8 @@ int32_t psf_rand_int32 (void) ; void append_snprintf (char * dest, size_t maxlen, const char * fmt, ...) ; void psf_strlcpy_crlf (char *dest, const char *src, size_t destmax, size_t srcmax) ; +sf_count_t psf_decode_frame_count (SF_PRIVATE *psf) ; + /* Functions used when writing file headers. */ int psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) ; @@ -778,17 +907,21 @@ int caf_open (SF_PRIVATE *psf) ; int mpc2k_open (SF_PRIVATE *psf) ; int rf64_open (SF_PRIVATE *psf) ; +int ogg_vorbis_open (SF_PRIVATE *psf) ; +int ogg_speex_open (SF_PRIVATE *psf) ; +int ogg_pcm_open (SF_PRIVATE *psf) ; +int ogg_opus_open (SF_PRIVATE *psf) ; +int ogg_open (SF_PRIVATE *psf) ; + + /* In progress. Do not currently work. */ int mpeg_open (SF_PRIVATE *psf) ; -int ogg_open (SF_PRIVATE *psf) ; int rx2_open (SF_PRIVATE *psf) ; int txw_open (SF_PRIVATE *psf) ; int wve_open (SF_PRIVATE *psf) ; int dwd_open (SF_PRIVATE *psf) ; -int macbinary3_open (SF_PRIVATE *psf) ; - /*------------------------------------------------------------------------------------ ** Init functions for a number of common data encodings. */ @@ -800,14 +933,16 @@ int float32_init (SF_PRIVATE *psf) ; int double64_init (SF_PRIVATE *psf) ; int dwvw_init (SF_PRIVATE *psf, int bitwidth) ; int gsm610_init (SF_PRIVATE *psf) ; +int nms_adpcm_init (SF_PRIVATE *psf) ; int vox_adpcm_init (SF_PRIVATE *psf) ; int flac_init (SF_PRIVATE *psf) ; int g72x_init (SF_PRIVATE * psf) ; +int alac_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) ; int dither_init (SF_PRIVATE *psf, int mode) ; -int wav_w64_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) ; -int wav_w64_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) ; +int wavlike_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) ; +int wavlike_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) ; int aiff_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) ; @@ -817,18 +952,27 @@ int interleave_init (SF_PRIVATE *psf) ; ** Chunk logging functions. */ -typedef struct -{ struct - { int chunk ; - sf_count_t offset ; - sf_count_t len ; - } l [100] ; +SF_CHUNK_ITERATOR * psf_get_chunk_iterator (SF_PRIVATE * psf, const char * marker_str) ; +SF_CHUNK_ITERATOR * psf_next_chunk_iterator (const READ_CHUNKS * pchk , SF_CHUNK_ITERATOR *iterator) ; +int psf_store_read_chunk_u32 (READ_CHUNKS * pchk, uint32_t marker, sf_count_t offset, uint32_t len) ; +int psf_store_read_chunk_str (READ_CHUNKS * pchk, const char * marker, sf_count_t offset, uint32_t len) ; +int psf_save_write_chunk (WRITE_CHUNKS * pchk, const SF_CHUNK_INFO * chunk_info) ; +int psf_find_read_chunk_str (const READ_CHUNKS * pchk, const char * marker) ; +int psf_find_read_chunk_m32 (const READ_CHUNKS * pchk, uint32_t marker) ; +int psf_find_read_chunk_iterator (const READ_CHUNKS * pchk, const SF_CHUNK_ITERATOR * marker) ; - int count ; -} PRIV_CHUNK4 ; +int psf_find_write_chunk (WRITE_CHUNKS * pchk, const char * marker) ; -void pchk4_store (PRIV_CHUNK4 * pchk, int marker, sf_count_t offset, sf_count_t len) ; -int pchk4_find (PRIV_CHUNK4 * pchk, int marker) ; +static inline int +fourcc_to_marker (const SF_CHUNK_INFO * chunk_info) +{ const unsigned char * cptr ; + + if (chunk_info->id_size != 4) + return 0 ; + + cptr = (const unsigned char *) chunk_info->id ; + return (cptr [3] << 24) + (cptr [2] << 16) + (cptr [1] << 8) + cptr [0] ; +} /* fourcc_to_marker */ /*------------------------------------------------------------------------------------ ** Functions that work like OpenBSD's strlcpy/strlcat to replace strncpy/strncat. @@ -860,6 +1004,10 @@ psf_strlcpy (char *dest, size_t n, const char *src) void *psf_memset (void *s, int c, sf_count_t n) ; +SF_CUES * psf_cues_dup (const void * ptr, size_t datasize) ; +SF_CUES * psf_cues_alloc (uint32_t cue_count) ; +void psf_get_cues (SF_PRIVATE * psf, void * data, size_t datasize) ; + SF_INSTRUMENT * psf_instrument_alloc (void) ; void psf_sanitize_string (char * cptr, int len) ; @@ -872,6 +1020,10 @@ int broadcast_var_set (SF_PRIVATE *psf, const SF_BROADCAST_INFO * data, size_t int broadcast_var_get (SF_PRIVATE *psf, SF_BROADCAST_INFO * data, size_t datasize) ; +SF_CART_INFO_16K * cart_var_alloc (void) ; +int cart_var_set (SF_PRIVATE *psf, const SF_CART_INFO * date, size_t datasize) ; +int cart_var_get (SF_PRIVATE *psf, SF_CART_INFO * data, size_t datasize) ; + typedef struct { int channels ; int endianness ; @@ -880,6 +1032,10 @@ typedef struct int audio_detect (SF_PRIVATE * psf, AUDIO_DETECT *ad, const unsigned char * data, int datalen) ; int id3_skip (SF_PRIVATE * psf) ; +void alac_get_desc_chunk_items (int subformat, uint32_t *fmt_flags, uint32_t *frames_per_packet) ; + +FILE * psf_open_tmpfile (char * fname, size_t fnamelen) ; + /*------------------------------------------------------------------------------------ ** Helper/debug functions. */ @@ -914,5 +1070,45 @@ int sf_dither_float (const SF_DITHER_INFO *dither, const float *in, float *out, int sf_dither_double (const SF_DITHER_INFO *dither, const double *in, double *out, int count) ; #endif -#endif /* SNDFILE_COMMON_H */ +/*------------------------------------------------------------------------------------ +** Data conversion functions. +*/ +void psf_f2s_array (const float *src, short *dest, int count, int normalize) ; +void psf_f2s_clip_array (const float *src, short *dest, int count, int normalize) ; + +void psf_d2s_array (const double *src, short *dest, int count, int normalize) ; +void psf_d2s_clip_array (const double *src, short *dest, int count, int normalize) ; + +void psf_f2i_array (const float *src, int *dest, int count, int normalize) ; +void psf_f2i_clip_array (const float *src, int *dest, int count, int normalize) ; + +void psf_d2i_array (const double *src, int *dest, int count, int normalize) ; +void psf_d2i_clip_array (const double *src, int *dest, int count, int normalize) ; + + +/*------------------------------------------------------------------------------------ +** Left and right shift on int. According to the C standard, the left and right +** shift operations applied to a negative integer results in undefined behavior. +** These twp functions work around that. +*/ + +#if __GNUC__ +#define ALWAYS_INLINE __attribute__ ((always_inline)) +#else +#define ALWAYS_INLINE +#endif + +static inline int32_t ALWAYS_INLINE +arith_shift_left (int32_t x, int shift) +{ return (int32_t) (((uint32_t) x) << shift) ; +} /* arith_shift_left */ + +static inline int32_t ALWAYS_INLINE +arith_shift_right (int32_t x, int shift) +{ if (x >= 0) + return x >> shift ; + return ~ ((~x) >> shift) ; +} /* arith_shift_right */ + +#endif /* SNDFILE_COMMON_H */ diff --git a/lib-src/libsndfile/src/config.h.in b/lib-src/libsndfile/src/config.h.cmake similarity index 50% rename from lib-src/libsndfile/src/config.h.in rename to lib-src/libsndfile/src/config.h.cmake index c45bade30..1bd1eeb3b 100644 --- a/lib-src/libsndfile/src/config.h.in +++ b/lib-src/libsndfile/src/config.h.cmake @@ -1,287 +1,311 @@ -/* src/config.h.in. Generated from configure.ac by autoheader. */ - /* Set to 1 if the compile is GNU GCC. */ -#undef COMPILER_IS_GCC +#cmakedefine01 COMPILER_IS_GCC /* Target processor clips on negative float to int conversion. */ -#undef CPU_CLIPS_NEGATIVE +#cmakedefine01 CPU_CLIPS_NEGATIVE /* Target processor clips on positive float to int conversion. */ -#undef CPU_CLIPS_POSITIVE +#cmakedefine01 CPU_CLIPS_POSITIVE /* Target processor is big endian. */ -#undef CPU_IS_BIG_ENDIAN +#cmakedefine01 CPU_IS_BIG_ENDIAN /* Target processor is little endian. */ -#undef CPU_IS_LITTLE_ENDIAN +#cmakedefine01 CPU_IS_LITTLE_ENDIAN /* Set to 1 to enable experimental code. */ -#undef ENABLE_EXPERIMENTAL_CODE +#cmakedefine01 ENABLE_EXPERIMENTAL_CODE /* Define to 1 if you have the header file. */ -#undef HAVE_ALSA_ASOUNDLIB_H +#cmakedefine01 HAVE_ALSA_ASOUNDLIB_H /* Define to 1 if you have the header file. */ -#undef HAVE_BYTESWAP_H +#cmakedefine01 HAVE_BYTESWAP_H /* Define to 1 if you have the `calloc' function. */ -#undef HAVE_CALLOC +#cmakedefine01 HAVE_CALLOC /* Define to 1 if you have the `ceil' function. */ -#undef HAVE_CEIL +#cmakedefine01 HAVE_CEIL /* Set to 1 if S_IRGRP is defined. */ -#undef HAVE_DECL_S_IRGRP +#cmakedefine01 HAVE_DECL_S_IRGRP /* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H +#cmakedefine01 HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_DIRECT_H /* Define to 1 if you have the header file. */ -#undef HAVE_ENDIAN_H +#cmakedefine01 HAVE_ENDIAN_H /* Will be set to 1 if flac, ogg and vorbis are available. */ -#undef HAVE_EXTERNAL_LIBS - -/* Set to 1 if the compile supports the struct hack. */ -#undef HAVE_FLEXIBLE_ARRAY +#cmakedefine01 HAVE_EXTERNAL_XIPH_LIBS /* Define to 1 if you have the `floor' function. */ -#undef HAVE_FLOOR +#cmakedefine01 HAVE_FLOOR /* Define to 1 if you have the `fmod' function. */ -#undef HAVE_FMOD +#cmakedefine01 HAVE_FMOD /* Define to 1 if you have the `free' function. */ -#undef HAVE_FREE +#cmakedefine01 HAVE_FREE /* Define to 1 if you have the `fstat' function. */ -#undef HAVE_FSTAT +#cmakedefine01 HAVE_FSTAT + +/* Define to 1 if you have the `fstat64' function. */ +#cmakedefine01 HAVE_FSTAT64 /* Define to 1 if you have the `fsync' function. */ -#undef HAVE_FSYNC +#cmakedefine01 HAVE_FSYNC /* Define to 1 if you have the `ftruncate' function. */ -#undef HAVE_FTRUNCATE +#cmakedefine01 HAVE_FTRUNCATE /* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE +#cmakedefine01 HAVE_GETPAGESIZE /* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY +#cmakedefine01 HAVE_GETTIMEOFDAY -/* Define to 1 if you have the `gmtime' function. */ -#undef HAVE_GMTIME +/* Define if you have the `gmtime' function. */ +#cmakedefine HAVE_GMTIME -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R +/* Define if you have the `gmtime_r' function. */ +#cmakedefine HAVE_GMTIME_R /* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H +#cmakedefine01 HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_IO_H /* Define to 1 if you have the `m' library (-lm). */ -#undef HAVE_LIBM +#cmakedefine01 HAVE_LIBM /* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H +#cmakedefine01 HAVE_LOCALE_H -/* Define to 1 if you have the `localtime' function. */ -#undef HAVE_LOCALTIME +/* Define if you have the `localtime' function. */ +#cmakedefine HAVE_LOCALTIME -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R +/* Define if you have the `localtime_r' function. */ +#cmakedefine HAVE_LOCALTIME_R /* Define if you have C99's lrint function. */ -#undef HAVE_LRINT +#cmakedefine01 HAVE_LRINT /* Define if you have C99's lrintf function. */ -#undef HAVE_LRINTF +#cmakedefine01 HAVE_LRINTF + +/* Define to 1 if you have the `lround' function. */ +#cmakedefine01 HAVE_LROUND /* Define to 1 if you have the `lseek' function. */ -#undef HAVE_LSEEK +#cmakedefine01 HAVE_LSEEK + +/* Define to 1 if you have the `lseek64' function. */ +#cmakedefine01 HAVE_LSEEK64 /* Define to 1 if you have the `malloc' function. */ -#undef HAVE_MALLOC +#cmakedefine01 HAVE_MALLOC /* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H +#cmakedefine01 HAVE_MEMORY_H /* Define to 1 if you have the `mmap' function. */ -#undef HAVE_MMAP +#cmakedefine01 HAVE_MMAP /* Define to 1 if you have the `open' function. */ -#undef HAVE_OPEN +#cmakedefine01 HAVE_OPEN /* Define to 1 if you have the `pipe' function. */ -#undef HAVE_PIPE - -/* Define to 1 if you have the `pread' function. */ -#undef HAVE_PREAD - -/* Define to 1 if you have the `pwrite' function. */ -#undef HAVE_PWRITE +#cmakedefine01 HAVE_PIPE /* Define to 1 if you have the `read' function. */ -#undef HAVE_READ +#cmakedefine01 HAVE_READ /* Define to 1 if you have the `realloc' function. */ -#undef HAVE_REALLOC +#cmakedefine01 HAVE_REALLOC /* Define to 1 if you have the `setlocale' function. */ -#undef HAVE_SETLOCALE +#cmakedefine01 HAVE_SETLOCALE -/* Define to 1 if you have the header file. */ -#undef HAVE_SNDIO_H +/* Set to 1 if is available. */ +#cmakedefine01 HAVE_SNDIO_H /* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF +#cmakedefine01 HAVE_SNPRINTF /* Set to 1 if you have libsqlite3. */ -#undef HAVE_SQLITE3 +#cmakedefine01 HAVE_SQLITE3 /* Define to 1 if the system has the type `ssize_t'. */ -#undef HAVE_SSIZE_T +#cmakedefine01 HAVE_SSIZE_T /* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H +#cmakedefine01 HAVE_STDINT_H /* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H +#cmakedefine01 HAVE_STDLIB_H /* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H +#cmakedefine01 HAVE_STRINGS_H /* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H +#cmakedefine01 HAVE_STRING_H /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H +#cmakedefine01 HAVE_SYS_STAT_H /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H +#cmakedefine01 HAVE_SYS_TIME_H /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H +#cmakedefine01 HAVE_SYS_TYPES_H /* Define to 1 if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H +#cmakedefine01 HAVE_SYS_WAIT_H /* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H +#cmakedefine01 HAVE_UNISTD_H /* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF +#cmakedefine01 HAVE_VSNPRINTF /* Define to 1 if you have the `waitpid' function. */ -#undef HAVE_WAITPID +#cmakedefine01 HAVE_WAITPID /* Define to 1 if you have the `write' function. */ -#undef HAVE_WRITE +#cmakedefine01 HAVE_WRITE -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR +/* The darwin version, no-zero is valid */ +#cmakedefine01 OSX_DARWIN_VERSION -/* Set to 1 if compiling for MacOSX */ -#undef OS_IS_MACOSX +/* Set to 1 if compiling for OpenBSD */ +#cmakedefine01 OS_IS_OPENBSD /* Set to 1 if compiling for Win32 */ -#undef OS_IS_WIN32 +#cmakedefine01 OS_IS_WIN32 /* Name of package */ -#undef PACKAGE +#define PACKAGE "@PACKAGE_NAME@" /* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT +#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" /* Define to the full name of this package. */ -#undef PACKAGE_NAME +#define PACKAGE_NAME "@PACKAGE_NAME@" /* Define to the full name and version of this package. */ -#undef PACKAGE_STRING +#define PACKAGE_STRING "@PACKAGE_NAME@ @CPACK_PACKAGE_VERSION_FULL@" /* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME +#define PACKAGE_TARNAME "@PACKAGE_NAME@" /* Define to the home page for this package. */ -#undef PACKAGE_URL +#define PACKAGE_URL "@PACKAGE_URL@" /* Define to the version of this package. */ -#undef PACKAGE_VERSION +#define PACKAGE_VERSION "@CPACK_PACKAGE_VERSION_FULL@" /* Set to maximum allowed value of sf_count_t type. */ -#undef SF_COUNT_MAX +#define SF_COUNT_MAX @SF_COUNT_MAX@ /* The size of `double', as computed by sizeof. */ -#undef SIZEOF_DOUBLE +@SIZEOF_DOUBLE_CODE@ /* The size of `float', as computed by sizeof. */ -#undef SIZEOF_FLOAT +@SIZEOF_FLOAT_CODE@ /* The size of `int', as computed by sizeof. */ -#undef SIZEOF_INT +@SIZEOF_INT_CODE@ /* The size of `int64_t', as computed by sizeof. */ -#undef SIZEOF_INT64_T +@SIZEOF_INT64_T_CODE@ /* The size of `loff_t', as computed by sizeof. */ -#undef SIZEOF_LOFF_T +@SIZEOF_LOFF_T_CODE@ /* The size of `long', as computed by sizeof. */ -#undef SIZEOF_LONG +@SIZEOF_LONG_CODE@ /* The size of `long long', as computed by sizeof. */ -#undef SIZEOF_LONG_LONG +@SIZEOF_LONG_LONG_CODE@ /* The size of `off64_t', as computed by sizeof. */ -#undef SIZEOF_OFF64_T +@SIZEOF_OFF64_T_CODE@ /* The size of `off_t', as computed by sizeof. */ -#undef SIZEOF_OFF_T +@SIZEOF_OFF_T_CODE@ /* Set to sizeof (long) if unknown. */ -#undef SIZEOF_SF_COUNT_T +@SIZEOF_SF_COUNT_T_CODE@ /* The size of `short', as computed by sizeof. */ -#undef SIZEOF_SHORT +@SIZEOF_SHORT_CODE@ /* The size of `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T +@SIZEOF_SIZE_T_CODE@ /* The size of `ssize_t', as computed by sizeof. */ -#undef SIZEOF_SSIZE_T +@SIZEOF_SSIZE_T_CODE@ /* The size of `void*', as computed by sizeof. */ -#undef SIZEOF_VOIDP +@SIZEOF_VOIDP_CODE@ /* The size of `wchar_t', as computed by sizeof. */ -#undef SIZEOF_WCHAR_T +@SIZEOF_WCHAR_T_CODE@ /* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS +#cmakedefine01 STDC_HEADERS /* Set to long if unknown. */ -#undef TYPEOF_SF_COUNT_T +#define TYPEOF_SF_COUNT_T @TYPEOF_SF_COUNT_T@ + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + /* Set to 1 to use the native windows API */ -#undef USE_WINDOWS_API +#cmakedefine01 USE_WINDOWS_API /* Version number of package */ -#undef VERSION +#define VERSION "@PROJECT_VERSION@" /* Set to 1 if windows DLL is being built. */ -#undef WIN32_TARGET_DLL +#cmakedefine01 WIN32_TARGET_DLL /* Target processor is big endian. */ -#undef WORDS_BIGENDIAN +#cmakedefine01 WORDS_BIGENDIAN -/* Number of bits in a file offset, on hosts where this is settable. */ -#undef _FILE_OFFSET_BITS +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif -/* Define to make fseeko etc. visible, on some hosts. */ -#undef _LARGEFILE_SOURCE +/* Define to 1 if on MINIX. */ +#cmakedefine01 _MINIX -/* Define for large files, on AIX-style hosts. */ -#undef _LARGE_FILES - -/* Set to 1 to use C99 printf/snprintf in MinGW. */ -#undef __USE_MINGW_ANSI_STDIO +/* Define as `__inline' or '__inline__' if that's what the C compiler calls it, or to nothing if it is not supported. */ +@INLINE_CODE@ diff --git a/lib-src/libsndfile/src/create_symbols_file.py b/lib-src/libsndfile/src/create_symbols_file.py old mode 100755 new mode 100644 index f2cab122e..82717466d --- a/lib-src/libsndfile/src/create_symbols_file.py +++ b/lib-src/libsndfile/src/create_symbols_file.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (C) 2003-2011 Erik de Castro Lopo +# Copyright (C) 2003-2017 Erik de Castro Lopo # # All rights reserved. # @@ -39,101 +39,106 @@ import re, sys # the ordinal values in the second column. ALL_SYMBOLS = ( - ( "sf_command", 1 ), - ( "sf_open", 2 ), - ( "sf_close", 3 ), - ( "sf_seek", 4 ), - ( "sf_error", 7 ), - ( "sf_perror", 8 ), - ( "sf_error_str", 9 ), - ( "sf_error_number", 10 ), - ( "sf_format_check", 11 ), - ( "sf_read_raw", 16 ), - ( "sf_readf_short", 17 ), - ( "sf_readf_int", 18 ), - ( "sf_readf_float", 19 ), - ( "sf_readf_double", 20 ), - ( "sf_read_short", 21 ), - ( "sf_read_int", 22 ), - ( "sf_read_float", 23 ), - ( "sf_read_double", 24 ), - ( "sf_write_raw", 32 ), - ( "sf_writef_short", 33 ), - ( "sf_writef_int", 34 ), - ( "sf_writef_float", 35 ), - ( "sf_writef_double", 36 ), - ( "sf_write_short", 37 ), - ( "sf_write_int", 38 ), - ( "sf_write_float", 39 ), - ( "sf_write_double", 40 ), - ( "sf_strerror", 50 ), - ( "sf_get_string", 60 ), - ( "sf_set_string", 61 ), - ( "sf_version_string",68 ), - ( "sf_open_fd", 70 ), - ( "sf_wchar_open", 71 ), - ( "sf_open_virtual", 80 ), - ( "sf_write_sync", 90 ) + ( "sf_command", 1 ), + ( "sf_open", 2 ), + ( "sf_close", 3 ), + ( "sf_seek", 4 ), + ( "sf_error", 7 ), + ( "sf_perror", 8 ), + ( "sf_error_str", 9 ), + ( "sf_error_number", 10 ), + ( "sf_format_check", 11 ), + ( "sf_read_raw", 16 ), + ( "sf_readf_short", 17 ), + ( "sf_readf_int", 18 ), + ( "sf_readf_float", 19 ), + ( "sf_readf_double", 20 ), + ( "sf_read_short", 21 ), + ( "sf_read_int", 22 ), + ( "sf_read_float", 23 ), + ( "sf_read_double", 24 ), + ( "sf_write_raw", 32 ), + ( "sf_writef_short", 33 ), + ( "sf_writef_int", 34 ), + ( "sf_writef_float", 35 ), + ( "sf_writef_double", 36 ), + ( "sf_write_short", 37 ), + ( "sf_write_int", 38 ), + ( "sf_write_float", 39 ), + ( "sf_write_double", 40 ), + ( "sf_strerror", 50 ), + ( "sf_get_string", 60 ), + ( "sf_set_string", 61 ), + ( "sf_version_string", 68 ), + ( "sf_open_fd", 70 ), + ( "sf_wchar_open", 71 ), + ( "sf_open_virtual", 80 ), + ( "sf_write_sync", 90 ), + ( "sf_set_chunk", 100 ), + ( "sf_get_chunk_size", 101 ), + ( "sf_get_chunk_data", 102 ), + ( "sf_get_chunk_iterator", 103 ), + ( "sf_next_chunk_iterator", 104 ), + ( "sf_current_byterate", 110 ) ) #------------------------------------------------------------------------------- def linux_symbols (progname, version): - print "# Auto-generated by %s\n" %progname - print "libsndfile.so.%s" % version - print "{" - print " global:" + print ("# Auto-generated by %s\n" %progname) + print ("libsndfile.so.%s" % version) + print ("{") + print (" global:") for name, ordinal in ALL_SYMBOLS: if name == "sf_wchar_open": continue - print " %s ;" % name - print " local:" - print " * ;" - print "} ;" - print + print (" %s ;" % name) + print (" local:") + print (" * ;") + print ("} ;") + sys.stdout.write ("\n") return def darwin_symbols (progname, version): - print "# Auto-generated by %s\n" %progname + print ("# Auto-generated by %s\n" %progname) for name, ordinal in ALL_SYMBOLS: if name == "sf_wchar_open": continue - print "_%s" % name - print + print ("_%s" % name) + sys.stdout.write ("\n") return def win32_symbols (progname, version, name): - print "; Auto-generated by %s\n" %progname - print "LIBRARY %s-%s.dll" % (name, re.sub ("\..*", "", version)) - print "EXPORTS\n" + print ("; Auto-generated by %s\n" %progname) + print ("EXPORTS\n") for name, ordinal in ALL_SYMBOLS: - print "%-20s @%s" % (name, ordinal) - print + print ("%-20s @%s" % (name, ordinal)) + sys.stdout.write ("\n") return def os2_symbols (progname, version, name): - print "; Auto-generated by %s\n" %progname - print "LIBRARY %s%s" % (name, re.sub ("\..*", "", version)) - print "INITINSTANCE TERMINSTANCE" - print "CODE PRELOAD MOVEABLE DISCARDABLE" - print "DATA PRELOAD MOVEABLE MULTIPLE NONSHARED" - print "EXPORTS\n" + print ("; Auto-generated by %s\n" %progname) + print ("LIBRARY %s%s" % (name, re.sub ("\..*", "", version))) + print ("INITINSTANCE TERMINSTANCE") + print ("CODE PRELOAD MOVEABLE DISCARDABLE") + print ("DATA PRELOAD MOVEABLE MULTIPLE NONSHARED") + print ("EXPORTS\n") for name, ordinal in ALL_SYMBOLS: if name == "sf_wchar_open": continue - print "_%-20s @%s" % (name, ordinal) - print + print ("_%-20s @%s" % (name, ordinal)) + sys.stdout.write ("\n") return def plain_symbols (progname, version, name): for name, ordinal in ALL_SYMBOLS: - print name + print (name) def no_symbols (os_name): - print - print "No known way of restricting exported symbols on '%s'." % os_name - print "If you know a way, please contact the author." - print + sys.stdout.write ("\n") + print ("No known way of restricting exported symbols on '%s'." % os_name) + print ("If you know a way, please contact the author.") + sys.stdout.write ("\n") return #------------------------------------------------------------------------------- @@ -141,17 +146,17 @@ def no_symbols (os_name): progname = re.sub (".*[\\/]", "", sys.argv [0]) if len (sys.argv) != 3: - print - print "Usage : %s ." % progname - print - print " Currently supported values for target OS are:" - print " linux" - print " darwin (ie MacOSX)" - print " win32 (ie wintendo)" - print " cygwin (Cygwin on wintendo)" - print " os2 (OS/2)" - print " plain (plain list of symbols)" - print + sys.stdout.write ("\n") + print ("Usage : %s ." % progname) + sys.stdout.write ("\n") + print (" Currently supported values for target OS are:") + print (" linux") + print (" darwin (ie MacOSX)") + print (" win32 (ie wintendo)") + print (" cygwin (Cygwin on wintendo)") + print (" os2 (OS/2)") + print (" plain (plain list of symbols)") + sys.stdout.write ("\n") sys.exit (1) os_name = sys.argv [1] diff --git a/lib-src/libsndfile/src/double64.c b/lib-src/libsndfile/src/double64.c index 425088bb3..78dfef7fa 100644 --- a/lib-src/libsndfile/src/double64.c +++ b/lib-src/libsndfile/src/double64.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2015 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -91,6 +91,11 @@ int double64_init (SF_PRIVATE *psf) { static int double64_caps ; + if (psf->sf.channels < 1 || psf->sf.channels > SF_MAX_CHANNELS) + { psf_log_printf (psf, "double64_init : internal error : channels = %d\n", psf->sf.channels) ; + return SFE_INTERNAL ; + } ; + double64_caps = double64_get_capability (psf) ; psf->blockwidth = sizeof (double) * psf->sf.channels ; @@ -276,7 +281,7 @@ double64_init (SF_PRIVATE *psf) */ double -double64_be_read (unsigned char *cptr) +double64_be_read (const unsigned char *cptr) { int exponent, negative, upper, lower ; double dvalue ; @@ -309,7 +314,7 @@ double64_be_read (unsigned char *cptr) } /* double64_be_read */ double -double64_le_read (unsigned char *cptr) +double64_le_read (const unsigned char *cptr) { int exponent, negative, upper, lower ; double dvalue ; @@ -554,24 +559,25 @@ f2d_array (const float *src, double *dest, int count) static sf_count_t host_read_d2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ void (*convert) (const double *, int, short *, double) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, int, short *, double) ; int bufferlen, readcount ; sf_count_t total = 0 ; double scale ; convert = (psf->add_clipping) ? d2s_clip_array : d2s_array ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, readcount) ; + endswap_double_array (ubuf.dbuf, readcount) ; - convert (psf->u.dbuf, readcount, ptr + total, scale) ; + convert (ubuf.dbuf, readcount, ptr + total, scale) ; total += readcount ; len -= readcount ; if (readcount < bufferlen) @@ -583,24 +589,25 @@ host_read_d2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t host_read_d2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ void (*convert) (const double *, int, int *, double) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, int, int *, double) ; int bufferlen, readcount ; sf_count_t total = 0 ; double scale ; convert = (psf->add_clipping) ? d2i_clip_array : d2i_array ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFFFFFF / psf->float_max ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - convert (psf->u.dbuf, readcount, ptr + total, scale) ; + convert (ubuf.dbuf, readcount, ptr + total, scale) ; total += readcount ; len -= readcount ; if (readcount < bufferlen) @@ -612,20 +619,21 @@ host_read_d2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t host_read_d2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - d2f_array (psf->u.dbuf, readcount, ptr + total) ; + d2f_array (ubuf.dbuf, readcount, ptr + total) ; total += readcount ; len -= readcount ; if (readcount < bufferlen) @@ -667,26 +675,27 @@ host_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t host_write_s2d (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; double scale ; scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / 0x8000 ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2d_array (ptr + total, psf->u.dbuf, bufferlen, scale) ; + s2d_array (ptr + total, ubuf.dbuf, bufferlen, scale) ; if (psf->peak_info) - double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ; + double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -698,25 +707,26 @@ host_write_s2d (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t host_write_i2d (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; double scale ; scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / (8.0 * 0x10000000) ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2d_array (ptr + total, psf->u.dbuf, bufferlen, scale) ; + i2d_array (ptr + total, ubuf.dbuf, bufferlen, scale) ; if (psf->peak_info) - double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ; + double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -728,23 +738,24 @@ host_write_i2d (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t host_write_f2d (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - f2d_array (ptr + total, psf->u.dbuf, bufferlen) ; + f2d_array (ptr + total, ubuf.dbuf, bufferlen) ; if (psf->peak_info) - double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ; + double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -756,7 +767,8 @@ host_write_f2d (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t host_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; if (psf->peak_info) @@ -765,15 +777,15 @@ host_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) if (psf->data_endswap != SF_TRUE) return psf_fwrite (ptr, sizeof (double), len, psf) ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - endswap_double_copy (psf->u.dbuf, ptr + total, bufferlen) ; + endswap_double_copy (ubuf.dbuf, ptr + total, bufferlen) ; - writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -788,24 +800,25 @@ host_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) static sf_count_t replace_read_d2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double scale ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - d2bd_read (psf->u.dbuf, bufferlen) ; + d2bd_read (ubuf.dbuf, bufferlen) ; - d2s_array (psf->u.dbuf, readcount, ptr + total, scale) ; + d2s_array (ubuf.dbuf, readcount, ptr + total, scale) ; total += readcount ; if (readcount < bufferlen) break ; @@ -817,24 +830,25 @@ replace_read_d2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t replace_read_d2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double scale ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFFFFFF / psf->float_max ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - d2bd_read (psf->u.dbuf, bufferlen) ; + d2bd_read (ubuf.dbuf, bufferlen) ; - d2i_array (psf->u.dbuf, readcount, ptr + total, scale) ; + d2i_array (ubuf.dbuf, readcount, ptr + total, scale) ; total += readcount ; if (readcount < bufferlen) break ; @@ -846,22 +860,23 @@ replace_read_d2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t replace_read_d2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - d2bd_read (psf->u.dbuf, bufferlen) ; + d2bd_read (ubuf.dbuf, bufferlen) ; - memcpy (ptr + total, psf->u.dbuf, bufferlen * sizeof (double)) ; + memcpy (ptr + total, ubuf.dbuf, bufferlen * sizeof (double)) ; total += readcount ; if (readcount < bufferlen) @@ -874,23 +889,24 @@ replace_read_d2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t replace_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; /* FIXME : This is probably nowhere near optimal. */ - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, readcount) ; + endswap_double_array (ubuf.dbuf, readcount) ; - d2bd_read (psf->u.dbuf, readcount) ; + d2bd_read (ubuf.dbuf, readcount) ; - memcpy (ptr + total, psf->u.dbuf, readcount * sizeof (double)) ; + memcpy (ptr + total, ubuf.dbuf, readcount * sizeof (double)) ; total += readcount ; if (readcount < bufferlen) @@ -903,27 +919,28 @@ replace_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t replace_write_s2d (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; double scale ; scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / 0x8000 ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2d_array (ptr + total, psf->u.dbuf, bufferlen, scale) ; + s2d_array (ptr + total, ubuf.dbuf, bufferlen, scale) ; if (psf->peak_info) - double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ; + double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ; - bd2d_write (psf->u.dbuf, bufferlen) ; + bd2d_write (ubuf.dbuf, bufferlen) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -935,27 +952,28 @@ replace_write_s2d (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t replace_write_i2d (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; double scale ; scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / (8.0 * 0x10000000) ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2d_array (ptr + total, psf->u.dbuf, bufferlen, scale) ; + i2d_array (ptr + total, ubuf.dbuf, bufferlen, scale) ; if (psf->peak_info) - double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ; + double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ; - bd2d_write (psf->u.dbuf, bufferlen) ; + bd2d_write (ubuf.dbuf, bufferlen) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -967,22 +985,23 @@ replace_write_i2d (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t replace_write_f2d (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - f2d_array (ptr + total, psf->u.dbuf, bufferlen) ; + f2d_array (ptr + total, ubuf.dbuf, bufferlen) ; - bd2d_write (psf->u.dbuf, bufferlen) ; + bd2d_write (ubuf.dbuf, bufferlen) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -994,27 +1013,28 @@ replace_write_f2d (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t replace_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; /* FIXME : This is probably nowhere near optimal. */ if (psf->peak_info) double64_peak_update (psf, ptr, len, 0) ; - bufferlen = ARRAY_LEN (psf->u.dbuf) ; + bufferlen = ARRAY_LEN (ubuf.dbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - memcpy (psf->u.dbuf, ptr + total, bufferlen * sizeof (double)) ; + memcpy (ubuf.dbuf, ptr + total, bufferlen * sizeof (double)) ; - bd2d_write (psf->u.dbuf, bufferlen) ; + bd2d_write (ubuf.dbuf, bufferlen) ; if (psf->data_endswap == SF_TRUE) - endswap_double_array (psf->u.dbuf, bufferlen) ; + endswap_double_array (ubuf.dbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; diff --git a/lib-src/libsndfile/src/dwd.c b/lib-src/libsndfile/src/dwd.c index e87ec0149..af4d9f0e4 100644 --- a/lib-src/libsndfile/src/dwd.c +++ b/lib-src/libsndfile/src/dwd.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2012 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -69,7 +69,7 @@ static int dwd_close (SF_PRIVATE *psf) ; int dwd_open (SF_PRIVATE *psf) -{ int subformat, error = 0 ; +{ int error = 0 ; if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0)) { if ((error = dwd_read_header (psf))) @@ -79,8 +79,6 @@ dwd_open (SF_PRIVATE *psf) if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_DWD) return SFE_BAD_OPEN_FORMAT ; - subformat = SF_CODEC (psf->sf.format) ; - if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) { /*-psf->endian = SF_ENDIAN (psf->sf.format) ; @@ -124,16 +122,17 @@ typedef struct static int dwd_read_header (SF_PRIVATE *psf) -{ DWD_HEADER dwdh ; +{ BUF_UNION ubuf ; + DWD_HEADER dwdh ; - memset (psf->u.cbuf, 0, sizeof (psf->u.cbuf)) ; + memset (ubuf.cbuf, 0, sizeof (ubuf.cbuf)) ; /* Set position to start of file to begin reading header. */ - psf_binheader_readf (psf, "pb", 0, psf->u.cbuf, DWD_IDENTIFIER_LEN) ; + psf_binheader_readf (psf, "pb", 0, ubuf.cbuf, DWD_IDENTIFIER_LEN) ; - if (memcmp (psf->u.cbuf, DWD_IDENTIFIER, DWD_IDENTIFIER_LEN) != 0) + if (memcmp (ubuf.cbuf, DWD_IDENTIFIER, DWD_IDENTIFIER_LEN) != 0) return SFE_DWD_NO_DWD ; - psf_log_printf (psf, "Read only : DiamondWare Digitized (.dwd)\n", psf->u.cbuf) ; + psf_log_printf (psf, "Read only : DiamondWare Digitized (.dwd)\n", ubuf.cbuf) ; psf_binheader_readf (psf, "11", &dwdh.major, &dwdh.minor) ; psf_binheader_readf (psf, "e4j1", &dwdh.id, 1, &dwdh.compression) ; @@ -152,9 +151,9 @@ dwd_read_header (SF_PRIVATE *psf) else psf_log_printf (psf, "None\n") ; - psf_log_printf (psf, " Sample Rate : %d\n Channels : %d\n" - " Bit Width : %d\n", - dwdh.srate, dwdh.channels, dwdh.bitwidth) ; + psf_log_printf (psf, " Sample Rate : %d\n Channels : %d\n" + " Bit Width : %d\n", + dwdh.srate, dwdh.channels, dwdh.bitwidth) ; switch (dwdh.bitwidth) { case 8 : diff --git a/lib-src/libsndfile/src/dwvw.c b/lib-src/libsndfile/src/dwvw.c index 562f01513..0da1326da 100644 --- a/lib-src/libsndfile/src/dwvw.c +++ b/lib-src/libsndfile/src/dwvw.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2014 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -38,7 +38,7 @@ #include "common.h" typedef struct -{ int dwm_maxsize, bit_width, max_delta, span ; +{ int bit_width, dwm_maxsize, max_delta, span ; int samplecount ; int bit_count, bits, last_delta_width, last_sample ; struct @@ -61,7 +61,8 @@ static sf_count_t dwvw_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t le static sf_count_t dwvw_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; static sf_count_t dwvw_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; -static int dwvw_close (SF_PRIVATE *psf) ; +static int dwvw_close (SF_PRIVATE *psf) ; +static int dwvw_byterate (SF_PRIVATE *psf) ; static int dwvw_decode_data (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int *ptr, int len) ; static int dwvw_decode_load_bits (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int bit_count) ; @@ -93,12 +94,7 @@ dwvw_init (SF_PRIVATE *psf, int bitwidth) return SFE_MALLOC_FAILED ; psf->codec_data = (void*) pdwvw ; - pdwvw->bit_width = bitwidth ; - pdwvw->dwm_maxsize = bitwidth / 2 ; - pdwvw->max_delta = 1 << (bitwidth - 1) ; - pdwvw->span = 1 << bitwidth ; - dwvw_read_reset (pdwvw) ; if (psf->file.mode == SFM_READ) @@ -117,11 +113,12 @@ dwvw_init (SF_PRIVATE *psf, int bitwidth) psf->codec_close = dwvw_close ; psf->seek = dwvw_seek ; + psf->byterate = dwvw_byterate ; - /* FIXME : This is bogus. */ - psf->sf.frames = SF_COUNT_MAX ; - psf->datalength = psf->sf.frames ; - /* EMXIF : This is bogus. */ + if (psf->file.mode == SFM_READ) + { psf->sf.frames = psf_decode_frame_count (psf) ; + dwvw_read_reset (pdwvw) ; + } ; return 0 ; } /* dwvw_init */ @@ -174,6 +171,14 @@ dwvw_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset) return PSF_SEEK_ERROR ; } /* dwvw_seek */ +static int +dwvw_byterate (SF_PRIVATE *psf) +{ + if (psf->file.mode == SFM_READ) + return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ; + + return -1 ; +} /* dwvw_byterate */ /*============================================================================== */ @@ -181,6 +186,7 @@ dwvw_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset) static sf_count_t dwvw_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) { DWVW_PRIVATE *pdwvw ; + BUF_UNION ubuf ; int *iptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -189,8 +195,8 @@ dwvw_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) return 0 ; pdwvw = (DWVW_PRIVATE*) psf->codec_data ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = dwvw_decode_data (psf, pdwvw, iptr, readcount) ; @@ -234,8 +240,9 @@ dwvw_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t dwvw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) { DWVW_PRIVATE *pdwvw ; - int *iptr ; - int k, bufferlen, readcount = 0, count ; + BUF_UNION ubuf ; + int *iptr ; + int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; float normfact ; @@ -245,8 +252,8 @@ dwvw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = dwvw_decode_data (psf, pdwvw, iptr, readcount) ; @@ -265,8 +272,9 @@ dwvw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t dwvw_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) { DWVW_PRIVATE *pdwvw ; - int *iptr ; - int k, bufferlen, readcount = 0, count ; + BUF_UNION ubuf ; + int *iptr ; + int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; double normfact ; @@ -276,8 +284,8 @@ dwvw_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = dwvw_decode_data (psf, pdwvw, iptr, readcount) ; @@ -307,7 +315,7 @@ dwvw_decode_data (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int *ptr, int len) delta_width_modifier = dwvw_decode_load_bits (psf, pdwvw, -1) ; /* Check for end of input bit stream. Break loop if end. */ - if (delta_width_modifier < 0) + if (delta_width_modifier < 0 || (pdwvw->b.end == 0 && count == 0)) break ; if (delta_width_modifier && dwvw_decode_load_bits (psf, pdwvw, 1)) @@ -336,7 +344,7 @@ dwvw_decode_data (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int *ptr, int len) sample += pdwvw->span ; /* Store the sample justifying to the most significant bit. */ - ptr [count] = sample << (32 - pdwvw->bit_width) ; + ptr [count] = arith_shift_left (sample, 32 - pdwvw->bit_width) ; if (pdwvw->b.end == 0 && pdwvw->bit_count == 0) break ; @@ -377,7 +385,7 @@ dwvw_decode_load_bits (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int bit_count) if (bit_count < 8 && pdwvw->b.end == 0) return -1 ; - pdwvw->bits = (pdwvw->bits << 8) ; + pdwvw->bits = arith_shift_left (pdwvw->bits, 8) ; if (pdwvw->b.index < pdwvw->b.end) { pdwvw->bits |= pdwvw->b.buffer [pdwvw->b.index] ; @@ -406,13 +414,14 @@ dwvw_decode_load_bits (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int bit_count) static void dwvw_read_reset (DWVW_PRIVATE *pdwvw) -{ pdwvw->samplecount = 0 ; - pdwvw->b.index = 0 ; - pdwvw->b.end = 0 ; - pdwvw->bit_count = 0 ; - pdwvw->bits = 0 ; - pdwvw->last_delta_width = 0 ; - pdwvw->last_sample = 0 ; +{ int bitwidth = pdwvw->bit_width ; + + memset (pdwvw, 0, sizeof (DWVW_PRIVATE)) ; + + pdwvw->bit_width = bitwidth ; + pdwvw->dwm_maxsize = bitwidth / 2 ; + pdwvw->max_delta = 1 << (bitwidth - 1) ; + pdwvw->span = 1 << bitwidth ; } /* dwvw_read_reset */ static void @@ -420,7 +429,7 @@ dwvw_encode_store_bits (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int data, int new_ { int byte ; /* Shift the bits into the resevoir. */ - pdwvw->bits = (pdwvw->bits << new_bits) | (data & ((1 << new_bits) - 1)) ; + pdwvw->bits = arith_shift_left (pdwvw->bits, new_bits) | (data & (arith_shift_left (1, new_bits) - 1)) ; pdwvw->bit_count += new_bits ; /* Transfer bit to buffer. */ @@ -461,9 +470,9 @@ dump_bits (DWVW_PRIVATE *pdwvw) } /* dump_bits */ #endif -#define HIGHEST_BIT(x,count) \ +#define HIGHEST_BIT(x, count) \ { int y = x ; \ - (count) = 0 ; \ + (count) = 0 ; \ while (y) \ { (count) ++ ; \ y >>= 1 ; \ @@ -548,6 +557,7 @@ dwvw_encode_data (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, const int *ptr, int len) static sf_count_t dwvw_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) { DWVW_PRIVATE *pdwvw ; + BUF_UNION ubuf ; int *iptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -556,12 +566,12 @@ dwvw_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) return 0 ; pdwvw = (DWVW_PRIVATE*) psf->codec_data ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) - iptr [k] = ptr [total + k] << 16 ; + iptr [k] = arith_shift_left (ptr [total + k], 16) ; count = dwvw_encode_data (psf, pdwvw, iptr, writecount) ; total += count ; @@ -601,6 +611,7 @@ dwvw_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t dwvw_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) { DWVW_PRIVATE *pdwvw ; + BUF_UNION ubuf ; int *iptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -612,8 +623,8 @@ dwvw_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFFFFFF) : 1.0 ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -632,6 +643,7 @@ dwvw_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t dwvw_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) { DWVW_PRIVATE *pdwvw ; + BUF_UNION ubuf ; int *iptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -643,8 +655,8 @@ dwvw_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFFFFFF) : 1.0 ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) diff --git a/lib-src/libsndfile/src/file_io.c b/lib-src/libsndfile/src/file_io.c index 44f1b5a35..e5762ce83 100644 --- a/lib-src/libsndfile/src/file_io.c +++ b/lib-src/libsndfile/src/file_io.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2014 Erik de Castro Lopo ** Copyright (C) 2003 Ross Bencina ** ** This program is free software; you can redistribute it and/or modify @@ -116,33 +116,36 @@ psf_fclose (SF_PRIVATE *psf) int psf_open_rsrc (SF_PRIVATE *psf) -{ +{ size_t count ; + if (psf->rsrc.filedes > 0) return 0 ; /* Test for MacOSX style resource fork on HPFS or HPFS+ filesystems. */ - snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s/rsrc", psf->file.path.c) ; + count = snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s/..namedfork/rsrc", psf->file.path.c) ; psf->error = SFE_NO_ERROR ; - if ((psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0) - { psf->rsrclength = psf_get_filelen_fd (psf->rsrc.filedes) ; - if (psf->rsrclength > 0 || (psf->rsrc.mode & SFM_WRITE)) - return SFE_NO_ERROR ; - psf_close_fd (psf->rsrc.filedes) ; - psf->rsrc.filedes = -1 ; - } ; + if (count < sizeof (psf->rsrc.path.c)) + { if ((psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0) + { psf->rsrclength = psf_get_filelen_fd (psf->rsrc.filedes) ; + if (psf->rsrclength > 0 || (psf->rsrc.mode & SFM_WRITE)) + return SFE_NO_ERROR ; + psf_close_fd (psf->rsrc.filedes) ; + psf->rsrc.filedes = -1 ; + } ; - if (psf->rsrc.filedes == - SFE_BAD_OPEN_MODE) - { psf->error = SFE_BAD_OPEN_MODE ; - return psf->error ; + if (psf->rsrc.filedes == - SFE_BAD_OPEN_MODE) + { psf->error = SFE_BAD_OPEN_MODE ; + return psf->error ; + } ; } ; /* ** Now try for a resource fork stored as a separate file in the same ** directory, but preceded with a dot underscore. */ - snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s._%s", psf->file.dir.c, psf->file.name.c) ; + count = snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s._%s", psf->file.dir.c, psf->file.name.c) ; psf->error = SFE_NO_ERROR ; - if ((psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0) + if (count < sizeof (psf->rsrc.path.c) && (psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0) { psf->rsrclength = psf_get_filelen_fd (psf->rsrc.filedes) ; return SFE_NO_ERROR ; } ; @@ -151,16 +154,21 @@ psf_open_rsrc (SF_PRIVATE *psf) ** Now try for a resource fork stored in a separate file in the ** .AppleDouble/ directory. */ - snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s.AppleDouble/%s", psf->file.dir.c, psf->file.name.c) ; + count = snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s.AppleDouble/%s", psf->file.dir.c, psf->file.name.c) ; psf->error = SFE_NO_ERROR ; - if ((psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0) - { psf->rsrclength = psf_get_filelen_fd (psf->rsrc.filedes) ; - return SFE_NO_ERROR ; - } ; + if (count < sizeof (psf->rsrc.path.c)) + { if ((psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0) + { psf->rsrclength = psf_get_filelen_fd (psf->rsrc.filedes) ; + return SFE_NO_ERROR ; + } ; - /* No resource file found. */ - if (psf->rsrc.filedes == -1) - psf_log_syserr (psf, errno) ; + /* No resource file found. */ + if (psf->rsrc.filedes == -1) + psf_log_syserr (psf, errno) ; + } + else + { psf->error = SFE_OPEN_FAILED ; + } ; psf->rsrc.filedes = -1 ; @@ -257,12 +265,17 @@ psf_file_valid (SF_PRIVATE *psf) sf_count_t psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) -{ sf_count_t current_pos, new_position ; +{ sf_count_t absolute_position ; if (psf->virtual_io) return psf->vio.seek (offset, whence, psf->vio_user_data) ; - current_pos = psf_ftell (psf) ; + /* When decoding from pipes sometimes see seeks to the pipeoffset, which appears to mean do nothing. */ + if (psf->is_pipe) + { if (whence != SEEK_SET || offset != psf->pipeoffset) + psf_log_printf (psf, "psf_fseek : pipe seek to value other than pipeoffset\n") ; + return offset ; + } switch (whence) { case SEEK_SET : @@ -270,27 +283,9 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) break ; case SEEK_END : - if (psf->file.mode == SFM_WRITE) - { new_position = lseek (psf->file.filedes, offset, whence) ; - - if (new_position < 0) - psf_log_syserr (psf, errno) ; - - return new_position - psf->fileoffset ; - } ; - - /* Transform SEEK_END into a SEEK_SET, ie find the file - ** length add the requested offset (should be <= 0) to - ** get the offset wrt the start of file. - */ - whence = SEEK_SET ; - offset = lseek (psf->file.filedes, 0, SEEK_END) + offset ; break ; case SEEK_CUR : - /* Translate a SEEK_CUR into a SEEK_SET. */ - offset += current_pos ; - whence = SEEK_SET ; break ; default : @@ -299,17 +294,12 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) return 0 ; } ; - if (current_pos != offset) - new_position = lseek (psf->file.filedes, offset, whence) ; - else - new_position = offset ; + absolute_position = lseek (psf->file.filedes, offset, whence) ; - if (new_position < 0) + if (absolute_position < 0) psf_log_syserr (psf, errno) ; - new_position -= psf->fileoffset ; - - return new_position ; + return absolute_position - psf->fileoffset ; } /* psf_fseek */ sf_count_t @@ -358,6 +348,9 @@ psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf { sf_count_t total = 0 ; ssize_t count ; + if (bytes == 0 || items == 0) + return 0 ; + if (psf->virtual_io) return psf->vio.write (ptr, bytes*items, psf->vio_user_data) / bytes ; @@ -473,19 +466,22 @@ psf_is_pipe (SF_PRIVATE *psf) static sf_count_t psf_get_filelen_fd (int fd) -{ struct stat statbuf ; +{ +#if (SIZEOF_OFF_T == 4 && SIZEOF_SF_COUNT_T == 8 && HAVE_FSTAT64) + struct stat64 statbuf ; - /* - ** Sanity check. - ** If everything is OK, this will be optimised out. - */ - if (sizeof (statbuf.st_size) == 4 && sizeof (sf_count_t) == 8) - return (sf_count_t) -SFE_BAD_STAT_SIZE ; + if (fstat64 (fd, &statbuf) == -1) + return (sf_count_t) -1 ; + + return statbuf.st_size ; +#else + struct stat statbuf ; if (fstat (fd, &statbuf) == -1) return (sf_count_t) -1 ; return statbuf.st_size ; +#endif } /* psf_get_filelen_fd */ int @@ -538,8 +534,8 @@ psf_open_fd (PSF_FILE * pfile) ** be optimised out. This is meant to catch the problems caused by ** "sfconfig.h" being included after . */ - if (sizeof (off_t) != sizeof (sf_count_t)) - { puts ("\n\n*** Fatal error : sizeof (off_t) != sizeof (sf_count_t)") ; + if (sizeof (sf_count_t) != 8) + { puts ("\n\n*** Fatal error : sizeof (sf_count_t) != 8") ; puts ("*** This means that libsndfile was not configured correctly.\n") ; exit (1) ; } ; @@ -552,12 +548,12 @@ psf_open_fd (PSF_FILE * pfile) case SFM_WRITE : oflag = O_WRONLY | O_CREAT | O_TRUNC | O_BINARY ; - mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH ; + mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH ; break ; case SFM_RDWR : oflag = O_RDWR | O_CREAT | O_BINARY ; - mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH ; + mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH ; break ; default : @@ -589,10 +585,10 @@ void psf_fsync (SF_PRIVATE *psf) { #if HAVE_FSYNC - if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) - fsync (psf->file.filedes) ; + if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) + fsync (psf->file.filedes) ; #else - psf = NULL ; + psf = NULL ; #endif } /* psf_fsync */ @@ -672,7 +668,7 @@ psf_open_rsrc (SF_PRIVATE *psf) psf->error = SFE_NO_ERROR ; if ((psf->rsrc.handle = psf_open_handle (&psf->rsrc)) != NULL) { psf->rsrclength = psf_get_filelen_handle (psf->rsrc.handle) ; - return SFE_NO_ERROR ; + return SFE_NO_ERROR ; } ; /* No resource file found. */ @@ -792,7 +788,7 @@ psf_open_handle (PSF_FILE * pfile) NULL /* handle to file with attributes to copy */ ) ; else - handle = CreateFile ( + handle = CreateFileA ( pfile->path.c, /* pointer to name of the file */ dwDesiredAccess, /* access (read-write) mode */ dwShareMode, /* share mode */ @@ -896,9 +892,10 @@ psf_file_valid (SF_PRIVATE *psf) /* USE_WINDOWS_API */ sf_count_t psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) { sf_count_t new_position ; - LONG lDistanceToMove, lDistanceToMoveHigh ; + LARGE_INTEGER liDistanceToMove, liNewFilePointer ; DWORD dwMoveMethod ; - DWORD dwResult, dwError ; + BOOL fResult ; + DWORD dwError ; if (psf->virtual_io) return psf->vio.seek (offset, whence, psf->vio_user_data) ; @@ -918,12 +915,11 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) break ; } ; - lDistanceToMove = (DWORD) (offset & 0xFFFFFFFF) ; - lDistanceToMoveHigh = (DWORD) ((offset >> 32) & 0xFFFFFFFF) ; + liDistanceToMove.QuadPart = offset ; - dwResult = SetFilePointer (psf->file.handle, lDistanceToMove, &lDistanceToMoveHigh, dwMoveMethod) ; + fResult = SetFilePointerEx (psf->file.handle, liDistanceToMove, &liNewFilePointer, dwMoveMethod) ; - if (dwResult == 0xFFFFFFFF) + if (fResult == FALSE) dwError = GetLastError () ; else dwError = NO_ERROR ; @@ -933,7 +929,7 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) return -1 ; } ; - new_position = (dwResult + ((__int64) lDistanceToMoveHigh << 32)) - psf->fileoffset ; + new_position = liNewFilePointer.QuadPart - psf->fileoffset ; return new_position ; } /* psf_fseek */ @@ -980,7 +976,7 @@ psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf) /* USE_WINDOWS_API */ sf_count_t psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf) { sf_count_t total = 0 ; - ssize_t count ; + ssize_t count ; DWORD dwNumberOfBytesWritten ; if (psf->virtual_io) @@ -1019,8 +1015,9 @@ psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf /* USE_WINDOWS_API */ sf_count_t psf_ftell (SF_PRIVATE *psf) { sf_count_t pos ; - LONG lDistanceToMoveLow, lDistanceToMoveHigh ; - DWORD dwResult, dwError ; + LARGE_INTEGER liDistanceToMove, liNewFilePointer ; + BOOL fResult ; + DWORD dwError ; if (psf->virtual_io) return psf->vio.tell (psf->vio_user_data) ; @@ -1028,12 +1025,11 @@ psf_ftell (SF_PRIVATE *psf) if (psf->is_pipe) return psf->pipeoffset ; - lDistanceToMoveLow = 0 ; - lDistanceToMoveHigh = 0 ; + liDistanceToMove.QuadPart = 0 ; - dwResult = SetFilePointer (psf->file.handle, lDistanceToMoveLow, &lDistanceToMoveHigh, FILE_CURRENT) ; + fResult = SetFilePointerEx (psf->file.handle, liDistanceToMove, &liNewFilePointer, FILE_CURRENT) ; - if (dwResult == 0xFFFFFFFF) + if (fResult == FALSE) dwError = GetLastError () ; else dwError = NO_ERROR ; @@ -1043,7 +1039,7 @@ psf_ftell (SF_PRIVATE *psf) return -1 ; } ; - pos = (dwResult + ((__int64) lDistanceToMoveHigh << 32)) ; + pos = liNewFilePointer.QuadPart ; return pos - psf->fileoffset ; } /* psf_ftell */ @@ -1099,17 +1095,19 @@ psf_is_pipe (SF_PRIVATE *psf) /* USE_WINDOWS_API */ sf_count_t psf_get_filelen_handle (HANDLE handle) { sf_count_t filelen ; - DWORD dwFileSizeLow, dwFileSizeHigh, dwError = NO_ERROR ; + LARGE_INTEGER liFileSize ; + BOOL fResult ; + DWORD dwError = NO_ERROR ; - dwFileSizeLow = GetFileSize (handle, &dwFileSizeHigh) ; + fResult = GetFileSizeEx (handle, &liFileSize) ; - if (dwFileSizeLow == 0xFFFFFFFF) + if (fResult == FALSE) dwError = GetLastError () ; if (dwError != NO_ERROR) return (sf_count_t) -1 ; - filelen = dwFileSizeLow + ((__int64) dwFileSizeHigh << 32) ; + filelen = liFileSize.QuadPart ; return filelen ; } /* psf_get_filelen_handle */ @@ -1123,8 +1121,9 @@ psf_fsync (SF_PRIVATE *psf) /* USE_WINDOWS_API */ int psf_ftruncate (SF_PRIVATE *psf, sf_count_t len) { int retval = 0 ; - LONG lDistanceToMoveLow, lDistanceToMoveHigh ; - DWORD dwResult, dwError = NO_ERROR ; + LARGE_INTEGER liDistanceToMove ; + BOOL fResult ; + DWORD dwError = NO_ERROR ; /* This implementation trashes the current file position. ** should it save and restore it? what if the current position is past @@ -1135,12 +1134,11 @@ psf_ftruncate (SF_PRIVATE *psf, sf_count_t len) if (len < 0) return 1 ; - lDistanceToMoveLow = (DWORD) (len & 0xFFFFFFFF) ; - lDistanceToMoveHigh = (DWORD) ((len >> 32) & 0xFFFFFFFF) ; + liDistanceToMove.QuadPart = (sf_count_t) len ; - dwResult = SetFilePointer (psf->file.handle, lDistanceToMoveLow, &lDistanceToMoveHigh, FILE_BEGIN) ; + fResult = SetFilePointerEx (psf->file.handle, liDistanceToMove, NULL, FILE_BEGIN) ; - if (dwResult == 0xFFFFFFFF) + if (fResult == FALSE) dwError = GetLastError () ; if (dwError != NO_ERROR) @@ -1276,7 +1274,7 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) /* Win32 */ sf_count_t psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf) { sf_count_t total = 0 ; - ssize_t count ; + ssize_t count ; if (psf->virtual_io) return psf->vio.read (ptr, bytes*items, psf->vio_user_data) / bytes ; @@ -1314,7 +1312,7 @@ psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf) /* Win32 */ sf_count_t psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf) { sf_count_t total = 0 ; - ssize_t count ; + ssize_t count ; if (psf->virtual_io) return psf->vio.write (ptr, bytes*items, psf->vio_user_data) / bytes ; diff --git a/lib-src/libsndfile/src/flac.c b/lib-src/libsndfile/src/flac.c index 7949b0a94..c207baec4 100644 --- a/lib-src/libsndfile/src/flac.c +++ b/lib-src/libsndfile/src/flac.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2004-2011 Erik de Castro Lopo +** Copyright (C) 2004-2017 Erik de Castro Lopo ** Copyright (C) 2004 Tobias Gehrig ** ** This program is free software ; you can redistribute it and/or modify @@ -29,7 +29,7 @@ #include "sndfile.h" #include "common.h" -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS #include #include @@ -39,6 +39,8 @@ ** Private static functions. */ +#define FLAC_DEFAULT_COMPRESSION_LEVEL 5 + #define ENC_BUFFER_SIZE 8192 typedef enum @@ -59,14 +61,16 @@ typedef struct FLAC__StreamMetadata *metadata ; - const FLAC__int32 * const * wbuffer ; - FLAC__int32 * rbuffer [FLAC__MAX_CHANNELS] ; + const int32_t * const * wbuffer ; + int32_t * rbuffer [FLAC__MAX_CHANNELS] ; - FLAC__int32* encbuffer ; + int32_t* encbuffer ; unsigned bufferpos ; const FLAC__Frame *frame ; - FLAC__bool bufferbackup ; + + unsigned compression ; + } FLAC_PRIVATE ; typedef struct @@ -75,6 +79,7 @@ typedef struct } FLAC_TAG ; static sf_count_t flac_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; +static int flac_byterate (SF_PRIVATE *psf) ; static int flac_close (SF_PRIVATE *psf) ; static int flac_enc_init (SF_PRIVATE *psf) ; @@ -90,18 +95,18 @@ static sf_count_t flac_write_i2flac (SF_PRIVATE *psf, const int *ptr, sf_count_t static sf_count_t flac_write_f2flac (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; static sf_count_t flac_write_d2flac (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; -static void f2flac8_array (const float *src, FLAC__int32 *dest, int count, int normalize) ; -static void f2flac16_array (const float *src, FLAC__int32 *dest, int count, int normalize) ; -static void f2flac24_array (const float *src, FLAC__int32 *dest, int count, int normalize) ; -static void f2flac8_clip_array (const float *src, FLAC__int32 *dest, int count, int normalize) ; -static void f2flac16_clip_array (const float *src, FLAC__int32 *dest, int count, int normalize) ; -static void f2flac24_clip_array (const float *src, FLAC__int32 *dest, int count, int normalize) ; -static void d2flac8_array (const double *src, FLAC__int32 *dest, int count, int normalize) ; -static void d2flac16_array (const double *src, FLAC__int32 *dest, int count, int normalize) ; -static void d2flac24_array (const double *src, FLAC__int32 *dest, int count, int normalize) ; -static void d2flac8_clip_array (const double *src, FLAC__int32 *dest, int count, int normalize) ; -static void d2flac16_clip_array (const double *src, FLAC__int32 *dest, int count, int normalize) ; -static void d2flac24_clip_array (const double *src, FLAC__int32 *dest, int count, int normalize) ; +static void f2flac8_array (const float *src, int32_t *dest, int count, int normalize) ; +static void f2flac16_array (const float *src, int32_t *dest, int count, int normalize) ; +static void f2flac24_array (const float *src, int32_t *dest, int count, int normalize) ; +static void f2flac8_clip_array (const float *src, int32_t *dest, int count, int normalize) ; +static void f2flac16_clip_array (const float *src, int32_t *dest, int count, int normalize) ; +static void f2flac24_clip_array (const float *src, int32_t *dest, int count, int normalize) ; +static void d2flac8_array (const double *src, int32_t *dest, int count, int normalize) ; +static void d2flac16_array (const double *src, int32_t *dest, int count, int normalize) ; +static void d2flac24_array (const double *src, int32_t *dest, int count, int normalize) ; +static void d2flac8_clip_array (const double *src, int32_t *dest, int count, int normalize) ; +static void d2flac16_clip_array (const double *src, int32_t *dest, int count, int normalize) ; +static void d2flac24_clip_array (const double *src, int32_t *dest, int count, int normalize) ; static int flac_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; @@ -111,7 +116,7 @@ static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const FLAC__StreamDe static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ; static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ; static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder, void *client_data) ; -static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) ; +static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const int32_t * const buffer [], void *client_data) ; static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ; static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ; @@ -121,38 +126,38 @@ static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__Stre static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ; static void -s2flac8_array (const short *src, FLAC__int32 *dest, int count) +s2flac8_array (const short *src, int32_t *dest, int count) { while (--count >= 0) dest [count] = src [count] >> 8 ; } /* s2flac8_array */ static void -s2flac16_array (const short *src, FLAC__int32 *dest, int count) +s2flac16_array (const short *src, int32_t *dest, int count) { while (--count >= 0) dest [count] = src [count] ; } /* s2flac16_array */ static void -s2flac24_array (const short *src, FLAC__int32 *dest, int count) +s2flac24_array (const short *src, int32_t *dest, int count) { while (--count >= 0) dest [count] = src [count] << 8 ; } /* s2flac24_array */ static void -i2flac8_array (const int *src, FLAC__int32 *dest, int count) +i2flac8_array (const int *src, int32_t *dest, int count) { while (--count >= 0) dest [count] = src [count] >> 24 ; } /* i2flac8_array */ static void -i2flac16_array (const int *src, FLAC__int32 *dest, int count) +i2flac16_array (const int *src, int32_t *dest, int count) { - while (--count >= 0) - dest [count] = src [count] >> 16 ; + while (--count >= 0) + dest [count] = src [count] >> 16 ; } /* i2flac16_array */ static void -i2flac24_array (const int *src, FLAC__int32 *dest, int count) +i2flac24_array (const int *src, int32_t *dest, int count) { while (--count >= 0) dest [count] = src [count] >> 8 ; } /* i2flac24_array */ @@ -161,8 +166,16 @@ static sf_count_t flac_buffer_copy (SF_PRIVATE *psf) { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; const FLAC__Frame *frame = pflac->frame ; - const FLAC__int32* const *buffer = pflac->wbuffer ; - unsigned i = 0, j, offset ; + const int32_t* const *buffer = pflac->wbuffer ; + unsigned i = 0, j, offset, channels, len ; + + if (psf->sf.channels != (int) frame->header.channels) + { psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n" + "Nothing to do but to error out.\n" , + psf->sf.channels, frame->header.channels) ; + psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; + return 0 ; + } ; /* ** frame->header.blocksize is variable and we're using a constant blocksize @@ -175,54 +188,71 @@ flac_buffer_copy (SF_PRIVATE *psf) return 0 ; } ; + if (frame->header.channels > FLAC__MAX_CHANNELS) + psf_log_printf (psf, "Ooops : frame->header.channels (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.channels, FLAC__MAX_CHANNELS) ; + + channels = SF_MIN (frame->header.channels, FLAC__MAX_CHANNELS) ; + if (pflac->ptr == NULL) { /* - ** Not sure why this code is here and not elsewhere. - ** Removing it causes valgrind errors. + ** This pointer is reset to NULL each time the current frame has been + ** decoded. Somehow its used during encoding and decoding. */ - pflac->bufferbackup = SF_TRUE ; - for (i = 0 ; i < frame->header.channels ; i++) + for (i = 0 ; i < channels ; i++) { if (pflac->rbuffer [i] == NULL) - pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ; + pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (int32_t)) ; - memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ; + memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (int32_t)) ; } ; - pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ; + pflac->wbuffer = (const int32_t* const*) pflac->rbuffer ; return 0 ; } ; + len = SF_MIN (pflac->len, frame->header.blocksize) ; + + if (pflac->remain % channels != 0) + { psf_log_printf (psf, "Error: pflac->remain %u channels %u\n", pflac->remain, channels) ; + return 0 ; + } ; + switch (pflac->pcmtype) { case PFLAC_PCM_SHORT : { short *retpcm = (short*) pflac->ptr ; int shift = 16 - frame->header.bits_per_sample ; if (shift < 0) { shift = abs (shift) ; - for (i = 0 ; i < frame->header.blocksize && pflac->remain > 0 ; i++) - { offset = pflac->pos + i * frame->header.channels ; + for (i = 0 ; i < len && pflac->remain > 0 ; i++) + { offset = pflac->pos + i * channels ; if (pflac->bufferpos >= frame->header.blocksize) break ; - for (j = 0 ; j < frame->header.channels ; j++) + if (offset + channels > pflac->len) + break ; + + for (j = 0 ; j < channels ; j++) retpcm [offset + j] = buffer [j][pflac->bufferpos] >> shift ; - pflac->remain -= frame->header.channels ; - pflac->bufferpos++ ; + pflac->remain -= channels ; + pflac->bufferpos ++ ; } } else - { for (i = 0 ; i < frame->header.blocksize && pflac->remain > 0 ; i++) - { offset = pflac->pos + i * frame->header.channels ; + { for (i = 0 ; i < len && pflac->remain > 0 ; i++) + { offset = pflac->pos + i * channels ; if (pflac->bufferpos >= frame->header.blocksize) break ; - for (j = 0 ; j < frame->header.channels ; j++) - retpcm [offset + j] = (buffer [j][pflac->bufferpos]) << shift ; + if (offset + channels > pflac->len) + break ; - pflac->remain -= frame->header.channels ; - pflac->bufferpos++ ; + for (j = 0 ; j < channels ; j++) + retpcm [offset + j] = ((uint16_t) buffer [j][pflac->bufferpos]) << shift ; + + pflac->remain -= channels ; + pflac->bufferpos ++ ; } ; } ; } ; @@ -231,15 +261,18 @@ flac_buffer_copy (SF_PRIVATE *psf) case PFLAC_PCM_INT : { int *retpcm = (int*) pflac->ptr ; int shift = 32 - frame->header.bits_per_sample ; - for (i = 0 ; i < frame->header.blocksize && pflac->remain > 0 ; i++) - { offset = pflac->pos + i * frame->header.channels ; + for (i = 0 ; i < len && pflac->remain > 0 ; i++) + { offset = pflac->pos + i * channels ; if (pflac->bufferpos >= frame->header.blocksize) break ; - for (j = 0 ; j < frame->header.channels ; j++) - retpcm [offset + j] = buffer [j][pflac->bufferpos] << shift ; - pflac->remain -= frame->header.channels ; + if (offset + channels > pflac->len) + break ; + + for (j = 0 ; j < channels ; j++) + retpcm [offset + j] = ((uint32_t) buffer [j][pflac->bufferpos]) << shift ; + pflac->remain -= channels ; pflac->bufferpos++ ; } ; } ; @@ -249,15 +282,18 @@ flac_buffer_copy (SF_PRIVATE *psf) { float *retpcm = (float*) pflac->ptr ; float norm = (psf->norm_float == SF_TRUE) ? 1.0 / (1 << (frame->header.bits_per_sample - 1)) : 1.0 ; - for (i = 0 ; i < frame->header.blocksize && pflac->remain > 0 ; i++) - { offset = pflac->pos + i * frame->header.channels ; + for (i = 0 ; i < len && pflac->remain > 0 ; i++) + { offset = pflac->pos + i * channels ; if (pflac->bufferpos >= frame->header.blocksize) break ; - for (j = 0 ; j < frame->header.channels ; j++) + if (offset + channels > pflac->len) + break ; + + for (j = 0 ; j < channels ; j++) retpcm [offset + j] = buffer [j][pflac->bufferpos] * norm ; - pflac->remain -= frame->header.channels ; + pflac->remain -= channels ; pflac->bufferpos++ ; } ; } ; @@ -267,15 +303,18 @@ flac_buffer_copy (SF_PRIVATE *psf) { double *retpcm = (double*) pflac->ptr ; double norm = (psf->norm_double == SF_TRUE) ? 1.0 / (1 << (frame->header.bits_per_sample - 1)) : 1.0 ; - for (i = 0 ; i < frame->header.blocksize && pflac->remain > 0 ; i++) - { offset = pflac->pos + i * frame->header.channels ; + for (i = 0 ; i < len && pflac->remain > 0 ; i++) + { offset = pflac->pos + i * channels ; if (pflac->bufferpos >= frame->header.blocksize) break ; - for (j = 0 ; j < frame->header.channels ; j++) + if (offset + channels > pflac->len) + break ; + + for (j = 0 ; j < channels ; j++) retpcm [offset + j] = buffer [j][pflac->bufferpos] * norm ; - pflac->remain -= frame->header.channels ; + pflac->remain -= channels ; pflac->bufferpos++ ; } ; } ; @@ -285,8 +324,8 @@ flac_buffer_copy (SF_PRIVATE *psf) return 0 ; } ; - offset = i * frame->header.channels ; - pflac->pos += i * frame->header.channels ; + offset = i * channels ; + pflac->pos += i * channels ; return offset ; } /* flac_buffer_copy */ @@ -300,7 +339,7 @@ sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte if (*bytes > 0 && psf->error == 0) return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ; - return FLAC__STREAM_DECODER_READ_STATUS_ABORT ; + return FLAC__STREAM_DECODER_READ_STATUS_ABORT ; } /* sf_flac_read_callback */ static FLAC__StreamDecoderSeekStatus @@ -342,18 +381,17 @@ sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_ if (psf_ftell (psf) == psf->filelength) return SF_TRUE ; - return SF_FALSE ; + return SF_FALSE ; } /* sf_flac_eof_callback */ static FLAC__StreamDecoderWriteStatus -sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data) +sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC__Frame *frame, const int32_t * const buffer [], void *client_data) { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ; FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; pflac->frame = frame ; pflac->bufferpos = 0 ; - pflac->bufferbackup = SF_FALSE ; pflac->wbuffer = buffer ; flac_buffer_copy (psf) ; @@ -363,7 +401,7 @@ sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC static void sf_flac_meta_get_vorbiscomments (SF_PRIVATE *psf, const FLAC__StreamMetadata *metadata) -{ FLAC_TAG tags [] = +{ static FLAC_TAG tags [] = { { "title", SF_STR_TITLE }, { "copyright", SF_STR_COPYRIGHT }, { "software", SF_STR_SOFTWARE }, @@ -389,7 +427,7 @@ sf_flac_meta_get_vorbiscomments (SF_PRIVATE *psf, const FLAC__StreamMetadata *me if ((cptr = strchr (value, '=')) != NULL) value = cptr + 1 ; - psf_log_printf (psf, " %-10s : %s\n", tags [k].tag, value) ; + psf_log_printf (psf, " %-12s : %s\n", tags [k].tag, value) ; psf_store_string (psf, tags [k].type, value) ; } ; @@ -403,6 +441,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ switch (metadata->type) { case FLAC__METADATA_TYPE_STREAMINFO : + if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) + { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" + "Nothing to do but to error out.\n" , + psf->sf.channels, metadata->data.stream_info.channels) ; + psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; + return ; + } ; + + if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate) + { psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n" + "Carrying on as if nothing happened.", + psf->sf.samplerate, metadata->data.stream_info.sample_rate) ; + } ; psf->sf.channels = metadata->data.stream_info.channels ; psf->sf.samplerate = metadata->data.stream_info.sample_rate ; psf->sf.frames = metadata->data.stream_info.total_samples ; @@ -504,7 +555,7 @@ sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__u if (psf->error) return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ; - return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ; + return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ; } /* sf_flac_enc_seek_callback */ static FLAC__StreamEncoderTellStatus @@ -534,7 +585,7 @@ flac_write_strings (SF_PRIVATE *psf, FLAC_PRIVATE* pflac) int k, string_count = 0 ; for (k = 0 ; k < SF_MAX_STRINGS ; k++) - { if (psf->strings [k].type != 0) + { if (psf->strings.data [k].type != 0) string_count ++ ; } ; @@ -546,10 +597,10 @@ flac_write_strings (SF_PRIVATE *psf, FLAC_PRIVATE* pflac) return ; } ; - for (k = 0 ; k < SF_MAX_STRINGS && psf->strings [k].type != 0 ; k++) + for (k = 0 ; k < SF_MAX_STRINGS && psf->strings.data [k].type != 0 ; k++) { const char * key, * value ; - switch (psf->strings [k].type) + switch (psf->strings.data [k].type) { case SF_STR_SOFTWARE : key = "software" ; break ; @@ -584,7 +635,7 @@ flac_write_strings (SF_PRIVATE *psf, FLAC_PRIVATE* pflac) continue ; } ; - value = psf->strings [k].str ; + value = psf->strings.storage + psf->strings.data [k].offset ; FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair (&entry, key, value) ; FLAC__metadata_object_vorbiscomment_append_comment (pflac->metadata, entry, /* copy */ SF_FALSE) ; @@ -612,7 +663,10 @@ flac_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) if (psf->error == 0) psf->dataoffset = psf_ftell (psf) ; - pflac->encbuffer = calloc (ENC_BUFFER_SIZE, sizeof (FLAC__int32)) ; + pflac->encbuffer = calloc (ENC_BUFFER_SIZE, sizeof (int32_t)) ; + + /* can only call init_stream once */ + psf->write_header = NULL ; return psf->error ; } /* flac_write_header */ @@ -629,6 +683,9 @@ flac_open (SF_PRIVATE *psf) FLAC_PRIVATE* pflac = calloc (1, sizeof (FLAC_PRIVATE)) ; psf->codec_data = pflac ; + /* Set the default value here. Over-ridden later if necessary. */ + pflac->compression = FLAC_DEFAULT_COMPRESSION_LEVEL ; + if (psf->file.mode == SFM_RDWR) return SFE_BAD_MODE_RW ; @@ -646,24 +703,26 @@ flac_open (SF_PRIVATE *psf) psf->endian = SF_ENDIAN_BIG ; psf->sf.seekable = 0 ; - psf->str_flags = SF_STR_ALLOW_START ; + psf->strings.flags = SF_STR_ALLOW_START ; if ((error = flac_enc_init (psf))) return error ; + /* In an ideal world we would write the header at this point. Unfortunately + ** that would prevent string metadata being added so we have to hold off. + */ + psf->write_header = flac_write_header ; } ; psf->datalength = psf->filelength ; psf->dataoffset = 0 ; - psf->blockwidth = 0 ; - psf->bytewidth = 1 ; psf->container_close = flac_close ; psf->seek = flac_seek ; - psf->command = flac_command ; + psf->byterate = flac_byterate ; - psf->blockwidth = psf->bytewidth * psf->sf.channels ; + psf->command = flac_command ; switch (subformat) { case SF_FORMAT_PCM_S8 : /* 8-bit FLAC. */ @@ -695,9 +754,7 @@ flac_close (SF_PRIVATE *psf) if (psf->file.mode == SFM_WRITE) { FLAC__stream_encoder_finish (pflac->fse) ; FLAC__stream_encoder_delete (pflac->fse) ; - - if (pflac->encbuffer) - free (pflac->encbuffer) ; + free (pflac->encbuffer) ; } ; if (psf->file.mode == SFM_READ) @@ -724,7 +781,7 @@ flac_enc_init (SF_PRIVATE *psf) ** "FLAC supports linear sample rates from 1Hz - 655350Hz in 1Hz ** increments." */ - if ( psf->sf.samplerate < 1 || psf->sf.samplerate > 655350 ) + if (psf->sf.samplerate < 1 || psf->sf.samplerate > 655350) { psf_log_printf (psf, "flac sample rate out of range.\n", psf->sf.samplerate) ; return SFE_FLAC_BAD_SAMPLE_RATE ; } ; @@ -747,6 +804,8 @@ flac_enc_init (SF_PRIVATE *psf) break ; } ; + if (pflac->fse) + FLAC__stream_encoder_delete (pflac->fse) ; if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL) return SFE_FLAC_NEW_DECODER ; @@ -765,6 +824,11 @@ flac_enc_init (SF_PRIVATE *psf) return SFE_FLAC_INIT_DECODER ; } ; + if (! FLAC__stream_encoder_set_compression_level (pflac->fse, pflac->compression)) + { psf_log_printf (psf, "FLAC__stream_encoder_set_compression_level (%d) return false.\n", pflac->compression) ; + return SFE_FLAC_INIT_DECODER ; + } ; + return 0 ; } /* flac_enc_init */ @@ -773,6 +837,8 @@ flac_read_header (SF_PRIVATE *psf) { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; psf_fseek (psf, 0, SEEK_SET) ; + if (pflac->fsd) + FLAC__stream_decoder_delete (pflac->fsd) ; if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL) return SFE_FLAC_NEW_DECODER ; @@ -785,7 +851,9 @@ flac_read_header (SF_PRIVATE *psf) psf_log_printf (psf, "End\n") ; - if (psf->error == 0) + if (psf->error != 0) + FLAC__stream_decoder_delete (pflac->fsd) ; + else { FLAC__uint64 position ; FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ; @@ -796,9 +864,37 @@ flac_read_header (SF_PRIVATE *psf) } /* flac_read_header */ static int -flac_command (SF_PRIVATE * UNUSED (psf), int UNUSED (command), void * UNUSED (data), int UNUSED (datasize)) -{ - return 0 ; +flac_command (SF_PRIVATE * psf, int command, void * data, int datasize) +{ FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; + double quality ; + + switch (command) + { case SFC_SET_COMPRESSION_LEVEL : + if (data == NULL || datasize != sizeof (double)) + return SF_FALSE ; + + if (psf->have_written) + return SF_FALSE ; + + /* FLAC compression level is in the range [0, 8] while libsndfile takes + ** values in the range [0.0, 1.0]. Massage the libsndfile value here. + */ + quality = (*((double *) data)) * 8.0 ; + /* Clip range. */ + pflac->compression = lrint (SF_MAX (0.0, SF_MIN (8.0, quality))) ; + + psf_log_printf (psf, "%s : Setting SFC_SET_COMPRESSION_LEVEL to %u.\n", __func__, pflac->compression) ; + + if (flac_enc_init (psf)) + return SF_FALSE ; + + return SF_TRUE ; + + default : + return SF_FALSE ; + } ; + + return SF_FALSE ; } /* flac_command */ int @@ -821,9 +917,6 @@ flac_init (SF_PRIVATE *psf) psf->write_double = flac_write_d2flac ; } ; - psf->bytewidth = 1 ; - psf->blockwidth = psf->sf.channels ; - if (psf->filelength > psf->dataoffset) psf->datalength = (psf->dataend) ? psf->dataend - psf->dataoffset : psf->filelength - psf->dataoffset ; else @@ -835,18 +928,34 @@ flac_init (SF_PRIVATE *psf) static unsigned flac_read_loop (SF_PRIVATE *psf, unsigned len) { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; + FLAC__StreamDecoderState state ; pflac->pos = 0 ; pflac->len = len ; pflac->remain = len ; + + state = FLAC__stream_decoder_get_state (pflac->fsd) ; + if (state > FLAC__STREAM_DECODER_END_OF_STREAM) + { psf_log_printf (psf, "FLAC__stream_decoder_get_state returned %s\n", FLAC__StreamDecoderStateString [state]) ; + /* Current frame is busted, so NULL the pointer. */ + pflac->frame = NULL ; + } ; + + /* First copy data that has already been decoded and buffered. */ if (pflac->frame != NULL && pflac->bufferpos < pflac->frame->header.blocksize) flac_buffer_copy (psf) ; + /* Decode some more. */ while (pflac->pos < pflac->len) { if (FLAC__stream_decoder_process_single (pflac->fsd) == 0) break ; - if (FLAC__stream_decoder_get_state (pflac->fsd) >= FLAC__STREAM_DECODER_END_OF_STREAM) + state = FLAC__stream_decoder_get_state (pflac->fsd) ; + if (state >= FLAC__STREAM_DECODER_END_OF_STREAM) + { psf_log_printf (psf, "FLAC__stream_decoder_get_state returned %s\n", FLAC__StreamDecoderStateString [state]) ; + /* Current frame is busted, so NULL the pointer. */ + pflac->frame = NULL ; break ; + } ; } ; pflac->ptr = NULL ; @@ -925,6 +1034,7 @@ flac_read_flac2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) while (total < len) { pflac->ptr = ptr + total ; readlen = (len - total > 0x1000000) ? 0x1000000 : (unsigned) (len - total) ; + current = flac_read_loop (psf, readlen) ; if (current == 0) break ; @@ -937,10 +1047,10 @@ flac_read_flac2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t flac_write_s2flac (SF_PRIVATE *psf, const short *ptr, sf_count_t len) { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; - void (*convert) (const short *, FLAC__int32 *, int) ; + void (*convert) (const short *, int32_t *, int) ; int bufferlen, writecount, thiswrite ; sf_count_t total = 0 ; - FLAC__int32* buffer = pflac->encbuffer ; + int32_t* buffer = pflac->encbuffer ; switch (SF_CODEC (psf->sf.format)) { case SF_FORMAT_PCM_S8 : @@ -949,20 +1059,20 @@ flac_write_s2flac (SF_PRIVATE *psf, const short *ptr, sf_count_t len) case SF_FORMAT_PCM_16 : convert = s2flac16_array ; break ; - case SF_FORMAT_PCM_24 : + case SF_FORMAT_PCM_24 : convert = s2flac24_array ; break ; default : return -1 ; } ; - bufferlen = ENC_BUFFER_SIZE / (sizeof (FLAC__int32) * psf->sf.channels) ; + bufferlen = ENC_BUFFER_SIZE / (sizeof (int32_t) * psf->sf.channels) ; bufferlen *= psf->sf.channels ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; convert (ptr + total, buffer, writecount) ; - if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) + if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount / psf->sf.channels)) thiswrite = writecount ; else break ; @@ -979,10 +1089,10 @@ flac_write_s2flac (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t flac_write_i2flac (SF_PRIVATE *psf, const int *ptr, sf_count_t len) { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; - void (*convert) (const int *, FLAC__int32 *, int) ; + void (*convert) (const int *, int32_t *, int) ; int bufferlen, writecount, thiswrite ; sf_count_t total = 0 ; - FLAC__int32* buffer = pflac->encbuffer ; + int32_t* buffer = pflac->encbuffer ; switch (SF_CODEC (psf->sf.format)) { case SF_FORMAT_PCM_S8 : @@ -998,13 +1108,13 @@ flac_write_i2flac (SF_PRIVATE *psf, const int *ptr, sf_count_t len) return -1 ; } ; - bufferlen = ENC_BUFFER_SIZE / (sizeof (FLAC__int32) * psf->sf.channels) ; + bufferlen = ENC_BUFFER_SIZE / (sizeof (int32_t) * psf->sf.channels) ; bufferlen *= psf->sf.channels ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; convert (ptr + total, buffer, writecount) ; - if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) + if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount / psf->sf.channels)) thiswrite = writecount ; else break ; @@ -1021,10 +1131,10 @@ flac_write_i2flac (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t flac_write_f2flac (SF_PRIVATE *psf, const float *ptr, sf_count_t len) { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; - void (*convert) (const float *, FLAC__int32 *, int, int) ; + void (*convert) (const float *, int32_t *, int, int) ; int bufferlen, writecount, thiswrite ; sf_count_t total = 0 ; - FLAC__int32* buffer = pflac->encbuffer ; + int32_t* buffer = pflac->encbuffer ; switch (SF_CODEC (psf->sf.format)) { case SF_FORMAT_PCM_S8 : @@ -1040,13 +1150,13 @@ flac_write_f2flac (SF_PRIVATE *psf, const float *ptr, sf_count_t len) return -1 ; } ; - bufferlen = ENC_BUFFER_SIZE / (sizeof (FLAC__int32) * psf->sf.channels) ; + bufferlen = ENC_BUFFER_SIZE / (sizeof (int32_t) * psf->sf.channels) ; bufferlen *= psf->sf.channels ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; convert (ptr + total, buffer, writecount, psf->norm_float) ; - if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) + if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount / psf->sf.channels)) thiswrite = writecount ; else break ; @@ -1061,7 +1171,7 @@ flac_write_f2flac (SF_PRIVATE *psf, const float *ptr, sf_count_t len) } /* flac_write_f2flac */ static void -f2flac8_clip_array (const float *src, FLAC__int32 *dest, int count, int normalize) +f2flac8_clip_array (const float *src, int32_t *dest, int count, int normalize) { float normfact, scaled_value ; normfact = normalize ? (8.0 * 0x10) : 1.0 ; @@ -1073,7 +1183,7 @@ f2flac8_clip_array (const float *src, FLAC__int32 *dest, int count, int normaliz continue ; } ; if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x10)) - { dest [count] = 0x80 ; + { dest [count] = -0x80 ; continue ; } ; dest [count] = lrintf (scaled_value) ; @@ -1083,28 +1193,27 @@ f2flac8_clip_array (const float *src, FLAC__int32 *dest, int count, int normaliz } /* f2flac8_clip_array */ static void -f2flac16_clip_array (const float *src, FLAC__int32 *dest, int count, int normalize) -{ - float normfact, scaled_value ; +f2flac16_clip_array (const float *src, int32_t *dest, int count, int normalize) +{ float normfact, scaled_value ; - normfact = normalize ? (8.0 * 0x1000) : 1.0 ; + normfact = normalize ? (8.0 * 0x1000) : 1.0 ; - while (--count >= 0) { - scaled_value = src [count] * normfact ; - if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFF)) { - dest [count] = 0x7FFF ; - continue ; - } - if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000)) { - dest [count] = 0x8000 ; - continue ; - } - dest [count] = lrintf (scaled_value) ; - } + while (--count >= 0) + { scaled_value = src [count] * normfact ; + if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFF)) + { dest [count] = 0x7FFF ; + continue ; + } ; + if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000)) + { dest [count] = -0x8000 ; + continue ; + } ; + dest [count] = lrintf (scaled_value) ; + } ; } /* f2flac16_clip_array */ static void -f2flac24_clip_array (const float *src, FLAC__int32 *dest, int count, int normalize) +f2flac24_clip_array (const float *src, int32_t *dest, int count, int normalize) { float normfact, scaled_value ; normfact = normalize ? (8.0 * 0x100000) : 1.0 ; @@ -1117,7 +1226,7 @@ f2flac24_clip_array (const float *src, FLAC__int32 *dest, int count, int normali } ; if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x100000)) - { dest [count] = 0x800000 ; + { dest [count] = -0x800000 ; continue ; } dest [count] = lrintf (scaled_value) ; @@ -1127,7 +1236,7 @@ f2flac24_clip_array (const float *src, FLAC__int32 *dest, int count, int normali } /* f2flac24_clip_array */ static void -f2flac8_array (const float *src, FLAC__int32 *dest, int count, int normalize) +f2flac8_array (const float *src, int32_t *dest, int count, int normalize) { float normfact = normalize ? (1.0 * 0x7F) : 1.0 ; while (--count >= 0) @@ -1135,7 +1244,7 @@ f2flac8_array (const float *src, FLAC__int32 *dest, int count, int normalize) } /* f2flac8_array */ static void -f2flac16_array (const float *src, FLAC__int32 *dest, int count, int normalize) +f2flac16_array (const float *src, int32_t *dest, int count, int normalize) { float normfact = normalize ? (1.0 * 0x7FFF) : 1.0 ; while (--count >= 0) @@ -1143,7 +1252,7 @@ f2flac16_array (const float *src, FLAC__int32 *dest, int count, int normalize) } /* f2flac16_array */ static void -f2flac24_array (const float *src, FLAC__int32 *dest, int count, int normalize) +f2flac24_array (const float *src, int32_t *dest, int count, int normalize) { float normfact = normalize ? (1.0 * 0x7FFFFF) : 1.0 ; while (--count >= 0) @@ -1153,10 +1262,10 @@ f2flac24_array (const float *src, FLAC__int32 *dest, int count, int normalize) static sf_count_t flac_write_d2flac (SF_PRIVATE *psf, const double *ptr, sf_count_t len) { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ; - void (*convert) (const double *, FLAC__int32 *, int, int) ; + void (*convert) (const double *, int32_t *, int, int) ; int bufferlen, writecount, thiswrite ; sf_count_t total = 0 ; - FLAC__int32* buffer = pflac->encbuffer ; + int32_t* buffer = pflac->encbuffer ; switch (SF_CODEC (psf->sf.format)) { case SF_FORMAT_PCM_S8 : @@ -1172,13 +1281,13 @@ flac_write_d2flac (SF_PRIVATE *psf, const double *ptr, sf_count_t len) return -1 ; } ; - bufferlen = ENC_BUFFER_SIZE / (sizeof (FLAC__int32) * psf->sf.channels) ; + bufferlen = ENC_BUFFER_SIZE / (sizeof (int32_t) * psf->sf.channels) ; bufferlen *= psf->sf.channels ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; convert (ptr + total, buffer, writecount, psf->norm_double) ; - if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels)) + if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount / psf->sf.channels)) thiswrite = writecount ; else break ; @@ -1193,7 +1302,7 @@ flac_write_d2flac (SF_PRIVATE *psf, const double *ptr, sf_count_t len) } /* flac_write_d2flac */ static void -d2flac8_clip_array (const double *src, FLAC__int32 *dest, int count, int normalize) +d2flac8_clip_array (const double *src, int32_t *dest, int count, int normalize) { double normfact, scaled_value ; normfact = normalize ? (8.0 * 0x10) : 1.0 ; @@ -1205,7 +1314,7 @@ d2flac8_clip_array (const double *src, FLAC__int32 *dest, int count, int normali continue ; } ; if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x10)) - { dest [count] = 0x80 ; + { dest [count] = -0x80 ; continue ; } ; dest [count] = lrint (scaled_value) ; @@ -1215,7 +1324,7 @@ d2flac8_clip_array (const double *src, FLAC__int32 *dest, int count, int normali } /* d2flac8_clip_array */ static void -d2flac16_clip_array (const double *src, FLAC__int32 *dest, int count, int normalize) +d2flac16_clip_array (const double *src, int32_t *dest, int count, int normalize) { double normfact, scaled_value ; normfact = normalize ? (8.0 * 0x1000) : 1.0 ; @@ -1227,7 +1336,7 @@ d2flac16_clip_array (const double *src, FLAC__int32 *dest, int count, int normal continue ; } ; if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000)) - { dest [count] = 0x8000 ; + { dest [count] = -0x8000 ; continue ; } ; dest [count] = lrint (scaled_value) ; @@ -1237,7 +1346,7 @@ d2flac16_clip_array (const double *src, FLAC__int32 *dest, int count, int normal } /* d2flac16_clip_array */ static void -d2flac24_clip_array (const double *src, FLAC__int32 *dest, int count, int normalize) +d2flac24_clip_array (const double *src, int32_t *dest, int count, int normalize) { double normfact, scaled_value ; normfact = normalize ? (8.0 * 0x100000) : 1.0 ; @@ -1249,7 +1358,7 @@ d2flac24_clip_array (const double *src, FLAC__int32 *dest, int count, int normal continue ; } ; if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x100000)) - { dest [count] = 0x800000 ; + { dest [count] = -0x800000 ; continue ; } ; dest [count] = lrint (scaled_value) ; @@ -1259,7 +1368,7 @@ d2flac24_clip_array (const double *src, FLAC__int32 *dest, int count, int normal } /* d2flac24_clip_array */ static void -d2flac8_array (const double *src, FLAC__int32 *dest, int count, int normalize) +d2flac8_array (const double *src, int32_t *dest, int count, int normalize) { double normfact = normalize ? (1.0 * 0x7F) : 1.0 ; while (--count >= 0) @@ -1267,7 +1376,7 @@ d2flac8_array (const double *src, FLAC__int32 *dest, int count, int normalize) } /* d2flac8_array */ static void -d2flac16_array (const double *src, FLAC__int32 *dest, int count, int normalize) +d2flac16_array (const double *src, int32_t *dest, int count, int normalize) { double normfact = normalize ? (1.0 * 0x7FFF) : 1.0 ; while (--count >= 0) @@ -1275,7 +1384,7 @@ d2flac16_array (const double *src, FLAC__int32 *dest, int count, int normalize) } /* d2flac16_array */ static void -d2flac24_array (const double *src, FLAC__int32 *dest, int count, int normalize) +d2flac24_array (const double *src, int32_t *dest, int count, int normalize) { double normfact = normalize ? (1.0 * 0x7FFFFF) : 1.0 ; while (--count >= 0) @@ -1297,12 +1406,19 @@ flac_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset) pflac->frame = NULL ; if (psf->file.mode == SFM_READ) - { FLAC__uint64 position ; - if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset)) - { FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ; + { if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset)) + return offset ; + + if (offset == psf->sf.frames) + { /* + ** If we've been asked to seek to the very end of the file, libFLAC + ** will return an error. However, we know the length of the file so + ** instead of returning an error, we can return the offset. + */ return offset ; } ; + psf->error = SFE_BAD_SEEK ; return ((sf_count_t) -1) ; } ; @@ -1312,7 +1428,17 @@ flac_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset) return ((sf_count_t) -1) ; } /* flac_seek */ -#else /* HAVE_EXTERNAL_LIBS */ +static int +flac_byterate (SF_PRIVATE *psf) +{ + if (psf->file.mode == SFM_READ) + return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ; + + return -1 ; +} /* flac_byterate */ + + +#else /* HAVE_EXTERNAL_XIPH_LIBS */ int flac_open (SF_PRIVATE *psf) diff --git a/lib-src/libsndfile/src/float32.c b/lib-src/libsndfile/src/float32.c index 4a87cefc3..fd74b6d6c 100644 --- a/lib-src/libsndfile/src/float32.c +++ b/lib-src/libsndfile/src/float32.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -88,6 +88,11 @@ int float32_init (SF_PRIVATE *psf) { static int float_caps ; + if (psf->sf.channels < 1) + { psf_log_printf (psf, "float32_init : internal error : channels = %d\n", psf->sf.channels) ; + return SFE_INTERNAL ; + } ; + float_caps = float32_get_capability (psf) ; psf->blockwidth = sizeof (float) * psf->sf.channels ; @@ -247,7 +252,7 @@ float32_init (SF_PRIVATE *psf) } /* float32_init */ float -float32_be_read (unsigned char *cptr) +float32_be_read (const unsigned char *cptr) { int exponent, mantissa, negative ; float fvalue ; @@ -275,7 +280,7 @@ float32_be_read (unsigned char *cptr) } /* float32_be_read */ float -float32_le_read (unsigned char *cptr) +float32_le_read (const unsigned char *cptr) { int exponent, mantissa, negative ; float fvalue ; @@ -505,25 +510,26 @@ d2f_array (const double *src, float *dest, int count) static sf_count_t host_read_f2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ void (*convert) (const float *, int, short *, float) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, int, short *, float) ; int bufferlen, readcount ; sf_count_t total = 0 ; float scale ; convert = (psf->add_clipping) ? f2s_clip_array : f2s_array ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ; /* Fix me : Need lef2s_array */ if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, readcount) ; - convert (psf->u.fbuf, readcount, ptr + total, scale) ; + convert (ubuf.fbuf, readcount, ptr + total, scale) ; total += readcount ; if (readcount < bufferlen) break ; @@ -535,24 +541,25 @@ host_read_f2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t host_read_f2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ void (*convert) (const float *, int, int *, float) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, int, int *, float) ; int bufferlen, readcount ; sf_count_t total = 0 ; float scale ; convert = (psf->add_clipping) ? f2i_clip_array : f2i_array ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFFFFFF / psf->float_max ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - convert (psf->u.fbuf, readcount, ptr + total, scale) ; + convert (ubuf.fbuf, readcount, ptr + total, scale) ; total += readcount ; if (readcount < bufferlen) break ; @@ -564,20 +571,21 @@ host_read_f2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t host_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; if (psf->data_endswap != SF_TRUE) return psf_fread (ptr, sizeof (float), len, psf) ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ; - endswap_int_copy ((int*) (ptr + total), psf->u.ibuf, readcount) ; + endswap_int_copy ((int*) (ptr + total), ubuf.ibuf, readcount) ; total += readcount ; if (readcount < bufferlen) @@ -590,21 +598,22 @@ host_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t host_read_f2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; /* Fix me : Need lef2d_array */ - f2d_array (psf->u.fbuf, readcount, ptr + total) ; + f2d_array (ubuf.fbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -616,26 +625,27 @@ host_read_f2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t host_write_s2f (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; float scale ; /* Erik */ scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / 0x8000 ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2f_array (ptr + total, psf->u.fbuf, bufferlen, scale) ; + s2f_array (ptr + total, ubuf.fbuf, bufferlen, scale) ; if (psf->peak_info) - float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ; + float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -647,25 +657,26 @@ host_write_s2f (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t host_write_i2f (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; float scale ; scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / (8.0 * 0x10000000) ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2f_array (ptr + total, psf->u.fbuf, bufferlen, scale) ; + i2f_array (ptr + total, ubuf.fbuf, bufferlen, scale) ; if (psf->peak_info) - float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ; + float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.fbuf, sizeof (float) , bufferlen, psf) ; + writecount = psf_fwrite (ubuf.fbuf, sizeof (float) , bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -677,7 +688,8 @@ host_write_i2f (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t host_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; if (psf->peak_info) @@ -686,15 +698,15 @@ host_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) if (psf->data_endswap != SF_TRUE) return psf_fwrite (ptr, sizeof (float), len, psf) ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - endswap_int_copy (psf->u.ibuf, (const int*) (ptr + total), bufferlen) ; + endswap_int_copy (ubuf.ibuf, (const int*) (ptr + total), bufferlen) ; - writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -706,24 +718,25 @@ host_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t host_write_d2f (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - d2f_array (ptr + total, psf->u.fbuf, bufferlen) ; + d2f_array (ptr + total, ubuf.fbuf, bufferlen) ; if (psf->peak_info) - float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ; + float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -738,24 +751,25 @@ host_write_d2f (SF_PRIVATE *psf, const double *ptr, sf_count_t len) static sf_count_t replace_read_f2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float scale ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - bf2f_array (psf->u.fbuf, bufferlen) ; + bf2f_array (ubuf.fbuf, bufferlen) ; - f2s_array (psf->u.fbuf, readcount, ptr + total, scale) ; + f2s_array (ubuf.fbuf, readcount, ptr + total, scale) ; total += readcount ; if (readcount < bufferlen) break ; @@ -767,24 +781,25 @@ replace_read_f2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t replace_read_f2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float scale ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - bf2f_array (psf->u.fbuf, bufferlen) ; + bf2f_array (ubuf.fbuf, bufferlen) ; - f2i_array (psf->u.fbuf, readcount, ptr + total, scale) ; + f2i_array (ubuf.fbuf, readcount, ptr + total, scale) ; total += readcount ; if (readcount < bufferlen) break ; @@ -796,24 +811,25 @@ replace_read_f2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t replace_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; /* FIX THIS */ - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - bf2f_array (psf->u.fbuf, bufferlen) ; + bf2f_array (ubuf.fbuf, bufferlen) ; - memcpy (ptr + total, psf->u.fbuf, bufferlen * sizeof (float)) ; + memcpy (ptr + total, ubuf.fbuf, bufferlen * sizeof (float)) ; total += readcount ; if (readcount < bufferlen) @@ -826,22 +842,23 @@ replace_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t replace_read_f2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - bf2f_array (psf->u.fbuf, bufferlen) ; + bf2f_array (ubuf.fbuf, bufferlen) ; - f2d_array (psf->u.fbuf, readcount, ptr + total) ; + f2d_array (ubuf.fbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -853,27 +870,28 @@ replace_read_f2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t replace_write_s2f (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; float scale ; scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / 0x8000 ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2f_array (ptr + total, psf->u.fbuf, bufferlen, scale) ; + s2f_array (ptr + total, ubuf.fbuf, bufferlen, scale) ; if (psf->peak_info) - float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ; + float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ; - f2bf_array (psf->u.fbuf, bufferlen) ; + f2bf_array (ubuf.fbuf, bufferlen) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -885,27 +903,28 @@ replace_write_s2f (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t replace_write_i2f (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; float scale ; scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / (8.0 * 0x10000000) ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2f_array (ptr + total, psf->u.fbuf, bufferlen, scale) ; + i2f_array (ptr + total, ubuf.fbuf, bufferlen, scale) ; if (psf->peak_info) - float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ; + float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ; - f2bf_array (psf->u.fbuf, bufferlen) ; + f2bf_array (ubuf.fbuf, bufferlen) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -917,27 +936,28 @@ replace_write_i2f (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t replace_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; /* FIX THIS */ if (psf->peak_info) float32_peak_update (psf, ptr, len, 0) ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - memcpy (psf->u.fbuf, ptr + total, bufferlen * sizeof (float)) ; + memcpy (ubuf.fbuf, ptr + total, bufferlen * sizeof (float)) ; - f2bf_array (psf->u.fbuf, bufferlen) ; + f2bf_array (ubuf.fbuf, bufferlen) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.fbuf, sizeof (float) , bufferlen, psf) ; + writecount = psf_fwrite (ubuf.fbuf, sizeof (float) , bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -949,25 +969,26 @@ replace_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t replace_write_d2f (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.fbuf) ; + bufferlen = ARRAY_LEN (ubuf.fbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - d2f_array (ptr + total, psf->u.fbuf, bufferlen) ; + d2f_array (ptr + total, ubuf.fbuf, bufferlen) ; if (psf->peak_info) - float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ; + float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ; - f2bf_array (psf->u.fbuf, bufferlen) ; + f2bf_array (ubuf.fbuf, bufferlen) ; if (psf->data_endswap == SF_TRUE) - endswap_int_array (psf->u.ibuf, bufferlen) ; + endswap_int_array (ubuf.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ; + writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; diff --git a/lib-src/libsndfile/src/g72x.c b/lib-src/libsndfile/src/g72x.c index 99729d341..7b77b4f21 100644 --- a/lib-src/libsndfile/src/g72x.c +++ b/lib-src/libsndfile/src/g72x.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2014 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -112,8 +112,6 @@ g72x_init (SF_PRIVATE * psf) default : return SFE_UNIMPLEMENTED ; } ; - psf->blockwidth = psf->bytewidth = 1 ; - psf->filelength = psf_get_filelen (psf) ; if (psf->filelength < psf->dataoffset) psf->filelength = psf->dataoffset ; @@ -134,7 +132,7 @@ g72x_init (SF_PRIVATE * psf) psf->read_float = g72x_read_f ; psf->read_double = g72x_read_d ; - psf->seek = g72x_seek ; + psf->seek = g72x_seek ; if (psf->datalength % pg72x->blocksize) { psf_log_printf (psf, "*** Odd psf->datalength (%D) should be a multiple of %d\n", psf->datalength, pg72x->blocksize) ; @@ -253,7 +251,8 @@ g72x_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t g72x_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ G72x_PRIVATE *pg72x ; +{ BUF_UNION ubuf ; + G72x_PRIVATE *pg72x ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -262,14 +261,14 @@ g72x_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) return 0 ; pg72x = (G72x_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; + sptr = ubuf.sbuf ; bufferlen = SF_BUFFER_LEN / sizeof (short) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = g72x_read_block (psf, pg72x, sptr, readcount) ; for (k = 0 ; k < readcount ; k++) - ptr [total + k] = sptr [k] << 16 ; + ptr [total + k] = arith_shift_left (sptr [k], 16) ; total += count ; len -= readcount ; @@ -282,7 +281,8 @@ g72x_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t g72x_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ G72x_PRIVATE *pg72x ; +{ BUF_UNION ubuf ; + G72x_PRIVATE *pg72x ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -294,7 +294,7 @@ g72x_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; + sptr = ubuf.sbuf ; bufferlen = SF_BUFFER_LEN / sizeof (short) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; @@ -313,7 +313,8 @@ g72x_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t g72x_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ G72x_PRIVATE *pg72x ; +{ BUF_UNION ubuf ; + G72x_PRIVATE *pg72x ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -325,7 +326,7 @@ g72x_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; + sptr = ubuf.sbuf ; bufferlen = SF_BUFFER_LEN / sizeof (short) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; @@ -491,7 +492,8 @@ g72x_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t g72x_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ G72x_PRIVATE *pg72x ; +{ BUF_UNION ubuf ; + G72x_PRIVATE *pg72x ; short *sptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -500,8 +502,8 @@ g72x_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) return 0 ; pg72x = (G72x_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ((SF_BUFFER_LEN / psf->blockwidth) * psf->blockwidth) / sizeof (short) ; + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -518,7 +520,8 @@ g72x_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t g72x_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ G72x_PRIVATE *pg72x ; +{ BUF_UNION ubuf ; + G72x_PRIVATE *pg72x ; short *sptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -530,8 +533,8 @@ g72x_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ((SF_BUFFER_LEN / psf->blockwidth) * psf->blockwidth) / sizeof (short) ; + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -549,7 +552,8 @@ g72x_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t g72x_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ G72x_PRIVATE *pg72x ; +{ BUF_UNION ubuf ; + G72x_PRIVATE *pg72x ; short *sptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -561,8 +565,8 @@ g72x_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ((SF_BUFFER_LEN / psf->blockwidth) * psf->blockwidth) / sizeof (short) ; + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) diff --git a/lib-src/libsndfile/src/gsm610.c b/lib-src/libsndfile/src/gsm610.c index b16594ec8..9dc85841b 100644 --- a/lib-src/libsndfile/src/gsm610.c +++ b/lib-src/libsndfile/src/gsm610.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2019 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -26,7 +26,7 @@ #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "wav_w64.h" +#include "wavlike.h" #include "GSM610/gsm.h" #define GSM610_BLOCKSIZE 33 @@ -40,8 +40,8 @@ typedef struct gsm610_tag int (*decode_block) (SF_PRIVATE *psf, struct gsm610_tag *pgsm610) ; int (*encode_block) (SF_PRIVATE *psf, struct gsm610_tag *pgsm610) ; - short samples [WAV_W64_GSM610_SAMPLES] ; - unsigned char block [WAV_W64_GSM610_BLOCKSIZE] ; + short samples [WAVLIKE_GSM610_SAMPLES] ; + unsigned char block [WAVLIKE_GSM610_BLOCKSIZE] ; /* Damn I hate typedef-ed pointers; yes, gsm is a pointer type. */ gsm gsm_data ; @@ -114,8 +114,8 @@ Need separate gsm_data structs for encode and decode. pgsm610->encode_block = gsm610_wav_encode_block ; pgsm610->decode_block = gsm610_wav_decode_block ; - pgsm610->samplesperblock = WAV_W64_GSM610_SAMPLES ; - pgsm610->blocksize = WAV_W64_GSM610_BLOCKSIZE ; + pgsm610->samplesperblock = WAVLIKE_GSM610_SAMPLES ; + pgsm610->blocksize = WAVLIKE_GSM610_BLOCKSIZE ; break ; case SF_FORMAT_AIFF : @@ -194,19 +194,19 @@ gsm610_wav_decode_block (SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610) pgsm610->samplecount = 0 ; if (pgsm610->blockcount > pgsm610->blocks) - { memset (pgsm610->samples, 0, WAV_W64_GSM610_SAMPLES * sizeof (short)) ; + { memset (pgsm610->samples, 0, sizeof (pgsm610->samples)) ; return 1 ; } ; - if ((k = psf_fread (pgsm610->block, 1, WAV_W64_GSM610_BLOCKSIZE, psf)) != WAV_W64_GSM610_BLOCKSIZE) - psf_log_printf (psf, "*** Warning : short read (%d != %d).\n", k, WAV_W64_GSM610_BLOCKSIZE) ; + if ((k = psf_fread (pgsm610->block, 1, WAVLIKE_GSM610_BLOCKSIZE, psf)) != WAVLIKE_GSM610_BLOCKSIZE) + psf_log_printf (psf, "*** Warning : short read (%d != %d).\n", k, WAVLIKE_GSM610_BLOCKSIZE) ; if (gsm_decode (pgsm610->gsm_data, pgsm610->block, pgsm610->samples) < 0) { psf_log_printf (psf, "Error from WAV gsm_decode() on frame : %d\n", pgsm610->blockcount) ; return 0 ; } ; - if (gsm_decode (pgsm610->gsm_data, pgsm610->block + (WAV_W64_GSM610_BLOCKSIZE + 1) / 2, pgsm610->samples + WAV_W64_GSM610_SAMPLES / 2) < 0) + if (gsm_decode (pgsm610->gsm_data, pgsm610->block + (WAVLIKE_GSM610_BLOCKSIZE + 1) / 2, pgsm610->samples + WAVLIKE_GSM610_SAMPLES / 2) < 0) { psf_log_printf (psf, "Error from WAV gsm_decode() on frame : %d.5\n", pgsm610->blockcount) ; return 0 ; } ; @@ -222,7 +222,7 @@ gsm610_decode_block (SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610) pgsm610->samplecount = 0 ; if (pgsm610->blockcount > pgsm610->blocks) - { memset (pgsm610->samples, 0, GSM610_SAMPLES * sizeof (short)) ; + { memset (pgsm610->samples, 0, sizeof (pgsm610->samples)) ; return 1 ; } ; @@ -243,7 +243,7 @@ gsm610_read_block (SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610, short *ptr, int len while (indx < len) { if (pgsm610->blockcount >= pgsm610->blocks && pgsm610->samplecount >= pgsm610->samplesperblock) - { memset (&(ptr [indx]), 0, (len - indx) * sizeof (short)) ; + { memset (ptr + indx, 0, (len - indx) * sizeof (short)) ; return total ; } ; @@ -290,6 +290,7 @@ gsm610_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t gsm610_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) { GSM610_PRIVATE *pgsm610 ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -298,13 +299,13 @@ gsm610_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) return 0 ; pgsm610 = (GSM610_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = gsm610_read_block (psf, pgsm610, sptr, readcount) ; for (k = 0 ; k < readcount ; k++) - ptr [total + k] = sptr [k] << 16 ; + ptr [total + k] = arith_shift_left (sptr [k], 16) ; total += count ; len -= readcount ; @@ -315,6 +316,7 @@ gsm610_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t gsm610_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) { GSM610_PRIVATE *pgsm610 ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -326,8 +328,8 @@ gsm610_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = gsm610_read_block (psf, pgsm610, sptr, readcount) ; @@ -343,6 +345,7 @@ gsm610_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t gsm610_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) { GSM610_PRIVATE *pgsm610 ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -354,8 +357,8 @@ gsm610_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) return 0 ; pgsm610 = (GSM610_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = gsm610_read_block (psf, pgsm610, sptr, readcount) ; @@ -441,7 +444,7 @@ gsm610_encode_block (SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610) pgsm610->blockcount ++ ; /* Set samples to zero for next block. */ - memset (pgsm610->samples, 0, WAV_W64_GSM610_SAMPLES * sizeof (short)) ; + memset (pgsm610->samples, 0, sizeof (pgsm610->samples)) ; return 1 ; } /* gsm610_encode_block */ @@ -452,17 +455,17 @@ gsm610_wav_encode_block (SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610) /* Encode the samples. */ gsm_encode (pgsm610->gsm_data, pgsm610->samples, pgsm610->block) ; - gsm_encode (pgsm610->gsm_data, pgsm610->samples+WAV_W64_GSM610_SAMPLES/2, pgsm610->block+WAV_W64_GSM610_BLOCKSIZE/2) ; + gsm_encode (pgsm610->gsm_data, pgsm610->samples+WAVLIKE_GSM610_SAMPLES / 2, pgsm610->block+WAVLIKE_GSM610_BLOCKSIZE / 2) ; /* Write the block to disk. */ - if ((k = psf_fwrite (pgsm610->block, 1, WAV_W64_GSM610_BLOCKSIZE, psf)) != WAV_W64_GSM610_BLOCKSIZE) - psf_log_printf (psf, "*** Warning : short write (%d != %d).\n", k, WAV_W64_GSM610_BLOCKSIZE) ; + if ((k = psf_fwrite (pgsm610->block, 1, WAVLIKE_GSM610_BLOCKSIZE, psf)) != WAVLIKE_GSM610_BLOCKSIZE) + psf_log_printf (psf, "*** Warning : short write (%d != %d).\n", k, WAVLIKE_GSM610_BLOCKSIZE) ; pgsm610->samplecount = 0 ; pgsm610->blockcount ++ ; /* Set samples to zero for next block. */ - memset (pgsm610->samples, 0, WAV_W64_GSM610_SAMPLES * sizeof (short)) ; + memset (pgsm610->samples, 0, sizeof (pgsm610->samples)) ; return 1 ; } /* gsm610_wav_encode_block */ @@ -517,6 +520,7 @@ gsm610_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t gsm610_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) { GSM610_PRIVATE *pgsm610 ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -525,8 +529,8 @@ gsm610_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) return 0 ; pgsm610 = (GSM610_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -542,6 +546,7 @@ gsm610_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t gsm610_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) { GSM610_PRIVATE *pgsm610 ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -553,8 +558,8 @@ gsm610_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -563,6 +568,8 @@ gsm610_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) total += count ; len -= writecount ; + if (count != writecount) + break ; } ; return total ; } /* gsm610_write_f */ @@ -570,6 +577,7 @@ gsm610_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t gsm610_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) { GSM610_PRIVATE *pgsm610 ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -581,8 +589,8 @@ gsm610_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) diff --git a/lib-src/libsndfile/src/htk.c b/lib-src/libsndfile/src/htk.c index 25390f1dc..1041a8481 100644 --- a/lib-src/libsndfile/src/htk.c +++ b/lib-src/libsndfile/src/htk.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -112,8 +112,8 @@ htk_write_header (SF_PRIVATE *psf, int calc_length) psf->filelength = psf_get_filelen (psf) ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; if (psf->filelength > 12) @@ -123,15 +123,15 @@ htk_write_header (SF_PRIVATE *psf, int calc_length) sample_period = 10000000 / psf->sf.samplerate ; - psf_binheader_writef (psf, "E444", sample_count, sample_period, 0x20000) ; + psf_binheader_writef (psf, "E444", BHW4 (sample_count), BHW4 (sample_period), BHW4 (0x20000)) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; diff --git a/lib-src/libsndfile/src/id3.c b/lib-src/libsndfile/src/id3.c index 8d1b72987..095b989d4 100644 --- a/lib-src/libsndfile/src/id3.c +++ b/lib-src/libsndfile/src/id3.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2010-2011 Erik de Castro Lopo +** Copyright (C) 2010-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -32,7 +32,7 @@ id3_skip (SF_PRIVATE * psf) { unsigned char buf [10] ; memset (buf, 0, sizeof (buf)) ; - psf_binheader_readf (psf, "pb", (size_t)0, buf, 10) ; + psf_binheader_readf (psf, "pb", 0, buf, 10) ; if (buf [0] == 'I' && buf [1] == 'D' && buf [2] == '3') { int offset = buf [6] & 0x7f ; @@ -48,9 +48,11 @@ id3_skip (SF_PRIVATE * psf) /* Calculate new file offset and position ourselves there. */ psf->fileoffset += offset + 10 ; - psf_binheader_readf (psf, "p", (size_t)psf->fileoffset) ; - return 1 ; + if (psf->fileoffset < psf->filelength) + { psf_binheader_readf (psf, "p", psf->fileoffset) ; + return 1 ; + } ; } ; return 0 ; diff --git a/lib-src/libsndfile/src/ima_adpcm.c b/lib-src/libsndfile/src/ima_adpcm.c index e749f8ca8..33c5e1be8 100644 --- a/lib-src/libsndfile/src/ima_adpcm.c +++ b/lib-src/libsndfile/src/ima_adpcm.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -37,11 +37,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag int stepindx [2] ; unsigned char *block ; short *samples ; -#if HAVE_FLEXIBLE_ARRAY short data [] ; /* ISO C99 struct flexible array. */ -#else - short data [0] ; /* This is a hack and might not work. */ -#endif } IMA_ADPCM_PRIVATE ; /*============================================================================================ @@ -50,9 +46,9 @@ typedef struct IMA_ADPCM_PRIVATE_tag static int ima_indx_adjust [16] = { -1, -1, -1, -1, /* +0 - +3, decrease the step size */ - 2, 4, 6, 8, /* +4 - +7, increase the step size */ - -1, -1, -1, -1, /* -0 - -3, decrease the step size */ - 2, 4, 6, 8, /* -4 - -7, increase the step size */ + +2, +4, +6, +8, /* +4 - +7, increase the step size */ + -1, -1, -1, -1, /* -0 - -3, decrease the step size */ + +2, +4, +6, +8, /* -4 - -7, increase the step size */ } ; static int ima_step_size [89] = @@ -81,12 +77,13 @@ static sf_count_t ima_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t ima_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; static sf_count_t ima_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; -static sf_count_t ima_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; +static sf_count_t aiff_ima_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; +static sf_count_t wavlike_ima_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; static int ima_close (SF_PRIVATE *psf) ; -static int wav_w64_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) ; -static int wav_w64_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) ; +static int wavlike_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) ; +static int wavlike_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) ; /*-static int aiff_ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) ;-*/ static int aiff_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) ; @@ -108,7 +105,7 @@ clamp_ima_step_index (int indx) */ int -wav_w64_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) +wavlike_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) { int error ; if (psf->codec_data != NULL) @@ -128,10 +125,10 @@ wav_w64_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) return error ; psf->codec_close = ima_close ; - psf->seek = ima_seek ; + psf->seek = wavlike_ima_seek ; return 0 ; -} /* wav_w64_ima_init */ +} /* wavlike_ima_init */ int aiff_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) @@ -149,6 +146,7 @@ aiff_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) return error ; psf->codec_close = ima_close ; + psf->seek = aiff_ima_seek ; return 0 ; } /* aiff_ima_init */ @@ -186,13 +184,11 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) pimasize = sizeof (IMA_ADPCM_PRIVATE) + blockalign * psf->sf.channels + 3 * psf->sf.channels * samplesperblock ; - if (! (pima = malloc (pimasize))) + if (! (pima = calloc (1, pimasize))) return SFE_MALLOC_FAILED ; psf->codec_data = (void*) pima ; - memset (pima, 0, pimasize) ; - pima->samples = pima->data ; pima->block = (unsigned char*) (pima->data + samplesperblock * psf->sf.channels) ; @@ -204,8 +200,13 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) psf->datalength = (psf->dataend) ? psf->dataend - psf->dataoffset : psf->filelength - psf->dataoffset ; - if (pima->blocksize == 0) - { psf_log_printf (psf, "*** Error : pima->blocksize should not be zero.\n") ; + if (pima->blocksize <= 0) + { psf_log_printf (psf, "*** Error : pima->blocksize should be > 0.\n") ; + return SFE_INTERNAL ; + } ; + + if (pima->samplesperblock <= 0) + { psf_log_printf (psf, "*** Error : pima->samplesperblock should be > 0.\n") ; return SFE_INTERNAL ; } ; @@ -224,7 +225,7 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) return SFE_INTERNAL ; } ; - pima->decode_block = wav_w64_ima_decode_block ; + pima->decode_block = wavlike_ima_decode_block ; psf->sf.frames = pima->samplesperblock * pima->blocks ; break ; @@ -275,7 +276,8 @@ count ++ ; { blockdata = pima->block + chan * 34 ; sampledata = pima->samples + chan ; - predictor = (blockdata [0] << 8) | (blockdata [1] & 0x80) ; + /* Sign-extend from 16 bits to 32. */ + predictor = (int) ((short) ((blockdata [0] << 8) | (blockdata [1] & 0x80))) ; stepindx = blockdata [1] & 0x7F ; stepindx = clamp_ima_step_index (stepindx) ; @@ -320,62 +322,76 @@ count ++ ; static int aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) -{ int chan, k, step, diff, vpdiff, blockindx, indx, nib ; +{ int chan, k, step, diff, vpdiff, blockindx, indx ; short bytecode, mask ; - k = 0; - nib = 0; + /* Encode the block header. */ for (chan = 0 ; chan < pima->channels ; chan ++) { blockindx = chan * pima->blocksize ; - /* Encode the block header. */ - pima->block [blockindx++] = (pima->previous [chan] >> 8) & 0xFF ; - pima->block [blockindx++] = (pima->previous [chan] & 0x80) + (pima->stepindx [chan] & 0x7F) ; - /* Encode the samples as 4 bit. */ - for (indx = 0 ; indx < pima->samplesperblock ; indx ++) - { diff = pima->samples [k++] - pima->previous [chan] ; + pima->block [blockindx] = (pima->samples [chan] >> 8) & 0xFF ; + pima->block [blockindx + 1] = (pima->samples [chan] & 0x80) + (pima->stepindx [chan] & 0x7F) ; - bytecode = 0 ; - step = ima_step_size [pima->stepindx [chan]] ; - vpdiff = step >> 3 ; - if (diff < 0) - { bytecode = 8 ; - diff = -diff ; - } ; - mask = 4 ; - while (mask) - { if (diff >= step) - { bytecode |= mask ; - diff -= step ; - vpdiff += step ; - } ; - step >>= 1 ; - mask >>= 1 ; + pima->previous [chan] = pima->samples [chan] ; + } ; + + /* Encode second and later samples for every block as a 4 bit value. */ + for (k = pima->channels ; k < (pima->samplesperblock * pima->channels) ; k ++) + { chan = (pima->channels > 1) ? (k % 2) : 0 ; + + diff = pima->samples [k] - pima->previous [chan] ; + + bytecode = 0 ; + step = ima_step_size [pima->stepindx [chan]] ; + vpdiff = step >> 3 ; + if (diff < 0) + { bytecode = 8 ; + diff = -diff ; + } ; + mask = 4 ; + while (mask) + { if (diff >= step) + { bytecode |= mask ; + diff -= step ; + vpdiff += step ; } ; + step >>= 1 ; + mask >>= 1 ; + } ; - if (bytecode & 8) - vpdiff = -vpdiff ; + if (bytecode & 8) + pima->previous [chan] -= vpdiff ; + else pima->previous [chan] += vpdiff ; - if (pima->previous [chan] > 32767) - pima->previous [chan] = 32767 ; - else if (pima->previous [chan] < -32768) - pima->previous [chan] = -32768 ; + if (pima->previous [chan] > 32767) + pima->previous [chan] = 32767 ; + else if (pima->previous [chan] < -32768) + pima->previous [chan] = -32768 ; - pima->stepindx [chan] += ima_indx_adjust [bytecode] ; + pima->stepindx [chan] += ima_indx_adjust [bytecode] ; - pima->stepindx [chan] = clamp_ima_step_index (pima->stepindx [chan]) ; - pima->block [blockindx] = (bytecode << (4 * nib)) | pima->block [blockindx]; - blockindx += nib ; - nib = 1 - nib ; + pima->stepindx [chan] = clamp_ima_step_index (pima->stepindx [chan]) ; + pima->samples [k] = bytecode ; + } ; + + /* Pack the 4 bit encoded samples. */ + + for (chan = 0 ; chan < pima->channels ; chan ++) + { for (indx = pima->channels ; indx < pima->channels * pima->samplesperblock ; indx += 2 * pima->channels) + { blockindx = chan * pima->blocksize + 2 + indx / 2 ; + + pima->block [blockindx] = pima->samples [indx] & 0x0F ; + pima->block [blockindx] |= (pima->samples [indx + chan] << 4) & 0xF0 ; } ; } ; /* Write the block to disk. */ + if ((k = psf_fwrite (pima->block, 1, pima->channels * pima->blocksize, psf)) != pima->channels * pima->blocksize) psf_log_printf (psf, "*** Warning : short write (%d != %d).\n", k, pima->channels * pima->blocksize) ; - memset (pima->block, 0, pima->channels * pima->blocksize) ; + memset (pima->samples, 0, pima->channels * pima->samplesperblock * sizeof (short)) ; pima->samplecount = 0 ; pima->blockcount ++ ; @@ -383,7 +399,7 @@ aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) } /* aiff_ima_encode_block */ static int -wav_w64_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) +wavlike_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) { int chan, k, predictor, blockindx, indx, indxstart, diff ; short step, bytecode, stepindx [2] ; @@ -471,10 +487,10 @@ wav_w64_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) } ; return 1 ; -} /* wav_w64_ima_decode_block */ +} /* wavlike_ima_decode_block */ static int -wav_w64_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) +wavlike_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) { int chan, k, step, diff, vpdiff, blockindx, indx, indxstart ; short bytecode, mask ; @@ -559,7 +575,7 @@ wav_w64_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) pima->blockcount ++ ; return 1 ; -} /* wav_w64_ima_encode_block */ +} /* wavlike_ima_encode_block */ static int ima_read_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima, short *ptr, int len) @@ -613,6 +629,7 @@ ima_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t ima_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) { IMA_ADPCM_PRIVATE *pima ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -621,13 +638,13 @@ ima_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) return 0 ; pima = (IMA_ADPCM_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : (int) len ; count = ima_read_block (psf, pima, sptr, readcount) ; for (k = 0 ; k < readcount ; k++) - ptr [total + k] = ((int) sptr [k]) << 16 ; + ptr [total + k] = arith_shift_left (sptr [k], 16) ; total += count ; len -= readcount ; if (count != readcount) @@ -640,6 +657,7 @@ ima_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t ima_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) { IMA_ADPCM_PRIVATE *pima ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -651,8 +669,8 @@ ima_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : (int) len ; count = ima_read_block (psf, pima, sptr, readcount) ; @@ -670,6 +688,7 @@ ima_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t ima_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) { IMA_ADPCM_PRIVATE *pima ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -681,8 +700,8 @@ ima_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : (int) len ; count = ima_read_block (psf, pima, sptr, readcount) ; @@ -698,7 +717,53 @@ ima_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) } /* ima_read_d */ static sf_count_t -ima_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) +aiff_ima_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) +{ IMA_ADPCM_PRIVATE *pima ; + int newblock, newsample, newblockaiff ; + + if (! psf->codec_data) + return 0 ; + pima = (IMA_ADPCM_PRIVATE*) psf->codec_data ; + + if (psf->datalength < 0 || psf->dataoffset < 0) + { psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + if (offset == 0) + { psf_fseek (psf, psf->dataoffset, SEEK_SET) ; + pima->blockcount = 0 ; + pima->decode_block (psf, pima) ; + pima->samplecount = 0 ; + return 0 ; + } ; + + if (offset < 0 || offset > pima->blocks * pima->samplesperblock) + { psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + newblock = offset / pima->samplesperblock ; + newsample = offset % pima->samplesperblock ; + newblockaiff = newblock * psf->sf.channels ; + + if (mode == SFM_READ) + { psf_fseek (psf, psf->dataoffset + newblockaiff * pima->blocksize, SEEK_SET) ; + pima->blockcount = newblockaiff ; + pima->decode_block (psf, pima) ; + pima->samplecount = newsample ; + } + else + { /* What to do about write??? */ + psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + return newblock * pima->samplesperblock + newsample ; +} /* aiff_ima_seek */ + +static sf_count_t +wavlike_ima_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) { IMA_ADPCM_PRIVATE *pima ; int newblock, newsample ; @@ -740,7 +805,7 @@ ima_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) } ; return newblock * pima->samplesperblock + newsample ; -} /* ima_seek */ +} /* wavlike_ima_seek */ /*========================================================================================== ** IMA ADPCM Write Functions. @@ -755,20 +820,7 @@ ima_writer_init (SF_PRIVATE *psf, int blockalign) if (psf->file.mode != SFM_WRITE) return SFE_BAD_MODE_RW ; - switch (SF_CONTAINER (psf->sf.format)) - { case SF_FORMAT_WAV : - case SF_FORMAT_W64 : - samplesperblock = 2 * (blockalign - 4 * psf->sf.channels) / psf->sf.channels + 1 ; - break ; - - case SF_FORMAT_AIFF : - samplesperblock = 2 * (blockalign - 2 * psf->sf.channels) / psf->sf.channels ; - break ; - - default : - psf_log_printf (psf, "ima_reader_init: bad psf->sf.format\n") ; - return SFE_INTERNAL ; - } ; + samplesperblock = 2 * (blockalign - 4 * psf->sf.channels) / psf->sf.channels + 1 ; pimasize = sizeof (IMA_ADPCM_PRIVATE) + blockalign + 3 * psf->sf.channels * samplesperblock ; @@ -789,7 +841,7 @@ ima_writer_init (SF_PRIVATE *psf, int blockalign) switch (SF_CONTAINER (psf->sf.format)) { case SF_FORMAT_WAV : case SF_FORMAT_W64 : - pima->encode_block = wav_w64_ima_encode_block ; + pima->encode_block = wavlike_ima_encode_block ; break ; case SF_FORMAT_AIFF : @@ -861,6 +913,7 @@ ima_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t ima_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) { IMA_ADPCM_PRIVATE *pima ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -869,8 +922,8 @@ ima_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) return 0 ; pima = (IMA_ADPCM_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; for (k = 0 ; k < writecount ; k++) @@ -888,6 +941,7 @@ ima_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t ima_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) { IMA_ADPCM_PRIVATE *pima ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -899,8 +953,8 @@ ima_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; for (k = 0 ; k < writecount ; k++) @@ -918,6 +972,7 @@ ima_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t ima_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) { IMA_ADPCM_PRIVATE *pima ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -929,8 +984,8 @@ ima_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; for (k = 0 ; k < writecount ; k++) diff --git a/lib-src/libsndfile/src/ima_oki_adpcm.c b/lib-src/libsndfile/src/ima_oki_adpcm.c index 4eea3af2a..253216009 100644 --- a/lib-src/libsndfile/src/ima_oki_adpcm.c +++ b/lib-src/libsndfile/src/ima_oki_adpcm.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2007-2011 Erik de Castro Lopo +** Copyright (C) 2007-2014 Erik de Castro Lopo ** Copyright (c) 2007 ** ** This library is free software; you can redistribute it and/or modify it @@ -63,7 +63,7 @@ ima_oki_adpcm_init (IMA_OKI_ADPCM * state, IMA_OKI_ADPCM_TYPE type) else { state->max_step_index = ARRAY_LEN (oki_steps) - 1 ; state->steps = oki_steps ; - state->mask = (~0u) << 4 ; + state->mask = arith_shift_left (~0, 4) ; } ; } /* ima_oki_adpcm_init */ @@ -77,7 +77,7 @@ adpcm_decode (IMA_OKI_ADPCM * state, int code) s = ((state->steps [state->step_index] * s) >> 3) & state->mask ; if (code & 8) - s = -s ; + s = -s ; s += state->last_output ; if (s < MIN_SAMPLE || s > MAX_SAMPLE) diff --git a/lib-src/libsndfile/src/interleave.c b/lib-src/libsndfile/src/interleave.c index ca9d7b409..5f799444c 100644 --- a/lib-src/libsndfile/src/interleave.c +++ b/lib-src/libsndfile/src/interleave.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2013 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -287,9 +287,8 @@ interleave_read_double (SF_PRIVATE *psf, double *ptr, sf_count_t len) */ static sf_count_t -interleave_seek (SF_PRIVATE *psf, int mode, sf_count_t samples_from_start) -{ psf = psf ; mode = mode ; - +interleave_seek (SF_PRIVATE * UNUSED (psf), int UNUSED (mode), sf_count_t samples_from_start) +{ /* ** Do nothing here. This is a place holder to prevent the default ** seek function from being called. diff --git a/lib-src/libsndfile/src/ircam.c b/lib-src/libsndfile/src/ircam.c index 4aa1173ab..8e7cdba81 100644 --- a/lib-src/libsndfile/src/ircam.c +++ b/lib-src/libsndfile/src/ircam.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -95,7 +95,7 @@ ircam_open (SF_PRIVATE *psf) if (psf->endian == 0 || psf->endian == SF_ENDIAN_CPU) psf->endian = (CPU_IS_BIG_ENDIAN) ? SF_ENDIAN_BIG : SF_ENDIAN_LITTLE ; - psf->dataoffset = IRCAM_DATA_OFFSET ; + psf->dataoffset = IRCAM_DATA_OFFSET ; if ((error = ircam_write_header (psf, SF_FALSE))) return error ; @@ -147,11 +147,11 @@ ircam_read_header (SF_PRIVATE *psf) psf->endian = SF_ENDIAN_LITTLE ; - if (psf->sf.channels > 256) + if (psf->sf.channels > SF_MAX_CHANNELS) { psf_binheader_readf (psf, "Epmf44", 0, &marker, &samplerate, &(psf->sf.channels), &encoding) ; /* Sanity checking for endian-ness detection. */ - if (psf->sf.channels > 256) + if (psf->sf.channels > SF_MAX_CHANNELS) { psf_log_printf (psf, "marker: 0x%X\n", marker) ; return SFE_IRCAM_BAD_CHANNELS ; } ; @@ -163,9 +163,10 @@ ircam_read_header (SF_PRIVATE *psf) psf->sf.samplerate = (int) samplerate ; - psf_log_printf (psf, " Sample Rate : %d\n" - " Channels : %d\n" - " Encoding : %X => %s\n", psf->sf.samplerate, psf->sf.channels, encoding, get_encoding_str (encoding)) ; + psf_log_printf (psf, " Sample Rate : %d\n" + " Channels : %d\n" + " Encoding : %X => %s\n", + psf->sf.samplerate, psf->sf.channels, encoding, get_encoding_str (encoding)) ; switch (encoding) { case IRCAM_PCM_16 : @@ -255,8 +256,8 @@ ircam_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) return SFE_BAD_OPEN_FORMAT ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; if (psf->is_pipe == SF_FALSE) psf_fseek (psf, 0, SEEK_SET) ; @@ -265,22 +266,22 @@ ircam_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) switch (psf->endian) { case SF_ENDIAN_BIG : - psf_binheader_writef (psf, "Emf", IRCAM_02B_MARKER, samplerate) ; - psf_binheader_writef (psf, "E44", psf->sf.channels, encoding) ; + psf_binheader_writef (psf, "Emf", BHWm (IRCAM_02B_MARKER), BHWf (samplerate)) ; + psf_binheader_writef (psf, "E44", BHW4 (psf->sf.channels), BHW4 (encoding)) ; break ; case SF_ENDIAN_LITTLE : - psf_binheader_writef (psf, "emf", IRCAM_03L_MARKER, samplerate) ; - psf_binheader_writef (psf, "e44", psf->sf.channels, encoding) ; + psf_binheader_writef (psf, "emf", BHWm (IRCAM_03L_MARKER), BHWf (samplerate)) ; + psf_binheader_writef (psf, "e44", BHW4 (psf->sf.channels), BHW4 (encoding)) ; break ; default : return SFE_BAD_OPEN_FORMAT ; } ; - psf_binheader_writef (psf, "z", (size_t) (IRCAM_DATA_OFFSET - psf->headindex)) ; + psf_binheader_writef (psf, "z", BHWz ((size_t) (IRCAM_DATA_OFFSET - psf->header.indx))) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; diff --git a/lib-src/libsndfile/src/libsndfile-1.def b/lib-src/libsndfile/src/libsndfile-1.def deleted file mode 100644 index 93cab02d9..000000000 --- a/lib-src/libsndfile/src/libsndfile-1.def +++ /dev/null @@ -1,41 +0,0 @@ -; Auto-generated by create_symbols_file.py - -LIBRARY libsndfile-1.dll -EXPORTS - -sf_command @1 -sf_open @2 -sf_close @3 -sf_seek @4 -sf_error @7 -sf_perror @8 -sf_error_str @9 -sf_error_number @10 -sf_format_check @11 -sf_read_raw @16 -sf_readf_short @17 -sf_readf_int @18 -sf_readf_float @19 -sf_readf_double @20 -sf_read_short @21 -sf_read_int @22 -sf_read_float @23 -sf_read_double @24 -sf_write_raw @32 -sf_writef_short @33 -sf_writef_int @34 -sf_writef_float @35 -sf_writef_double @36 -sf_write_short @37 -sf_write_int @38 -sf_write_float @39 -sf_write_double @40 -sf_strerror @50 -sf_get_string @60 -sf_set_string @61 -sf_version_string @68 -sf_open_fd @70 -sf_wchar_open @71 -sf_open_virtual @80 -sf_write_sync @90 - diff --git a/lib-src/libsndfile/src/mat4.c b/lib-src/libsndfile/src/mat4.c index 3471e34c0..40e61c99a 100644 --- a/lib-src/libsndfile/src/mat4.c +++ b/lib-src/libsndfile/src/mat4.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -123,9 +123,6 @@ mat4_open (SF_PRIVATE *psf) default : break ; } ; - if (error) - return error ; - return error ; } /* mat4_open */ @@ -168,35 +165,35 @@ mat4_write_header (SF_PRIVATE *psf, int calc_length) return SFE_BAD_OPEN_FORMAT ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; /* Need sample rate as a double for writing to the header. */ samplerate = psf->sf.samplerate ; if (psf->endian == SF_ENDIAN_BIG) - { psf_binheader_writef (psf, "Em444", MAT4_BE_DOUBLE, 1, 1, 0) ; - psf_binheader_writef (psf, "E4bd", 11, "samplerate", make_size_t (11), samplerate) ; - psf_binheader_writef (psf, "tEm484", encoding, psf->sf.channels, psf->sf.frames, 0) ; - psf_binheader_writef (psf, "E4b", 9, "wavedata", make_size_t (9)) ; + { psf_binheader_writef (psf, "Em444", BHWm (MAT4_BE_DOUBLE), BHW4 (1), BHW4 (1), BHW4 (0)) ; + psf_binheader_writef (psf, "E4bd", BHW4 (11), BHWv ("samplerate"), BHWz (11), BHWd (samplerate)) ; + psf_binheader_writef (psf, "tEm484", BHWm (encoding), BHW4 (psf->sf.channels), BHW8 (psf->sf.frames), BHW4 (0)) ; + psf_binheader_writef (psf, "E4b", BHW4 (9), BHWv ("wavedata"), BHWz (9)) ; } else if (psf->endian == SF_ENDIAN_LITTLE) - { psf_binheader_writef (psf, "em444", MAT4_LE_DOUBLE, 1, 1, 0) ; - psf_binheader_writef (psf, "e4bd", 11, "samplerate", make_size_t (11), samplerate) ; - psf_binheader_writef (psf, "tem484", encoding, psf->sf.channels, psf->sf.frames, 0) ; - psf_binheader_writef (psf, "e4b", 9, "wavedata", make_size_t (9)) ; + { psf_binheader_writef (psf, "em444", BHWm (MAT4_LE_DOUBLE), BHW4 (1), BHW4 (1), BHW4 (0)) ; + psf_binheader_writef (psf, "e4bd", BHW4 (11), BHWv ("samplerate"), BHWz (11), BHWd (samplerate)) ; + psf_binheader_writef (psf, "tem484", BHWm (encoding), BHW4 (psf->sf.channels), BHW8 (psf->sf.frames), BHW4 (0)) ; + psf_binheader_writef (psf, "e4b", BHW4 (9), BHWv ("wavedata"), BHWz (9)) ; } else return SFE_BAD_OPEN_FORMAT ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; @@ -206,8 +203,9 @@ mat4_write_header (SF_PRIVATE *psf, int calc_length) static int mat4_read_header (SF_PRIVATE *psf) -{ int marker, rows, cols, imag ; - unsigned namesize ; +{ char buffer [256] ; + uint32_t marker, namesize ; + int rows, cols, imag ; double value ; const char *marker_str ; char name [64] ; @@ -244,8 +242,8 @@ mat4_read_header (SF_PRIVATE *psf) psf_binheader_readf (psf, "d", &value) ; - snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), " Value : %f\n", value) ; - psf_log_printf (psf, psf->u.cbuf) ; + snprintf (buffer, sizeof (buffer), " Value : %f\n", value) ; + psf_log_printf (psf, buffer) ; if ((rows != 1) || (cols != 1)) return SFE_MAT4_NO_SAMPLERATE ; @@ -274,9 +272,13 @@ mat4_read_header (SF_PRIVATE *psf) psf->dataoffset = psf_ftell (psf) ; - if (rows == 0 && cols == 0) + if (rows == 0) { psf_log_printf (psf, "*** Error : zero channel count.\n") ; return SFE_CHANNEL_COUNT_ZERO ; + } + else if (rows > SF_MAX_CHANNELS) + { psf_log_printf (psf, "*** Error : channel count %d > SF_MAX_CHANNELS.\n", rows) ; + return SFE_CHANNEL_COUNT ; } ; psf->sf.channels = rows ; diff --git a/lib-src/libsndfile/src/mat5.c b/lib-src/libsndfile/src/mat5.c index 338477e07..57d2f1ed0 100644 --- a/lib-src/libsndfile/src/mat5.c +++ b/lib-src/libsndfile/src/mat5.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -154,9 +154,10 @@ mat5_close (SF_PRIVATE *psf) static int mat5_write_header (SF_PRIVATE *psf, int calc_length) -{ static const char *filename = "MATLAB 5.0 MAT-file, written by " PACKAGE "-" VERSION ", " ; +{ static const char *filename = "MATLAB 5.0 MAT-file, written by " PACKAGE_NAME "-" PACKAGE_VERSION ", " ; static const char *sr_name = "samplerate\0\0\0\0\0\0\0\0\0\0\0" ; static const char *wd_name = "wavedata\0" ; + char buffer [256] ; sf_count_t current, datasize ; int encoding ; @@ -200,54 +201,54 @@ mat5_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; - psf_get_date_str (psf->u.cbuf, sizeof (psf->u.scbuf)) ; - psf_binheader_writef (psf, "bb", filename, strlen (filename), psf->u.cbuf, strlen (psf->u.cbuf) + 1) ; + psf_get_date_str (buffer, sizeof (buffer)) ; + psf_binheader_writef (psf, "bb", BHWv (filename), BHWz (strlen (filename)), BHWv (buffer), BHWz (strlen (buffer) + 1)) ; - memset (psf->u.scbuf, ' ', 124 - psf->headindex) ; - psf_binheader_writef (psf, "b", psf->u.scbuf, make_size_t (124 - psf->headindex)) ; + memset (buffer, ' ', 124 - psf->header.indx) ; + psf_binheader_writef (psf, "b", BHWv (buffer), BHWz (124 - psf->header.indx)) ; psf->rwf_endian = psf->endian ; if (psf->rwf_endian == SF_ENDIAN_BIG) - psf_binheader_writef (psf, "2b", 0x0100, "MI", make_size_t (2)) ; + psf_binheader_writef (psf, "2b", BHW2 (0x0100), BHWv ("MI"), BHWz (2)) ; else - psf_binheader_writef (psf, "2b", 0x0100, "IM", make_size_t (2)) ; + psf_binheader_writef (psf, "2b", BHW2 (0x0100), BHWv ("IM"), BHWz (2)) ; - psf_binheader_writef (psf, "444444", MAT5_TYPE_ARRAY, 64, MAT5_TYPE_UINT32, 8, 6, 0) ; - psf_binheader_writef (psf, "4444", MAT5_TYPE_INT32, 8, 1, 1) ; - psf_binheader_writef (psf, "44b", MAT5_TYPE_SCHAR, strlen (sr_name), sr_name, make_size_t (16)) ; + psf_binheader_writef (psf, "444444", BHW4 (MAT5_TYPE_ARRAY), BHW4 (64), BHW4 (MAT5_TYPE_UINT32), BHW4 (8), BHW4 (6), BHW4 (0)) ; + psf_binheader_writef (psf, "4444", BHW4 (MAT5_TYPE_INT32), BHW4 (8), BHW4 (1), BHW4 (1)) ; + psf_binheader_writef (psf, "44b", BHW4 (MAT5_TYPE_SCHAR), BHW4 (strlen (sr_name)), BHWv (sr_name), BHWz (16)) ; if (psf->sf.samplerate > 0xFFFF) - psf_binheader_writef (psf, "44", MAT5_TYPE_COMP_UINT, psf->sf.samplerate) ; + psf_binheader_writef (psf, "44", BHW4 (MAT5_TYPE_COMP_UINT), BHW4 (psf->sf.samplerate)) ; else { unsigned short samplerate = psf->sf.samplerate ; - psf_binheader_writef (psf, "422", MAT5_TYPE_COMP_USHORT, samplerate, 0) ; + psf_binheader_writef (psf, "422", BHW4 (MAT5_TYPE_COMP_USHORT), BHW2 (samplerate), BHW2 (0)) ; } ; datasize = psf->sf.frames * psf->sf.channels * psf->bytewidth ; - psf_binheader_writef (psf, "t484444", MAT5_TYPE_ARRAY, datasize + 64, MAT5_TYPE_UINT32, 8, 6, 0) ; - psf_binheader_writef (psf, "t4448", MAT5_TYPE_INT32, 8, psf->sf.channels, psf->sf.frames) ; - psf_binheader_writef (psf, "44b", MAT5_TYPE_SCHAR, strlen (wd_name), wd_name, strlen (wd_name)) ; + psf_binheader_writef (psf, "t484444", BHW4 (MAT5_TYPE_ARRAY), BHW8 (datasize + 64), BHW4 (MAT5_TYPE_UINT32), BHW4 (8), BHW4 (6), BHW4 (0)) ; + psf_binheader_writef (psf, "t4448", BHW4 (MAT5_TYPE_INT32), BHW4 (8), BHW4 (psf->sf.channels), BHW8 (psf->sf.frames)) ; + psf_binheader_writef (psf, "44b", BHW4 (MAT5_TYPE_SCHAR), BHW4 (strlen (wd_name)), BHWv (wd_name), BHWz (strlen (wd_name))) ; datasize = psf->sf.frames * psf->sf.channels * psf->bytewidth ; if (datasize > 0x7FFFFFFF) datasize = 0x7FFFFFFF ; - psf_binheader_writef (psf, "t48", encoding, datasize) ; + psf_binheader_writef (psf, "t48", BHW4 (encoding), BHW8 (datasize)) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; @@ -257,38 +258,39 @@ mat5_write_header (SF_PRIVATE *psf, int calc_length) static int mat5_read_header (SF_PRIVATE *psf) -{ char name [32] ; +{ char buffer [256], name [32] ; short version, endian ; int type, flags1, flags2, rows, cols ; unsigned size ; + int have_samplerate = 1 ; - psf_binheader_readf (psf, "pb", 0, psf->u.cbuf, 124) ; + psf_binheader_readf (psf, "pb", 0, buffer, 124) ; - psf->u.scbuf [125] = 0 ; + buffer [125] = 0 ; - if (strlen (psf->u.cbuf) >= 124) + if (strlen (buffer) >= 124) return SFE_UNIMPLEMENTED ; - if (strstr (psf->u.cbuf, "MATLAB 5.0 MAT-file") == psf->u.cbuf) - psf_log_printf (psf, "%s\n", psf->u.scbuf) ; + if (strstr (buffer, "MATLAB 5.0 MAT-file") == buffer) + psf_log_printf (psf, "%s\n", buffer) ; psf_binheader_readf (psf, "E22", &version, &endian) ; if (endian == MI_MARKER) { psf->endian = psf->rwf_endian = SF_ENDIAN_BIG ; - if (CPU_IS_LITTLE_ENDIAN) version = ENDSWAP_SHORT (version) ; + if (CPU_IS_LITTLE_ENDIAN) version = ENDSWAP_16 (version) ; } else if (endian == IM_MARKER) { psf->endian = psf->rwf_endian = SF_ENDIAN_LITTLE ; - if (CPU_IS_BIG_ENDIAN) version = ENDSWAP_SHORT (version) ; + if (CPU_IS_BIG_ENDIAN) version = ENDSWAP_16 (version) ; } else return SFE_MAT5_BAD_ENDIAN ; if ((CPU_IS_LITTLE_ENDIAN && endian == IM_MARKER) || (CPU_IS_BIG_ENDIAN && endian == MI_MARKER)) - version = ENDSWAP_SHORT (version) ; + version = ENDSWAP_16 (version) ; psf_log_printf (psf, "Version : 0x%04X\n", version) ; psf_log_printf (psf, "Endian : 0x%04X => %s\n", endian, @@ -317,11 +319,13 @@ mat5_read_header (SF_PRIVATE *psf) return SFE_MAT5_NO_BLOCK ; psf_binheader_readf (psf, "44", &rows, &cols) ; - psf_log_printf (psf, " Rows : %X Cols : %d\n", rows, cols) ; + psf_log_printf (psf, " Rows : %d Cols : %d\n", rows, cols) ; if (rows != 1 || cols != 1) - return SFE_MAT5_SAMPLE_RATE ; - + { if (psf->sf.samplerate == 0) + psf->sf.samplerate = 44100 ; + have_samplerate = 0 ; + } psf_binheader_readf (psf, "4", &type) ; if (type == MAT5_TYPE_SCHAR) @@ -355,6 +359,9 @@ mat5_read_header (SF_PRIVATE *psf) psf_binheader_readf (psf, "44", &type, &size) ; + if (!have_samplerate) + goto skip_samplerate ; + switch (type) { case MAT5_TYPE_DOUBLE : { double samplerate ; @@ -445,6 +452,7 @@ mat5_read_header (SF_PRIVATE *psf) psf_binheader_readf (psf, "44", &type, &size) ; psf_log_printf (psf, " Type : %X Size : %d\n", type, size) ; +skip_samplerate : /*++++++++++++++++++++++++++++++++++++++++++++++++++*/ if (rows == 0 && cols == 0) diff --git a/lib-src/libsndfile/src/mpc2k.c b/lib-src/libsndfile/src/mpc2k.c index b741aacb9..aef21ad9b 100644 --- a/lib-src/libsndfile/src/mpc2k.c +++ b/lib-src/libsndfile/src/mpc2k.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -63,8 +63,7 @@ static int mpc2k_read_header (SF_PRIVATE *psf) ; int mpc2k_open (SF_PRIVATE *psf) -{ int subformat ; - int error = 0 ; +{ int error = 0 ; if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0)) { if ((error = mpc2k_read_header (psf))) @@ -74,8 +73,6 @@ mpc2k_open (SF_PRIVATE *psf) if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_MPC2K) return SFE_BAD_OPEN_FORMAT ; - subformat = SF_CODEC (psf->sf.format) ; - if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) { if (mpc2k_write_header (psf, SF_FALSE)) return psf->error ; @@ -124,8 +121,8 @@ mpc2k_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; /* ** Only attempt to seek if we are not writng to a pipe. If we are @@ -134,23 +131,23 @@ mpc2k_write_header (SF_PRIVATE *psf, int calc_length) if (psf->is_pipe == SF_FALSE) psf_fseek (psf, 0, SEEK_SET) ; - snprintf (sample_name, sizeof (sample_name), "%s ", psf->file.name.c) ; + snprintf (sample_name, sizeof (sample_name), "%-*.*s", HEADER_NAME_LEN, HEADER_NAME_LEN, psf->file.name.c) ; - psf_binheader_writef (psf, "e11b", 1, 4, sample_name, make_size_t (HEADER_NAME_LEN)) ; - psf_binheader_writef (psf, "e111", 100, 0, (psf->sf.channels - 1) & 1) ; - psf_binheader_writef (psf, "et4888", 0, psf->sf.frames, psf->sf.frames, psf->sf.frames) ; - psf_binheader_writef (psf, "e112", 0, 1, (uint16_t) psf->sf.samplerate) ; + psf_binheader_writef (psf, "e11b", BHW1 (1), BHW1 (4), BHWv (sample_name), BHWz (HEADER_NAME_LEN)) ; + psf_binheader_writef (psf, "e111", BHW1 (100), BHW1 (0), BHW1 ((psf->sf.channels - 1) & 1)) ; + psf_binheader_writef (psf, "et4888", BHW4 (0), BHW8 (psf->sf.frames), BHW8 (psf->sf.frames), BHW8 (psf->sf.frames)) ; + psf_binheader_writef (psf, "e112", BHW1 (0), BHW1 (1), BHW2 ((uint16_t) psf->sf.samplerate)) ; /* Always 16 bit little endian data. */ psf->bytewidth = 2 ; psf->endian = SF_ENDIAN_LITTLE ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; diff --git a/lib-src/libsndfile/src/ms_adpcm.c b/lib-src/libsndfile/src/ms_adpcm.c index d62a2ed5a..062b8381f 100644 --- a/lib-src/libsndfile/src/ms_adpcm.c +++ b/lib-src/libsndfile/src/ms_adpcm.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -26,29 +26,17 @@ #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "wav_w64.h" +#include "wavlike.h" -/* These required here because we write the header in this file. */ - -#define RIFF_MARKER (MAKE_MARKER ('R', 'I', 'F', 'F')) -#define WAVE_MARKER (MAKE_MARKER ('W', 'A', 'V', 'E')) -#define fmt_MARKER (MAKE_MARKER ('f', 'm', 't', ' ')) -#define fact_MARKER (MAKE_MARKER ('f', 'a', 'c', 't')) -#define data_MARKER (MAKE_MARKER ('d', 'a', 't', 'a')) - -#define WAVE_FORMAT_MS_ADPCM 0x0002 typedef struct { int channels, blocksize, samplesperblock, blocks, dataremaining ; int blockcount ; + int sync_error ; sf_count_t samplecount ; short *samples ; unsigned char *block ; -#if HAVE_FLEXIBLE_ARRAY short dummydata [] ; /* ISO C99 struct flexible array. */ -#else - short dummydata [0] ; /* This is a hack an might not work. */ -#endif } MSADPCM_PRIVATE ; /*============================================================================================ @@ -64,11 +52,11 @@ static int AdaptationTable [] = appear in the actual WAVE file. They should be read in in case a sound program added extras to the list. */ -static int AdaptCoeff1 [MSADPCM_ADAPT_COEFF_COUNT] = +static int AdaptCoeff1 [WAVLIKE_MSADPCM_ADAPT_COEFF_COUNT] = { 256, 512, 0, 192, 240, 460, 392 } ; -static int AdaptCoeff2 [MSADPCM_ADAPT_COEFF_COUNT] = +static int AdaptCoeff2 [WAVLIKE_MSADPCM_ADAPT_COEFF_COUNT] = { 0, -256, 0, 64, 0, -208, -232 } ; @@ -127,7 +115,7 @@ static void choose_predictor (unsigned int channels, short *data, int *bpred, in */ int -wav_w64_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) +wavlike_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) { MSADPCM_PRIVATE *pms ; unsigned int pmssize ; int count ; @@ -140,13 +128,18 @@ wav_w64_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) if (psf->file.mode == SFM_WRITE) samplesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / psf->sf.channels ; + if (blockalign < 7 * psf->sf.channels) + { psf_log_printf (psf, "*** Error blockalign (%d) should be > %d.\n", blockalign, 7 * psf->sf.channels) ; + return SFE_INTERNAL ; + } ; + pmssize = sizeof (MSADPCM_PRIVATE) + blockalign + 3 * psf->sf.channels * samplesperblock ; - if (! (psf->codec_data = malloc (pmssize))) + if (! (psf->codec_data = calloc (1, pmssize))) return SFE_MALLOC_FAILED ; pms = (MSADPCM_PRIVATE*) psf->codec_data ; - memset (pms, 0, pmssize) ; + pms->sync_error = 0 ; pms->samples = pms->dummydata ; pms->block = (unsigned char*) (pms->dummydata + psf->sf.channels * samplesperblock) ; @@ -154,13 +147,13 @@ wav_w64_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) pms->blocksize = blockalign ; pms->samplesperblock = samplesperblock ; - if (pms->blocksize == 0) - { psf_log_printf (psf, "*** Error : pms->blocksize should not be zero.\n") ; + if (pms->blocksize <= 0) + { psf_log_printf (psf, "*** Error : pms->blocksize should be > 0.\n") ; return SFE_INTERNAL ; } ; if (psf->file.mode == SFM_READ) - { pms->dataremaining = psf->datalength ; + { pms->dataremaining = psf->datalength ; if (psf->datalength % pms->blocksize) pms->blocks = psf->datalength / pms->blocksize + 1 ; @@ -175,8 +168,6 @@ wav_w64_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) psf->sf.frames = (psf->datalength / pms->blocksize) * pms->samplesperblock ; - psf_log_printf (psf, " bpred idelta\n") ; - msadpcm_decode_block (psf, pms) ; psf->read_short = msadpcm_read_s ; @@ -200,16 +191,30 @@ wav_w64_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) psf->seek = msadpcm_seek ; return 0 ; -} /* wav_w64_msadpcm_init */ +} /* wavlike_msadpcm_init */ + + +static inline short +msadpcm_get_bpred (SF_PRIVATE *psf, MSADPCM_PRIVATE *pms, unsigned char value) +{ if (value >= WAVLIKE_MSADPCM_ADAPT_COEFF_COUNT) + { if (pms->sync_error == 0) + { pms->sync_error = 1 ; + psf_log_printf (psf, "MS ADPCM synchronisation error (%u should be < %u).\n", value, WAVLIKE_MSADPCM_ADAPT_COEFF_COUNT) ; + } ; + return 0 ; + } ; + return value ; +} /* msadpcm_get_bpred */ + static int msadpcm_decode_block (SF_PRIVATE *psf, MSADPCM_PRIVATE *pms) { int chan, k, blockindx, sampleindx ; short bytecode, bpred [2], chan_idelta [2] ; - int predict ; - int current ; - int idelta ; + int predict ; + int current ; + int idelta ; pms->blockcount ++ ; pms->samplecount = 0 ; @@ -220,37 +225,30 @@ msadpcm_decode_block (SF_PRIVATE *psf, MSADPCM_PRIVATE *pms) } ; if ((k = psf_fread (pms->block, 1, pms->blocksize, psf)) != pms->blocksize) - psf_log_printf (psf, "*** Warning : short read (%d != %d).\n", k, pms->blocksize) ; + { psf_log_printf (psf, "*** Warning : short read (%d != %d).\n", k, pms->blocksize) ; + if (k <= 0) + return 1 ; + } ; /* Read and check the block header. */ if (pms->channels == 1) - { bpred [0] = pms->block [0] ; - - if (bpred [0] >= 7) - psf_log_printf (psf, "MS ADPCM synchronisation error (%d).\n", bpred [0]) ; + { bpred [0] = msadpcm_get_bpred (psf, pms, pms->block [0]) ; chan_idelta [0] = pms->block [1] | (pms->block [2] << 8) ; chan_idelta [1] = 0 ; - psf_log_printf (psf, "(%d) (%d)\n", bpred [0], chan_idelta [0]) ; - pms->samples [1] = pms->block [3] | (pms->block [4] << 8) ; pms->samples [0] = pms->block [5] | (pms->block [6] << 8) ; blockindx = 7 ; } else - { bpred [0] = pms->block [0] ; - bpred [1] = pms->block [1] ; - - if (bpred [0] >= 7 || bpred [1] >= 7) - psf_log_printf (psf, "MS ADPCM synchronisation error (%d %d).\n", bpred [0], bpred [1]) ; + { bpred [0] = msadpcm_get_bpred (psf, pms, pms->block [0]) ; + bpred [1] = msadpcm_get_bpred (psf, pms, pms->block [1]) ; chan_idelta [0] = pms->block [2] | (pms->block [3] << 8) ; chan_idelta [1] = pms->block [4] | (pms->block [5] << 8) ; - psf_log_printf (psf, "(%d, %d) (%d, %d)\n", bpred [0], bpred [1], chan_idelta [0], chan_idelta [1]) ; - pms->samples [2] = pms->block [6] | (pms->block [7] << 8) ; pms->samples [3] = pms->block [8] | (pms->block [9] << 8) ; @@ -278,7 +276,7 @@ msadpcm_decode_block (SF_PRIVATE *psf, MSADPCM_PRIVATE *pms) sampleindx = 2 * pms->channels ; while (blockindx < pms->blocksize) { bytecode = pms->block [blockindx++] ; - pms->samples [sampleindx++] = (bytecode >> 4) & 0x0F ; + pms->samples [sampleindx++] = (bytecode >> 4) & 0x0F ; pms->samples [sampleindx++] = bytecode & 0x0F ; } ; @@ -297,7 +295,7 @@ msadpcm_decode_block (SF_PRIVATE *psf, MSADPCM_PRIVATE *pms) if (bytecode & 0x8) bytecode -= 0x10 ; - predict = ((pms->samples [k - pms->channels] * AdaptCoeff1 [bpred [chan]]) + predict = ((pms->samples [k - pms->channels] * AdaptCoeff1 [bpred [chan]]) + (pms->samples [k - 2 * pms->channels] * AdaptCoeff2 [bpred [chan]])) >> 8 ; /* => / 256 => FIXED_POINT_COEFF_BASE == 256 */ current = (bytecode * idelta) + predict ; @@ -309,7 +307,7 @@ msadpcm_decode_block (SF_PRIVATE *psf, MSADPCM_PRIVATE *pms) pms->samples [k] = current ; } ; - return 1 ; + return 0 ; } /* msadpcm_decode_block */ static sf_count_t @@ -323,7 +321,8 @@ msadpcm_read_block (SF_PRIVATE *psf, MSADPCM_PRIVATE *pms, short *ptr, int len) } ; if (pms->samplecount >= pms->samplesperblock) - msadpcm_decode_block (psf, pms) ; + if (msadpcm_decode_block (psf, pms) != 0) + return total ; count = (pms->samplesperblock - pms->samplecount) * pms->channels ; count = (len - indx > count) ? count : len - indx ; @@ -350,7 +349,8 @@ msadpcm_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) while (len > 0) { readcount = (len > 0x10000000) ? 0x10000000 : (int) len ; - count = msadpcm_read_block (psf, pms, ptr, readcount) ; + if ((count = msadpcm_read_block (psf, pms, ptr, readcount)) <= 0) + return -1 ; total += count ; len -= count ; @@ -364,6 +364,7 @@ msadpcm_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t msadpcm_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) { MSADPCM_PRIVATE *pms ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -372,13 +373,16 @@ msadpcm_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) return 0 ; pms = (MSADPCM_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; - count = msadpcm_read_block (psf, pms, sptr, readcount) ; + + if ((count = msadpcm_read_block (psf, pms, sptr, readcount)) <= 0) + return -1 ; + for (k = 0 ; k < readcount ; k++) - ptr [total + k] = sptr [k] << 16 ; + ptr [total + k] = arith_shift_left (sptr [k], 16) ; total += count ; len -= readcount ; if (count != readcount) @@ -390,6 +394,7 @@ msadpcm_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t msadpcm_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) { MSADPCM_PRIVATE *pms ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; @@ -400,11 +405,14 @@ msadpcm_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) pms = (MSADPCM_PRIVATE*) psf->codec_data ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; - count = msadpcm_read_block (psf, pms, sptr, readcount) ; + + if ((count = msadpcm_read_block (psf, pms, sptr, readcount)) <= 0) + return -1 ; + for (k = 0 ; k < readcount ; k++) ptr [total + k] = normfact * (float) (sptr [k]) ; total += count ; @@ -418,22 +426,25 @@ msadpcm_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t msadpcm_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) { MSADPCM_PRIVATE *pms ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount = 0, count ; sf_count_t total = 0 ; double normfact ; - normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; - if (! psf->codec_data) return 0 ; pms = (MSADPCM_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; - count = msadpcm_read_block (psf, pms, sptr, readcount) ; + + if ((count = msadpcm_read_block (psf, pms, sptr, readcount)) <= 0) + return -1 ; + for (k = 0 ; k < readcount ; k++) ptr [total + k] = normfact * (double) (sptr [k]) ; total += count ; @@ -441,6 +452,7 @@ msadpcm_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) if (count != readcount) break ; } ; + return total ; } /* msadpcm_read_d */ @@ -494,12 +506,12 @@ msadpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) */ void -msadpcm_write_adapt_coeffs (SF_PRIVATE *psf) +wavlike_msadpcm_write_adapt_coeffs (SF_PRIVATE *psf) { int k ; - for (k = 0 ; k < MSADPCM_ADAPT_COEFF_COUNT ; k++) - psf_binheader_writef (psf, "22", AdaptCoeff1 [k], AdaptCoeff2 [k]) ; -} /* msadpcm_write_adapt_coeffs */ + for (k = 0 ; k < WAVLIKE_MSADPCM_ADAPT_COEFF_COUNT ; k++) + psf_binheader_writef (psf, "22", BHW2 (AdaptCoeff1 [k]), BHW2 (AdaptCoeff2 [k])) ; +} /* wavlike_msadpcm_write_adapt_coeffs */ /*========================================================================================== */ @@ -674,6 +686,7 @@ msadpcm_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t msadpcm_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) { MSADPCM_PRIVATE *pms ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -682,8 +695,8 @@ msadpcm_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) return 0 ; pms = (MSADPCM_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -700,6 +713,7 @@ msadpcm_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t msadpcm_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) { MSADPCM_PRIVATE *pms ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -711,8 +725,8 @@ msadpcm_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -729,6 +743,7 @@ msadpcm_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t msadpcm_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) { MSADPCM_PRIVATE *pms ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -740,8 +755,8 @@ msadpcm_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) return 0 ; pms = (MSADPCM_PRIVATE*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) diff --git a/lib-src/libsndfile/src/new.c b/lib-src/libsndfile/src/new.c new file mode 100644 index 000000000..23f3087f1 --- /dev/null +++ b/lib-src/libsndfile/src/new.c @@ -0,0 +1,116 @@ +/* +** Copyright (C) 2002-2011 Erik de Castro Lopo +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" + +#if (ENABLE_EXPERIMENTAL_CODE == 0) + +int +new_open (SF_PRIVATE *psf) +{ if (psf) + return SFE_UNIMPLEMENTED ; + return (psf && 0) ; +} /* new_open */ + +#else + +/*------------------------------------------------------------------------------ +** Macros to handle big/little endian issues. +*/ + +/*------------------------------------------------------------------------------ +** Typedefs. +*/ + +/*------------------------------------------------------------------------------ +** Private static functions. +*/ + +static int new_read_header (SF_PRIVATE *psf) ; + +/*------------------------------------------------------------------------------ +** Public function. +*/ + +int +new_open (SF_PRIVATE *psf) +{ int subformat, error = 0 ; + + if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) + return SFE_UNIMPLEMENTED ; + + if ((error = new_read_header (psf))) + return error ; + + if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_WVE) + return SFE_BAD_OPEN_FORMAT ; + + subformat = SF_CODEC (psf->sf.format) ; + + return error ; +} /* new_open */ + +/*------------------------------------------------------------------------------ +*/ + +static int +new_read_header (SF_PRIVATE *psf) +{ int marker ; + + /* Set position to start of file to begin reading header. */ + psf_binheader_readf (psf, "pm", 0, &marker) ; + if (marker != ALAW_MARKER) + return SFE_WVE_NOT_WVE ; + + psf_binheader_readf (psf, "m", &marker) ; + if (marker != SOUN_MARKER) + return SFE_WVE_NOT_WVE ; + + psf_binheader_readf (psf, "m", &marker) ; + if (marker != DFIL_MARKER) + return SFE_WVE_NOT_WVE ; + + psf_log_printf (psf, "Read only : Psion Alaw\n" + " Sample Rate : 8000\n" + " Channels : 1\n" + " Encoding : A-law\n") ; + + psf->dataoffset = 0x20 ; + psf->datalength = psf->filelength - psf->dataoffset ; + + psf->sf.format = SF_FORMAT_WVE | SF_FORMAT_ALAW ; + psf->sf.samplerate = 8000 ; + psf->sf.frames = psf->datalength ; + psf->sf.channels = 1 ; + + return alaw_init (psf) ; +} /* new_read_header */ + +/*------------------------------------------------------------------------------ +*/ + +#endif diff --git a/lib-src/libsndfile/src/nist.c b/lib-src/libsndfile/src/nist.c index cd3afac84..657c4d41f 100644 --- a/lib-src/libsndfile/src/nist.c +++ b/lib-src/libsndfile/src/nist.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -118,17 +118,12 @@ static char bad_header [] = static int nist_read_header (SF_PRIVATE *psf) -{ char *psf_header ; +{ char psf_header [NIST_HEADER_LENGTH + 2] ; int bitwidth = 0, count, encoding ; unsigned bytes = 0 ; char str [64], *cptr ; long samples ; - psf_header = psf->u.cbuf ; - - if (sizeof (psf->header) <= NIST_HEADER_LENGTH) - return SFE_INTERNAL ; - /* Go to start of file and read in the whole header. */ psf_binheader_readf (psf, "pb", 0, psf_header, NIST_HEADER_LENGTH) ; @@ -316,8 +311,8 @@ nist_write_header (SF_PRIVATE *psf, int calc_length) end_str = "error" ; /* Clear the whole header. */ - memset (psf->header, 0, sizeof (psf->header)) ; - psf->headindex = 0 ; + memset (psf->header.ptr, 0, psf->header.len) ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; @@ -362,9 +357,9 @@ nist_write_header (SF_PRIVATE *psf, int calc_length) psf_asciiheader_printf (psf, "end_head\n") ; /* Zero fill to dataoffset. */ - psf_binheader_writef (psf, "z", (size_t) (NIST_HEADER_LENGTH - psf->headindex)) ; + psf_binheader_writef (psf, "z", BHWz ((size_t) (NIST_HEADER_LENGTH - psf->header.indx))) ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; diff --git a/lib-src/libsndfile/src/nms_adpcm.c b/lib-src/libsndfile/src/nms_adpcm.c new file mode 100644 index 000000000..3dda96803 --- /dev/null +++ b/lib-src/libsndfile/src/nms_adpcm.c @@ -0,0 +1,1156 @@ +/* +** Copyright (C) 1999-2014 Erik de Castro Lopo +** Copyright (C) 2017 Arthur Taylor +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +/* +** This is a Natural MicroSystems ADPCM encoder/decoder. It converts 14 bit linear +** PCM to and from either a 2, 3, or 4 bit ADPCM. NMS-ADPCM does not have appeared +** to have ever been publicly documented, and appears to have debuted in the early +** 90s in the Natural Access suite of PC-based telephony products. Raw NMS ADPCM +** files usually have a .vce extension, although this does not encode what bitrate +** is used. +** +** NMS-ADPCM is an 'optimised variation' of the ITU G.726 ADPCM scheme. The dominant +** variation is that it removes the tone (modem) operation mode, and it's associated +** voice/modem transition detection. This simplifies the computation of the step +** size multiplier, as all operations on it remain in a log domain. +*/ + +#include "sfconfig.h" + +#include + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" + + +#define NMS_SAMPLES_PER_BLOCK 160 +#define NMS_BLOCK_SHORTS_32 41 +#define NMS_BLOCK_SHORTS_24 31 +#define NMS_BLOCK_SHORTS_16 21 + +/* Variable names from ITU G.726 spec */ +struct nms_adpcm_state +{ /* Log of the step size multiplier. Operated on by codewords. */ + int yl ; + + /* Quantizer step size multiplier. Generated from yl. */ + int y ; + + /* Coefficents of the pole predictor */ + int a [2] ; + + /* Coefficents of the zero predictor */ + int b [6] ; + + /* Previous quantized deltas (multiplied by 2^14) */ + int d_q [7] ; + + /* d_q [x] + s_ez [x], used by the pole-predictor for signs only. */ + int p [3] ; + + /* Previous reconstructed signal values. */ + int s_r [2] ; + + /* Zero predictor components of the signal estimate. */ + int s_ez ; + + /* Signal estimate, (including s_ez). */ + int s_e ; + + /* The most recent codeword (enc:generated, dec:inputted) */ + int Ik ; + + int parity ; + + /* + ** Offset into code tables for the bitrate. + ** 2-bit words: +0 + ** 3-bit words: +8 + ** 4-bit words: +16 + */ + int t_off ; +} ; + +enum nms_enc_type +{ NMS16, + NMS24, + NMS32 +} ; + +typedef struct +{ struct nms_adpcm_state state ; + + /* The encoding type */ + enum nms_enc_type type ; + + int shortsperblock ; + int blocks_total ; + int block_curr, sample_curr ; + + unsigned short block [NMS_BLOCK_SHORTS_32] ; + short samples [NMS_SAMPLES_PER_BLOCK] ; +} NMS_ADPCM_PRIVATE ; + +/* Pre-computed exponential interval used in the antilog approximation. */ +static unsigned int table_expn [] = +{ 0x4000, 0x4167, 0x42d5, 0x444c, 0x45cb, 0x4752, 0x48e2, 0x4a7a, + 0x4c1b, 0x4dc7, 0x4f7a, 0x5138, 0x52ff, 0x54d1, 0x56ac, 0x5892, + 0x5a82, 0x5c7e, 0x5e84, 0x6096, 0x62b4, 0x64dd, 0x6712, 0x6954, + 0x6ba2, 0x6dfe, 0x7066, 0x72dc, 0x7560, 0x77f2, 0x7a93, 0x7d42, +} ; + +/* Table mapping codewords to scale factor deltas. */ +static int table_scale_factor_step [] = +{ 0x0, 0x0, 0x0, 0x0, 0x4b0, 0x0, 0x0, 0x0, /* 2-bit */ + -0x3c, 0x0, 0x90, 0x0, 0x2ee, 0x0, 0x898, 0x0, /* 3-bit */ + -0x30, 0x12, 0x6b, 0xc8, 0x188, 0x2e0, 0x551, 0x1150, /* 4-bit */ +} ; + +/* Table mapping codewords to quantized delta interval steps. */ +static unsigned int table_step [] = +{ 0x73F, 0, 0, 0, 0x1829, 0, 0, 0, /* 2-bit */ + 0x3EB, 0, 0xC18, 0, 0x1581, 0, 0x226E, 0, /* 3-bit */ + 0x20C, 0x635, 0xA83, 0xF12, 0x1418, 0x19E3, 0x211A, 0x2BBA, /* 4-bit */ +} ; + +/* Binary search lookup table for quantizing using table_step. */ +static int table_step_search [] = +{ 0, 0x1F6D, 0, -0x1F6D, 0, 0, 0, 0, /* 2-bit */ + 0x1008, 0x1192, 0, -0x219A, 0x1656, -0x1656, 0, 0, /* 3-bit */ + 0x872, 0x1277, -0x8E6, -0x232B, 0xD06, -0x17D7, -0x11D3, 0, /* 4-bit */ +} ; + + +/*============================================================================================ +** Static functions. +*/ + +static void nms_adpcm_update (struct nms_adpcm_state *s) ; +static void nms_adpcm_codec_init (struct nms_adpcm_state *s, enum nms_enc_type type) ; + +static int16_t nms_adpcm_reconstruct_sample (struct nms_adpcm_state *s, uint8_t I) ; +static uint8_t nms_adpcm_encode_sample (struct nms_adpcm_state *s, int16_t sl) ; +static int16_t nms_adpcm_decode_sample (struct nms_adpcm_state *s, uint8_t code) ; + +static void nms_adpcm_block_pack_16 (const int16_t codewords [], uint16_t block [], int16_t rms) ; +static void nms_adpcm_block_pack_24 (const int16_t codewords [], uint16_t block [], int16_t rms) ; +static void nms_adpcm_block_pack_32 (const int16_t codewords [], uint16_t block [], int16_t rms) ; + +static void nms_adpcm_block_unpack_16 (const uint16_t block [], int16_t codewords [], int16_t *rms) ; +static void nms_adpcm_block_unpack_24 (const uint16_t block [], int16_t codewords [], int16_t *rms) ; +static void nms_adpcm_block_unpack_32 (const uint16_t block [], int16_t codewords [], int16_t *rms) ; + +static int nms_adpcm_decode_block (SF_PRIVATE *psf, NMS_ADPCM_PRIVATE *pnms, uint16_t block [], int16_t samples []) ; +static int nms_adpcm_encode_block (SF_PRIVATE *psf, NMS_ADPCM_PRIVATE *pnms, int16_t samples [], uint16_t block []) ; + +static sf_count_t nms_adpcm_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; +static sf_count_t nms_adpcm_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; +static sf_count_t nms_adpcm_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; +static sf_count_t nms_adpcm_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; + +static sf_count_t nms_adpcm_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; +static sf_count_t nms_adpcm_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; +static sf_count_t nms_adpcm_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; +static sf_count_t nms_adpcm_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; + +static int nms_adpcm_close (SF_PRIVATE *psf) ; +static sf_count_t nms_adpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; + +/* +** An exponential function (antilog) approximation. +** +** Maps [1,20480] to [1,1024] in an exponential relationship. This is +** approximately ret = b^exp where b = e^(ln(1024)/ln(20480)) ~= 1.0003385 +*/ +static inline int +nms_adpcm_antilog (int exp) +{ int ret ; + + ret = 0x1000 ; + ret += (((exp & 0x3f) * 0x166b) >> 12) ; + ret *= table_expn [(exp & 0x7c0) >> 6] ; + ret >>= (26 - (exp >> 11)) ; + + return ret ; +} /* nms_adpcm_antilog */ + +static void +nms_adpcm_update (struct nms_adpcm_state *s) +{ /* Variable names from ITU G.726 spec */ + int a1ul ; + int fa1 ; + int i ; + + /* Decay and Modify the scale factor in the log domain based on the codeword. */ + s->yl = ((s->yl *0xf8) >> 8) + table_scale_factor_step [s->t_off + (s->Ik & 7)] ; + if (s->yl < 2171) + s->yl = 2171 ; + else if (s->yl > 20480) + s->yl = 20480 ; + s->y = nms_adpcm_antilog (s->yl) ; + + /* Update the zero predictor coefficents. */ + for (i = 0 ; i < 6 ; i++) + { s->b [i] = (s->b [i] * 0xff) >> 8 ; + if ((s->d_q [0] ^ s->d_q [i + 1]) >= 0) + s->b [i] += 128 ; + else + s->b [i] -= 128 ; + } + + /* Update the pole predictor coefficents. */ + fa1 = s->a [0] >> 5 ; + if (fa1 < -256) + fa1 = -256 ; + else if (fa1 > 256) + fa1 = 256 ; + + s->a [0] = (0xff * s->a [0]) >> 8 ; + if (s->p [0] != 0 && s->p [1] != 0 && ((s->p [0] ^ s->p [1]) < 0)) + s->a [0] -= 192 ; + else + { s->a [0] += 192 ; + fa1 = -fa1 ; + } + + s->a [1] = fa1 + ((0xfe * s->a [1]) >> 8) ; + if (s->p [0] != 0 && s->p [2] != 0 && ((s->p [0] ^ s->p [2]) < 0)) + s->a [1] -= 128 ; + else + s->a [1] += 128 ; + + /* Stability constraints. */ + if (s->a [1] < -12288) + s->a [1] = -12288 ; + else if (s->a [1] > 12288) + s->a [1] = 12288 ; + a1ul = 15360 - s->a [1] ; + if (s->a [0] >= a1ul) + s->a [0] = a1ul ; + else + { a1ul = -a1ul ; + if (s->a [0] < a1ul) + s->a [0] = a1ul ; + } ; + + /* Compute the zero predictor estimate. Rotate past deltas too. */ + s->s_ez = 0 ; + for (i = 5 ; i >= 0 ; i--) + { s->s_ez += s->d_q [i] * s->b [i] ; + s->d_q [i + 1] = s->d_q [i] ; + } ; + + /* Compute the signal estimate. */ + s->s_e = s->a [0] * s->s_r [0] + s->a [1] * s->s_r [1] + s->s_ez ; + + /* Return to scale */ + s->s_ez >>= 14 ; + s->s_e >>= 14 ; + + /* Rotate members to prepare for next iteration. */ + s->s_r [1] = s->s_r [0] ; + s->p [2] = s->p [1] ; + s->p [1] = s->p [0] ; +} /* nms_adpcm_update */ + + +static int16_t +nms_adpcm_reconstruct_sample (struct nms_adpcm_state *s, uint8_t I) +{ /* Variable names from ITU G.726 spec */ + int dqx ; + + /* + ** The ordering of the 12-bit right-shift is a precision loss. It agrees + ** with the output of a 16-bit NMSVCE.DLL, but disagrees with the output + ** of a CG6565 board. + */ + + /* Look up the delta, scale and sign it. */ + dqx = table_step [s->t_off + (I & 7)] * s->y ; + if (I & 8) + dqx = -dqx ; + + /* Take from delta scale to actual scale. */ + dqx >>= 12 ; + + /* Set variables used as input for the next predictor update. */ + s->d_q [0] = dqx ; + s->s_r [0] = s->s_e + dqx ; + s->Ik = I & 0xf ; + s->p [0] = s->s_ez + dqx ; + + return s->s_r [0] ; +} /* nms_adpcm_reconstruct_sample */ + +static void +nms_adpcm_codec_init (struct nms_adpcm_state *s, enum nms_enc_type type) +{ memset (s, 0, sizeof (struct nms_adpcm_state)) ; + s->t_off = (type == NMS32) ? 16 : (type == NMS24) ? 8 : 0 ; +} /* nms_adpcm_codec_init */ + +/* +** nms_adpcm_encode_sample() +** +** Encode a linear 16-bit pcm sample into a 2,3, or 4 bit NMS-ADPCM codeword +** using and updating the predictor state. +*/ +static uint8_t +nms_adpcm_encode_sample (struct nms_adpcm_state *s, int16_t sl) +{ /* Variable names from ITU G.726 spec */ + int d ; + uint8_t I ; + + /* Down scale the sample from 16 => ~14 bits. */ + sl = (sl * 0x1fdf) / 0x7fff ; + + /* Compute estimate, and delta from actual value */ + nms_adpcm_update (s) ; + d = sl - s->s_e ; + + /* + ** Vary the input signal. Not sure why. It agrees with NMSVCE.DLL and + ** a CG6565 board. + */ + if (s->parity ^= 1) + d -= 2 ; + + /* Encode the delta signed-ness (Codeword bit 4) */ + if (d < 0) + { d = -d ; + I = 8 ; + } + else + I = 0 ; + + /* Increase magnitude to be in the range of the delta steps */ + d <<= 13 ; + + /* Quantize the delta using a binary search. */ + d += table_step_search [s->t_off + 3] * s->y ; + /* Codeword bit 3 */ + if (d >= 0) + { d += table_step_search [s->t_off + 5] * s->y ; + /* Codeword bit 2 */ + if (d >= 0) + { d += table_step_search [s->t_off + 6] * s->y ; + /* Codeword bit 1 */ + if (d >= 0) + I |= 7 ; + else + I |= 6 ; + } + else + { d += table_step_search [s->t_off + 4] * s->y ; + /* Codeword bit 1 */ + if (d >= 0) + I |= 5 ; + else + I |= 4 ; + } ; + } + else { + d += table_step_search [s->t_off + 1] * s->y ; + /* Codeword bit 2 */ + if (d >= 0) + { d += table_step_search [s->t_off + 2] * s->y ; + /* Codeword bit 1 */ + if (d >= 0) + I |= 3 ; + else + I |= 2 ; + } + else { + d += table_step_search [s->t_off + 0] * s->y ; + /* Codeword bit 1 */ + if (d >= 0) + I |= 1 ; + else + I |= 0 ; + } ; + } ; + /* What's left in d is actually our quantizer noise. */ + + /* Reduce the codeword size for the bitrate accordingly. */ + if (s->t_off == 8) + I &= 0xe ; + else if (s->t_off == 0) + I &= 0xc ; + + /* Call reconstruct for side effects preparing for the next update. */ + nms_adpcm_reconstruct_sample (s, I) ; + + return I ; +} /* nms_adpcm_encode_sample */ + +/* +** nms_adpcm_decode_sample() +** +** Given a 2,3 or 4-bit NMS-ADPCM codeword, decode the next 16-bit linear PCM +** sample using and updating the predictor state. +*/ +static int16_t +nms_adpcm_decode_sample (struct nms_adpcm_state *s, uint8_t I) +{ int sl ; + + nms_adpcm_update (s) ; + sl = nms_adpcm_reconstruct_sample (s, I) ; + + /* Clamp to [-0x1fdf, 0x1fdf] (just under 14 bits resolution) */ + if (sl < -0x1fdf) + sl = -0x1fdf ; + else if (sl > 0x1fdf) + sl = 0x1fdf ; + + /* Expand from 14 to 16 bits */ + sl = (sl * 0x7fff) / 0x1fdf ; + + return (int16_t) sl ; +} /* nms_adpcm_decode_sample */ + +/** +** NMS ADPCM Codeword packing scheme. +** +** The serialized form of NMS-ADPCM operates on blocks of 160 mono samples +** (20ms at 8000Hz.) Blocks are 42, 62 and 82 bytes in size for the 2, 3, and +** 4 bit codeword sizes respectively. The data is treated as an array of +** little-endian 2-byte shorts, and the data is packed into the first 20, 30 +** or 40 shorts. The last short represents the block's root-mean-square +** average. This is apparently an optimization so that energy/silence +** detection processes can avoid decoding a block. +** +** All codewords are nibbles, with the least significant bits dropped as +** required for the 3 and 2 bit codeword sizes. +** +** Nibbles are packed into shorts in order of most significant to least. The +** 4-bit scheme is trivial. The three bit scheme reconstructs a fourth sample +** from the leftover bits of the proceeding three samples. The 2-bit scheme +** uses a two-pass, left two bit shift. +*/ + +/* +** Reads 21 shorts from block, unpacks 160 codewords of 2-bits each, writing +** each to its sequential array index of codewords. If rms is non-null, the +** read block rms is copied to its location. +*/ +static void +nms_adpcm_block_unpack_16 (const uint16_t block [], int16_t codewords [], int16_t *rms) +{ int k ; + uint16_t w = 0 ; + + for (k = 0 ; k < NMS_SAMPLES_PER_BLOCK ; ) + { /* + ** k % 8 == [0-3]: Top 2-bits of a nibble + ** k % 8 == [4-7]: Bottom 2-bits of a nibble + */ + if ((k & 4) == 0) + w = *(block++) ; + else + w <<= 2 ; + codewords [k++] = (w >> 12) & 0xc ; + codewords [k++] = (w >> 8) & 0xc ; + codewords [k++] = (w >> 4) & 0xc ; + codewords [k++] = w & 0xc ; + } ; + + /* + ** Every block ends with a short representing a RMS-approximation for the + ** block. + **/ + if (rms) + *rms = *block ; +} /* nms_adpcm_unpack_16 */ + +/* +** Reads 31 shorts from block, unpacks 160 codewords of 3-bits each, writing +** each to its sequential array index of codewords. If rms is non-null, the +** read block rms is copied to its location. +*/ +static void +nms_adpcm_block_unpack_24 (const uint16_t block [], int16_t codewords [], int16_t *rms) +{ int k ; + uint16_t w = 0, residual = 0 ; + + for (k = 0 ; k < NMS_SAMPLES_PER_BLOCK ; ) + { /* + ** k % 16 == [0, 11]: Unpack new nibble, build residual + ** k % 16 == [12, 15]: Unpack residual + */ + if ((k & 12) != 12) + { w = *(block++) ; + residual = (residual << 1) | (w & 0x1111) ; + } + else + { w = residual << 1 ; + residual = 0 ; + } ; + codewords [k++] = (w >> 12) & 0xe ; + codewords [k++] = (w >> 8) & 0xe ; + codewords [k++] = (w >> 4) & 0xe ; + codewords [k++] = w & 0xe ; + } ; + + /* + ** Every block ends with a short representing a RMS-approximation for the + ** block. + **/ + if (rms) + *rms = *block ; +} /* nms_adpcm_unpack_24 */ + +/* +** Reads 41 shorts from block, unpacks 160 codewords of 4-bits each, writing +** each to its sequential array index of codewords. If rms is non-null, the +** read block rms is copied to its location. +*/ +static void +nms_adpcm_block_unpack_32 (const uint16_t block [], int16_t codewords [], int16_t *rms) +{ int k ; + uint16_t w = 0 ; + + for (k = 0 ; k < NMS_SAMPLES_PER_BLOCK ; ) + { w = *(block++) ; + codewords [k++] = (w >> 12) & 0xf ; + codewords [k++] = (w >> 8) & 0xf ; + codewords [k++] = (w >> 4) & 0xf ; + codewords [k++] = w & 0xf ; + } ; + /* + ** Every block ends with a short representing a RMS-approximation for the + ** block. + **/ + if (rms) + *rms = *block ; +} /* nms_adpcm_unpack_32 */ + +/* +** Reads 160 indicies of codewords for one 2-bit codeword each, packing them +** into 20 shorts of block, and writes the short rms for a total of 42 bytes. +*/ +static void +nms_adpcm_block_pack_16 (const int16_t codewords [], uint16_t block [], int16_t rms) +{ int k ; + uint16_t w ; + + for (k = 0 ; k < NMS_SAMPLES_PER_BLOCK ; ) + { w = codewords [k++] << 12 ; + w |= codewords [k++] << 8 ; + w |= codewords [k++] << 4 ; + w |= codewords [k++] ; + w |= codewords [k++] << 10 ; + w |= codewords [k++] << 6 ; + w |= codewords [k++] << 2 ; + w |= codewords [k++] >> 2 ; + + *(block++) = w ; + } ; + + /* Every block ends with a short representing the blocks RMS */ + *block = rms ; +} /* nms_adpcm_pack_16 */ + +/* +** Reads 160 indicies of codewords for one 3-bit codeword each, packing them +** into 30 shorts of block, and writes the short rms for a total of 62 bytes. +*/ +static void +nms_adpcm_block_pack_24 (const int16_t codewords [], uint16_t block [], int16_t rms) +{ int k ; + uint16_t w [3] ; + uint16_t residual ; + + for (k = 0 ; k < NMS_SAMPLES_PER_BLOCK ; ) + { w [0] = codewords [k++] << 12 ; + w [0] |= codewords [k++] << 8 ; + w [0] |= codewords [k++] << 4 ; + w [0] |= codewords [k++] ; + + w [1] = codewords [k++] << 12 ; + w [1] |= codewords [k++] << 8 ; + w [1] |= codewords [k++] << 4 ; + w [1] |= codewords [k++] ; + + w [2] = codewords [k++] << 12 ; + w [2] |= codewords [k++] << 8 ; + w [2] |= codewords [k++] << 4 ; + w [2] |= codewords [k++] ; + + residual = codewords [k++] << 12 ; + residual |= codewords [k++] << 8 ; + residual |= codewords [k++] << 4 ; + residual |= codewords [k++] ; + + residual >>= 1 ; + w [2] |= (residual & 0x1111) ; + residual >>= 1 ; + w [1] |= (residual & 0x1111) ; + residual >>= 1 ; + w [0] |= (residual & 0x1111) ; + + *(block++) = w [0] ; + *(block++) = w [1] ; + *(block++) = w [2] ; + } ; + + /* Every block ends with a short representing the blocks RMS */ + *block = rms ; +} /* nms_adpcm_pack_24 */ + +/* +** Reads 160 indicies of codewords for one 4-bit codeword each, packing them +** into 40 shorts of block, and writes the short rms for a total of 82 bytes. +*/ +static void +nms_adpcm_block_pack_32 (const int16_t codewords [], uint16_t block [], int16_t rms) +{ int k ; + uint16_t w ; + + for (k = 0 ; k < NMS_SAMPLES_PER_BLOCK ; ) + { w = codewords [k++] << 12 ; + w |= codewords [k++] << 8 ; + w |= codewords [k++] << 4 ; + w |= codewords [k++] ; + + *(block++) = w ; + } ; + + /* Every block ends with a short representing the blocks RMS */ + *block = rms ; +} /*nms_adpcm_block_pack_32 */ + +static int +nms_adpcm_decode_block (SF_PRIVATE *psf, NMS_ADPCM_PRIVATE *pnms, uint16_t block [], int16_t samples []) +{ int k ; + + switch (pnms->type) + { case NMS16 : + nms_adpcm_block_unpack_16 (block, samples, NULL) ; + break ; + case NMS24 : + nms_adpcm_block_unpack_24 (block, samples, NULL) ; + break ; + case NMS32 : + nms_adpcm_block_unpack_32 (block, samples, NULL) ; + break ; + + default : + psf_log_printf (psf, "*** Error : Unhandled NMS ADPCM type %d.\n", pnms->type) ; + return 0 ; + } ; + + for (k = 0 ; k < NMS_SAMPLES_PER_BLOCK ; k++) + samples [k] = nms_adpcm_decode_sample (&pnms->state, samples [k]) ; + + return NMS_SAMPLES_PER_BLOCK ; +} /* nms_adpcm_decode_block */ + +static int +nms_adpcm_encode_block (SF_PRIVATE *psf, NMS_ADPCM_PRIVATE *pnms, int16_t samples [], uint16_t block []) +{ int k ; + unsigned int rms = 0 ; + + /* + ** The rms we write is a complete lie. Considering that the various + ** other implementations I've tested don't completely agree, that this data + ** is usually ignored, and except for some weird offloading of "energy + ** detection", so long as we don't write zeros for non-zero data, I don't + ** think it really matters. + */ + + for (k = 0 ; k < NMS_SAMPLES_PER_BLOCK ; k++) + { rms += (samples [k] * samples [k]) >> 2 ; + samples [k] = nms_adpcm_encode_sample (&pnms->state, samples [k]) ; + } ; + + rms <<= 12 ; + switch (pnms->type) + { case NMS16 : + nms_adpcm_block_pack_16 (samples, block, rms) ; + break ; + case NMS24 : + nms_adpcm_block_pack_24 (samples, block, rms) ; + break ; + case NMS32 : + nms_adpcm_block_pack_32 (samples, block, rms) ; + break ; + + default : + psf_log_printf (psf, "*** Error : Unhandled NMS ADPCM type %d.\n", pnms->type) ; + return 0 ; + } ; + + return NMS_SAMPLES_PER_BLOCK ; +} /* nms_adpcm_encode_block */ + +static int +psf_nms_adpcm_decode_block (SF_PRIVATE *psf, NMS_ADPCM_PRIVATE *pnms) +{ int k ; + + if ((k = psf_fread (pnms->block, sizeof (short), pnms->shortsperblock, psf)) != pnms->shortsperblock) + { psf_log_printf (psf, "*** Warning : short read (%d != %d).\n", k, pnms->shortsperblock) ; + memset (pnms->block + (k * sizeof (short)), 0, (pnms->shortsperblock - k) * sizeof (short)) ; + } ; + + if (CPU_IS_BIG_ENDIAN) + endswap_short_array ((signed short *) pnms->block, pnms->shortsperblock) ; + + nms_adpcm_decode_block (psf, pnms, pnms->block, pnms->samples) ; + + return 1 ; +} /* nms_adpcm_decode_block */ + +static int +nms_adpcm_read_block (SF_PRIVATE *psf, NMS_ADPCM_PRIVATE *pnms, short *ptr, int len) +{ int count, indx = 0 ; + + while (indx < len) + { if (pnms->sample_curr >= NMS_SAMPLES_PER_BLOCK) + { pnms->block_curr ++ ; + pnms->sample_curr = 0 ; + } ; + + if (pnms->block_curr > pnms->blocks_total) + { memset (&(ptr [indx]), 0, (len - indx) * sizeof (short)) ; + return indx ; + } ; + + if (pnms->sample_curr == 0) + psf_nms_adpcm_decode_block (psf, pnms) ; + + count = NMS_SAMPLES_PER_BLOCK - pnms->sample_curr ; + if (len - indx < count) + count = len - indx ; + + memcpy (&(ptr [indx]), &(pnms->samples [pnms->sample_curr]), count * sizeof (short)) ; + indx += count ; + pnms->sample_curr += count ; + } ; + + return indx ; +} /* nms_adpcm_read_block */ + +static sf_count_t +nms_adpcm_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) +{ NMS_ADPCM_PRIVATE *pnms ; + int readcount, count ; + sf_count_t total = 0 ; + + if (psf->codec_data == NULL) + return 0 ; + pnms = (NMS_ADPCM_PRIVATE*) psf->codec_data ; + + while (len > 0) + { readcount = (len > 0x10000000) ? 0x10000000 : (int) len ; + + count = nms_adpcm_read_block (psf, pnms, ptr, readcount) ; + + total += count ; + len -= count ; + + if (count != readcount) + break ; + } ; + + return total ; +} /* nms_adpcm_read_s */ + +static sf_count_t +nms_adpcm_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) +{ BUF_UNION ubuf ; + NMS_ADPCM_PRIVATE *pnms ; + short *sptr ; + int k, bufferlen, readcount = 0, count ; + sf_count_t total = 0 ; + + if (psf->codec_data == NULL) + return 0 ; + pnms = (NMS_ADPCM_PRIVATE *) psf->codec_data ; + + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; + while (len > 0) + { readcount = (len >= bufferlen) ? bufferlen : len ; + count = nms_adpcm_read_block (psf, pnms, sptr, readcount) ; + + for (k = 0 ; k < readcount ; k++) + ptr [total + k] = arith_shift_left (sptr [k], 16) ; + + total += count ; + len -= readcount ; + if (count != readcount) + break ; + } ; + + return total ; +} /* nms_adpcm_read_i */ + +static sf_count_t +nms_adpcm_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) +{ BUF_UNION ubuf ; + NMS_ADPCM_PRIVATE *pnms ; + short *sptr ; + int k, bufferlen, readcount = 0, count ; + sf_count_t total = 0 ; + float normfact ; + + if (psf->codec_data == NULL) + return 0 ; + pnms = (NMS_ADPCM_PRIVATE*) psf->codec_data ; + + normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; + + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; + while (len > 0) + { readcount = (len >= bufferlen) ? bufferlen : len ; + count = nms_adpcm_read_block (psf, pnms, sptr, readcount) ; + for (k = 0 ; k < readcount ; k++) + ptr [total + k] = normfact * sptr [k] ; + + total += count ; + len -= readcount ; + if (count != readcount) + break ; + } ; + + return total ; +} /* nms_adpcm_read_f */ + +static sf_count_t +nms_adpcm_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) +{ BUF_UNION ubuf ; + NMS_ADPCM_PRIVATE *pnms ; + short *sptr ; + int k, bufferlen, readcount = 0, count ; + sf_count_t total = 0 ; + double normfact ; + + if (psf->codec_data == NULL) + return 0 ; + pnms = (NMS_ADPCM_PRIVATE*) psf->codec_data ; + + normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; + + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; + while (len > 0) + { readcount = (len >= bufferlen) ? bufferlen : len ; + count = nms_adpcm_read_block (psf, pnms, sptr, readcount) ; + for (k = 0 ; k < readcount ; k++) + ptr [total + k] = normfact * (double) (sptr [k]) ; + + total += count ; + len -= readcount ; + if (count != readcount) + break ; + } ; + + return total ; +} /* nms_adpcm_read_d */ + +static int +psf_nms_adpcm_encode_block (SF_PRIVATE *psf, NMS_ADPCM_PRIVATE *pnms) +{ int k ; + + /* Encode the samples. */ + nms_adpcm_encode_block (psf, pnms, pnms->samples, pnms->block) ; + + if (CPU_IS_BIG_ENDIAN) + endswap_short_array ((signed short *) pnms->block, pnms->shortsperblock) ; + + /* Write the block to disk. */ + if ((k = psf_fwrite (pnms->block, sizeof (short), pnms->shortsperblock, psf)) != pnms->shortsperblock) + psf_log_printf (psf, "*** Warning : short write (%d != %d).\n", k, pnms->shortsperblock) ; + + pnms->sample_curr = 0 ; + pnms->block_curr ++ ; + + return 1 ; +} /* psf_nms_adpcm_encode_block */ + +static int +nms_adpcm_write_block (SF_PRIVATE *psf, NMS_ADPCM_PRIVATE *pnms, const short *ptr, int len) +{ int count, total = 0, indx = 0 ; + + while (indx < len) + { count = NMS_SAMPLES_PER_BLOCK - pnms->sample_curr ; + + if (count > len - indx) + count = len - indx ; + + memcpy (&(pnms->samples [pnms->sample_curr]), &(ptr [indx]), count * sizeof (short)) ; + indx += count ; + pnms->sample_curr += count ; + total = indx ; + + if (pnms->sample_curr >= NMS_SAMPLES_PER_BLOCK) + psf_nms_adpcm_encode_block (psf, pnms) ; + } ; + + return total ; +} /* nms_adpcm_write_block */ + +static sf_count_t +nms_adpcm_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) +{ NMS_ADPCM_PRIVATE *pnms ; + int writecount, count ; + sf_count_t total = 0 ; + + if (psf->codec_data == NULL) + return 0 ; + pnms = (NMS_ADPCM_PRIVATE*) psf->codec_data ; + + while (len > 0) + { writecount = (len > 0x10000000) ? 0x10000000 : (int) len ; + + count = nms_adpcm_write_block (psf, pnms, ptr, writecount) ; + + total += count ; + len -= count ; + if (count != writecount) + break ; + } ; + + return total ; +} /* nms_adpcm_write_s */ + +static sf_count_t +nms_adpcm_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) +{ BUF_UNION ubuf ; + NMS_ADPCM_PRIVATE *pnms ; + short *sptr ; + int k, bufferlen, writecount = 0, count ; + sf_count_t total = 0 ; + + if (psf->codec_data == NULL) + return 0 ; + pnms = (NMS_ADPCM_PRIVATE*) psf->codec_data ; + + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; + while (len > 0) + { writecount = (len >= bufferlen) ? bufferlen : len ; + for (k = 0 ; k < writecount ; k++) + sptr [k] = ptr [total + k] >> 16 ; + count = nms_adpcm_write_block (psf, pnms, sptr, writecount) ; + + total += count ; + len -= writecount ; + if (count != writecount) + break ; + } ; + return total ; +} /* nms_adpcm_write_i */ + +static sf_count_t +nms_adpcm_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) +{ BUF_UNION ubuf ; + NMS_ADPCM_PRIVATE *pnms ; + short *sptr ; + int k, bufferlen, writecount = 0, count ; + sf_count_t total = 0 ; + float normfact ; + + if (psf->codec_data == NULL) + return 0 ; + pnms = (NMS_ADPCM_PRIVATE*) psf->codec_data ; + + normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x8000) : 1.0 ; + + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; + while (len > 0) + { writecount = (len >= bufferlen) ? bufferlen : len ; + for (k = 0 ; k < writecount ; k++) + sptr [k] = lrintf (normfact * ptr [total + k]) ; + count = nms_adpcm_write_block (psf, pnms, sptr, writecount) ; + + total += count ; + len -= writecount ; + if (count != writecount) + break ; + } ; + + return total ; +} /* nms_adpcm_write_f */ + +static sf_count_t +nms_adpcm_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) +{ BUF_UNION ubuf ; + NMS_ADPCM_PRIVATE *pnms ; + short *sptr ; + int k, bufferlen, writecount = 0, count ; + sf_count_t total = 0 ; + double normfact ; + + if (psf->codec_data == NULL) + return 0 ; + pnms = (NMS_ADPCM_PRIVATE*) psf->codec_data ; + + normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x8000) : 1.0 ; + + sptr = ubuf.sbuf ; + bufferlen = SF_BUFFER_LEN / sizeof (short) ; + while (len > 0) + { writecount = (len >= bufferlen) ? bufferlen : len ; + for (k = 0 ; k < writecount ; k++) + sptr [k] = lrint (normfact * ptr [total + k]) ; + count = nms_adpcm_write_block (psf, pnms, sptr, writecount) ; + + total += count ; + len -= writecount ; + if (count != writecount) + break ; + } ; + + return total ; +} /* nms_adpcm_write_d */ + +int +nms_adpcm_init (SF_PRIVATE *psf) +{ NMS_ADPCM_PRIVATE *pnms ; + + if (psf->codec_data != NULL) + { psf_log_printf (psf, "*** psf->codec_data is not NULL.\n") ; + return SFE_INTERNAL ; + } ; + + psf->sf.seekable = SF_FALSE ; + + if (psf->sf.channels != 1) + return SFE_NMS_ADPCM_NOT_MONO ; + + if ((pnms = calloc (1, sizeof (NMS_ADPCM_PRIVATE))) == NULL) + return SFE_MALLOC_FAILED ; + + psf->codec_data = (void*) pnms ; + + pnms->block_curr = 0 ; + pnms->sample_curr = 0 ; + + switch (SF_CODEC (psf->sf.format)) + { case SF_FORMAT_NMS_ADPCM_16 : + pnms->type = NMS16 ; + pnms->shortsperblock = NMS_BLOCK_SHORTS_16 ; + break ; + case SF_FORMAT_NMS_ADPCM_24 : + pnms->type = NMS24 ; + pnms->shortsperblock = NMS_BLOCK_SHORTS_24 ; + break ; + case SF_FORMAT_NMS_ADPCM_32 : + pnms->type = NMS32 ; + pnms->shortsperblock = NMS_BLOCK_SHORTS_32 ; + break ; + + default : return SFE_UNIMPLEMENTED ; + } ; + nms_adpcm_codec_init (&pnms->state, pnms->type) ; + + psf->filelength = psf_get_filelen (psf) ; + if (psf->filelength < psf->dataoffset) + psf->filelength = psf->dataoffset ; + + psf->datalength = psf->filelength - psf->dataoffset ; + if (psf->dataend > 0) + psf->datalength -= psf->filelength - psf->dataend ; + + if (psf->file.mode == SFM_READ) + { psf->read_short = nms_adpcm_read_s ; + psf->read_int = nms_adpcm_read_i ; + psf->read_float = nms_adpcm_read_f ; + psf->read_double = nms_adpcm_read_d ; + } + else if (psf->file.mode == SFM_WRITE) + { psf->write_short = nms_adpcm_write_s ; + psf->write_int = nms_adpcm_write_i ; + psf->write_float = nms_adpcm_write_f ; + psf->write_double = nms_adpcm_write_d ; + } ; + + if (psf->datalength % (pnms->shortsperblock * sizeof (short))) + { psf_log_printf (psf, "*** Odd psf->datalength (%D) should be a multiple of %d\n", + psf->datalength, pnms->shortsperblock * sizeof (short)) ; + pnms->blocks_total = (psf->datalength / (pnms->shortsperblock * sizeof (short))) + 1 ; + } + else + pnms->blocks_total = psf->datalength / (pnms->shortsperblock * sizeof (short)) ; + + psf->sf.frames = pnms->blocks_total * NMS_SAMPLES_PER_BLOCK ; + psf->codec_close = nms_adpcm_close ; + psf->seek = nms_adpcm_seek ; + + return 0 ; +} /* nms_adpcm_init */ + +static int +nms_adpcm_close (SF_PRIVATE *psf) +{ NMS_ADPCM_PRIVATE *pnms ; + + pnms = (NMS_ADPCM_PRIVATE*) psf->codec_data ; + + /* + ** If a block has been partially assembled, write it out as the final + ** block. + */ + if (psf->file.mode == SFM_WRITE) + { if (pnms->sample_curr && pnms->sample_curr < NMS_SAMPLES_PER_BLOCK) + { memset (pnms->samples + pnms->sample_curr, 0, (NMS_SAMPLES_PER_BLOCK - pnms->sample_curr) * sizeof (short)) ; + psf_nms_adpcm_encode_block (psf, pnms) ; + } + + if (psf->write_header) + psf->write_header (psf, SF_FALSE) ; + } + + return 0 ; +} /* nms_adpcm_close */ + +static sf_count_t +nms_adpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) +{ NMS_ADPCM_PRIVATE *pnms ; + + pnms = (NMS_ADPCM_PRIVATE *) psf->codec_data ; + + /* + ** NMS ADPCM is symmetric, so transitioning from reading and writing is + ** possible, but unimplemented, as it would require syncing partial blocks. + */ + if (mode != psf->file.mode) + { psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + /* + ** NMS ADPCM cannot be seek'ed, as codec state depends on previous samples, + ** so only a seek to 0 is supported. + */ + if (offset != 0) + { psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + if (psf_fseek (psf, psf->dataoffset, SEEK_SET) == PSF_SEEK_ERROR) + return PSF_SEEK_ERROR ; + + nms_adpcm_codec_init (&pnms->state, pnms->type) ; + pnms->block_curr = 0 ; + pnms->sample_curr = 0 ; + return 0 ; +} /* nms_adpcm_seek */ + diff --git a/lib-src/libsndfile/src/ogg.c b/lib-src/libsndfile/src/ogg.c index 615e80da7..1cdcbb49b 100644 --- a/lib-src/libsndfile/src/ogg.c +++ b/lib-src/libsndfile/src/ogg.c @@ -1,6 +1,7 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2019 Erik de Castro Lopo ** Copyright (C) 2007 John ffitch +** Copyright (C) 2018 Arthur Taylor ** ** This program is free software ; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -18,9 +19,10 @@ */ /* -** Much of this code is based on the examples in libvorbis from the -** XIPHOPHORUS Company http://www.xiph.org/ which has a BSD-style Licence -** Copyright (c) 2002, Xiph.org Foundation +** This file contains code based on OpusFile and Opus-Tools, both by +** Xiph.Org. COPYING from each is identical and is as follows: +** +** Copyright (c) 1994-2013 Xiph.Org Foundation and contributors ** ** Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions @@ -33,7 +35,7 @@ ** notice, this list of conditions and the following disclaimer in the ** documentation and/or other materials provided with the distribution. ** -** - Neither the name of the Xiph.org Foundation nor the names of its +** - Neither the name of the Xiph.Org Foundation nor the names of its ** contributors may be used to endorse or promote products derived from ** this software without specific prior written permission. ** @@ -43,8 +45,8 @@ ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION ** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE, -** DATA, OR PROFITS ; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -61,123 +63,126 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include "sndfile.h" #include "sfendian.h" #include "common.h" -#if HAVE_EXTERNAL_LIBS +#if HAVE_EXTERNAL_XIPH_LIBS -#include -#include +#include -typedef int convert_func (int, void *, int, int, float **) ; +#include "ogg.h" -static int ogg_read_header (SF_PRIVATE *psf, int log_data) ; -static int ogg_write_header (SF_PRIVATE *psf, int calc_length) ; -static int ogg_close (SF_PRIVATE *psf) ; -static int ogg_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; -static sf_count_t ogg_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; -static sf_count_t ogg_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; -static sf_count_t ogg_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; -static sf_count_t ogg_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; -static sf_count_t ogg_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; -static sf_count_t ogg_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; -static sf_count_t ogg_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; -static sf_count_t ogg_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; -static sf_count_t ogg_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; -static sf_count_t ogg_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ; -static sf_count_t ogg_length (SF_PRIVATE *psf) ; +#define OGG_SYNC_READ_SIZE (2048) +#define OGG_PAGE_SIZE_MAX (65307) +#define OGG_CHUNK_SIZE (65536) +#define OGG_CHUNK_SIZE_MAX (1024*1024) -typedef struct -{ int id ; - const char *name ; -} STR_PAIRS ; +/* + * The Ogg container may seem overly complicated, particularly when used for a + * on-disk audio file format. This is probably because Ogg is designed with + * streaming rather than storage as a priority, and can handle multiple codec + * payloads multiplexed together, then possibly chained on top of that. + * Ogg achieves its goals well, but it does lend to a bit of a learning curve, + * with many internal structures to push data around in compared to most sound + * file formats which only have a header and raw data. + * + * See + * - [https://xiph.org/ogg/doc/oggstream.html] + * - [https://xiph.org/ogg/doc/framing.html] + * + * libogg Memory Management + * =========================================================================== + * + * libOgg's memory management is documented in code, not in headers or external + * documentation. What follows is not an attempt to completely document it, but + * an explanation of the basics. + * + * libOgg has two data structures which allocate and manage data buffers: The + * ogg_sync_state structure and the ogg_stream_state structure. The remaining + * structures of ogg_page and ogg_packet are views into the buffers managed by + * the previous structures. + * + * ogg_sync_state is used for reading purposes. It takes a physical bitstream + * and searches for, validates, and returns complete Ogg Pages. The + * ogg_sync_state buffers the returned page data, holding at most one + * complete page at a time. A returned Ogg page remains valid until any + * operation other than ogg_sync_check() is called. + * + * ogg_stream_state is used for both reading and writing. For reading, the + * contents of an ogg_page is copied into the stream state. This data is + * buffered to be split or joined as necessary into complete ogg_packets. If, + * after copying an ogg_page into an ogg_stream_state, packets are available to + * be read, then all of those packets remain in memory and valid until either + * the ogg_stream_state is reset, destroyed, or a new ogg_page is read into it. + * As the maximum number of packets an Ogg Page may contain is 255, at most 255 + * packets may be available from an ogg_stream_state at one time. + * + * For writing, the life cycle of a buffer pointed to by a ogg_packet is the + * responsibility of the caller. Packets written into an ogg_stream_state are + * buffered until a complete page is ready for writing. Pages for writing out + * remain in the ogg_stream_state's buffer and valid until either the + * ogg_stream_state is reset, cleared, destroyed. Writing another packet into + * the ogg_stream_state might also invalidate such pages, but writing in + * packets when a page is ready to be written out is a caller bug anyways. + */ -static STR_PAIRS vorbis_metatypes [] = -{ { SF_STR_TITLE, "Title" }, - { SF_STR_COPYRIGHT, "Copyright" }, - { SF_STR_SOFTWARE, "Software" }, - { SF_STR_ARTIST, "Artist" }, - { SF_STR_COMMENT, "Comment" }, - { SF_STR_DATE, "Date" }, - { SF_STR_ALBUM, "Album" }, - { SF_STR_LICENSE, "License" }, - { SF_STR_TRACKNUMBER, "Tracknumber" }, - { SF_STR_GENRE, "Genre" }, -} ; +/*----------------------------------------------------------------------------------------------- +** Private function prototypes. +*/ -typedef struct -{ /* Sync and verify incoming physical bitstream */ - ogg_sync_state oy ; - /* Take physical pages, weld into a logical stream of packets */ - ogg_stream_state os ; - /* One Ogg bitstream page. Vorbis packets are inside */ - ogg_page og ; - /* One raw packet of data for decode */ - ogg_packet op ; - int eos ; -} OGG_PRIVATE ; +static int ogg_close (SF_PRIVATE *psf) ; +static int ogg_stream_classify (SF_PRIVATE *psf, OGG_PRIVATE * odata) ; +static int ogg_page_classify (SF_PRIVATE * psf, const ogg_page * og) ; +static uint64_t ogg_page_search_do_rescale (uint64_t x, uint64_t from, uint64_t to) ; +static void ogg_page_search_continued_data (OGG_PRIVATE *odata, ogg_page *page) ; -typedef struct -{ /* Count current location */ - sf_count_t loc ; - /* Struct that stores all the static vorbis bitstream settings */ - vorbis_info vi ; - /* Struct that stores all the bitstream user comments */ - vorbis_comment vc ; - /* Ventral working state for the packet->PCM decoder */ - vorbis_dsp_state vd ; - /* Local working space for packet->PCM decode */ - vorbis_block vb ; +/*----------------------------------------------------------------------------------------------- +** Exported functions. +*/ - /* Encoding quality in range [0.0, 1.0]. */ - double quality ; -} VORBIS_PRIVATE ; - -static int -ogg_read_header (SF_PRIVATE *psf, int log_data) -{ - OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; - VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; +int +ogg_read_first_page (SF_PRIVATE *psf, OGG_PRIVATE *odata) +{ int ret ; char *buffer ; - int bytes ; - int i, nn ; - - odata->eos = 0 ; - - /* Weird stuff happens if these aren't called. */ - ogg_stream_reset (&odata->os) ; - ogg_sync_reset (&odata->oy) ; /* - ** Grab some data at the head of the stream. We want the first page - ** (which is guaranteed to be small and only contain the Vorbis - ** stream initial header) We need the first page to get the stream - ** serialno. + ** The ogg standard requires that the first pages of a physical ogg + ** bitstream be only the first pages of each logical bitstream. These + ** pages MUST have the Beginning-Of-Stream bit set, and must contain + ** only the stream's relevant header. Currently we only load the first + ** page and check that it contains a codec we support as supporting + ** multiplexed streams (video+audio(en)+audio(fs)+subtitles, etc) is + ** beyond the scope of this library. */ - /* Expose the buffer */ - buffer = ogg_sync_buffer (&odata->oy, 4096L) ; + ret = ogg_sync_fseek (psf, psf->header.indx, SEEK_SET) ; + if (ret < 0) + return SFE_NOT_SEEKABLE ; - /* Grab the part of the header that has already been read. */ - memcpy (buffer, psf->header, psf->headindex) ; - bytes = psf->headindex ; + buffer = ogg_sync_buffer (&odata->osync, psf->header.indx) ; + memcpy (buffer, psf->header.ptr, psf->header.indx) ; + ogg_sync_wrote (&odata->osync, psf->header.indx) ; - /* Submit a 4k block to libvorbis' Ogg layer */ - bytes += psf_fread (buffer + psf->headindex, 1, 4096 - psf->headindex, psf) ; - ogg_sync_wrote (&odata->oy, bytes) ; + ret = ogg_sync_next_page (psf, &odata->opage, SF_MAX (0l, 4096 - psf->header.indx), NULL) ; - /* Get the first page. */ - if ((nn = ogg_sync_pageout (&odata->oy, &odata->og)) != 1) - { - /* Have we simply run out of data? If so, we're done. */ - if (bytes < 4096) - return 0 ; + /* Have we simply run out of data? If so, we're done. */ + if (ret == 0) + return 0 ; + if (ret < 0) + return psf->error ; - /* Error case. Must not be Vorbis data */ - psf_log_printf (psf, "Input does not appear to be an Ogg bitstream.\n") ; + if (!ogg_page_bos (&odata->opage)) + { /* + ** Error case. Either must not be an Ogg bitstream, or is in the + ** middle of a bitstream (live capture), or in the middle of a + ** bitstream and no complete page was in the buffer. + */ + psf_log_printf (psf, "Input does not appear to be the start of an Ogg bitstream.\n") ; return SFE_MALFORMED_FILE ; } ; @@ -185,1004 +190,714 @@ ogg_read_header (SF_PRIVATE *psf, int log_data) ** Get the serial number and set up the rest of decode. ** Serialno first ; use it to set up a logical stream. */ - ogg_stream_clear (&odata->os) ; - ogg_stream_init (&odata->os, ogg_page_serialno (&odata->og)) ; + ogg_stream_reset_serialno (&odata->ostream, ogg_page_serialno (&odata->opage)) ; - /* - ** This function (ogg_read_header) gets called multiple times, so the OGG - ** and vorbis structs have to be cleared every time we pass through to - ** prevent memory leaks. - */ - vorbis_block_clear (&vdata->vb) ; - vorbis_dsp_clear (&vdata->vd) ; - vorbis_comment_clear (&vdata->vc) ; - vorbis_info_clear (&vdata->vi) ; - - /* - ** Extract the initial header from the first page and verify that the - ** Ogg bitstream is in fact Vorbis data. - ** - ** I handle the initial header first instead of just having the code - ** read all three Vorbis headers at once because reading the initial - ** header is an easy way to identify a Vorbis bitstream and it's - ** useful to see that functionality seperated out. - */ - vorbis_info_init (&vdata->vi) ; - vorbis_comment_init (&vdata->vc) ; - - if (ogg_stream_pagein (&odata->os, &odata->og) < 0) + if (ogg_stream_pagein (&odata->ostream, &odata->opage) < 0) { /* Error ; stream version mismatch perhaps. */ psf_log_printf (psf, "Error reading first page of Ogg bitstream data\n") ; return SFE_MALFORMED_FILE ; } ; - if (ogg_stream_packetout (&odata->os, &odata->op) != 1) - { /* No page? must not be vorbis. */ - psf_log_printf (psf, "Error reading initial header packet.\n") ; + if (ogg_stream_packetout (&odata->ostream, &odata->opacket) != 1) + { /* No page? */ + psf_log_printf (psf, "Error reading initial header page packet.\n") ; return SFE_MALFORMED_FILE ; } ; - if (vorbis_synthesis_headerin (&vdata->vi, &vdata->vc, &odata->op) < 0) - { /* Error case ; not a vorbis header. */ - psf_log_printf (psf, "This Ogg bitstream does not contain Vorbis audio data.\n") ; - return SFE_MALFORMED_FILE ; - } ; + return 0 ; +} /* ogg_read_first_page */ - /* - ** Common Ogg metadata fields? - ** TITLE, VERSION, ALBUM, TRACKNUMBER, ARTIST, PERFORMER, COPYRIGHT, LICENSE, - ** ORGANIZATION, DESCRIPTION, GENRE, DATE, LOCATION, CONTACT, ISRC, - */ +int +ogg_write_page (SF_PRIVATE *psf, ogg_page *page) +{ int bytes ; - if (log_data) - { int k ; + bytes = psf_fwrite (page->header, 1, page->header_len, psf) ; + bytes += psf_fwrite (page->body, 1, page->body_len, psf) ; - for (k = 0 ; k < ARRAY_LEN (vorbis_metatypes) ; k++) - { char *dd ; + return bytes == page->header_len + page->body_len ; +} /* ogg_write_page */ - dd = vorbis_comment_query (&vdata->vc, vorbis_metatypes [k].name, 0) ; - if (dd == NULL) - continue ; - psf_store_string (psf, vorbis_metatypes [k].id, dd) ; - } ; - } ; +sf_count_t +ogg_sync_ftell (SF_PRIVATE *psf) +{ OGG_PRIVATE* odata = (OGG_PRIVATE *) psf->container_data ; + sf_count_t position ; - /* - ** At this point, we're sure we're Vorbis. We've set up the logical (Ogg) - ** bitstream decoder. Get the comment and codebook headers and set up the - ** Vorbis decoder. - ** - ** The next two packets in order are the comment and codebook headers. - ** They're likely large and may span multiple pages. Thus we reead - ** and submit data until we get our two pacakets, watching that no - ** pages are missing. If a page is missing, error out ; losing a - ** header page is the only place where missing data is fatal. - */ - - i = 0 ; /* Count of number of packets read */ - while (i < 2) - { int result = ogg_sync_pageout (&odata->oy, &odata->og) ; - if (result == 0) - { /* Need more data */ - buffer = ogg_sync_buffer (&odata->oy, 4096) ; - bytes = psf_fread (buffer, 1, 4096, psf) ; - - if (bytes == 0) - { psf_log_printf (psf, "End of file before finding all Vorbis headers!\n") ; - return SFE_MALFORMED_FILE ; - } ; - nn = ogg_sync_wrote (&odata->oy, bytes) ; + position = psf_ftell (psf) ; + if (position >= 0) + { /* success */ + if (position < odata->osync.fill) + { /* Really, this should be an assert. */ + psf->error = SFE_INTERNAL ; + return -1 ; } - else if (result == 1) + position += (sf_count_t) (odata->osync.returned - odata->osync.fill) ; + } + + return position ; +} /* ogg_sync_ftell */ + +sf_count_t +ogg_sync_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) +{ OGG_PRIVATE* odata = (OGG_PRIVATE *) psf->container_data ; + sf_count_t ret ; + + ret = psf_fseek (psf, offset, whence) ; + if (ret >= 0) + { /* success */ + odata->eos = 0 ; + ogg_sync_reset (&odata->osync) ; + } + + return ret ; +} /* ogg_sync_fseek */ + +int +ogg_sync_next_page (SF_PRIVATE * psf, ogg_page *og, sf_count_t readmax, sf_count_t *offset) +{ OGG_PRIVATE* odata = (OGG_PRIVATE *) psf->container_data ; + sf_count_t position, nb_read, read_ret ; + unsigned char *buffer ; + int synced ; + int report_hole = 0 ; + + for (position = 0 ; readmax <= 0 || readmax > position ; ) + { synced = ogg_sync_pageseek (&odata->osync, og) ; + if (synced < 0) { /* - ** Don't complain about missing or corrupt data yet. We'll - ** catch it at the packet output phase. - ** - ** We can ignore any errors here as they'll also become apparent - ** at packetout. + ** Skipped -synced bytes before finding the start of a page. + ** If seeking, we have just landed in the middle of a page. + ** Otherwise, warn about junk in the bitstream. + ** Page might not yet be ready, hence the continue. */ - nn = ogg_stream_pagein (&odata->os, &odata->og) ; - while (i < 2) - { result = ogg_stream_packetout (&odata->os, &odata->op) ; - if (result == 0) - break ; - if (result < 0) - { /* Uh oh ; data at some point was corrupted or missing! - ** We can't tolerate that in a header. Die. */ - psf_log_printf (psf, "Corrupt secondary header. Exiting.\n") ; - return SFE_MALFORMED_FILE ; - } ; - - vorbis_synthesis_headerin (&vdata->vi, &vdata->vc, &odata->op) ; - i++ ; - } ; - } ; - } ; - - if (log_data) - { int printed_metadata_msg = 0 ; - int k ; - - psf_log_printf (psf, "\nBitstream is %d channel, %D Hz\n", vdata->vi.channels, vdata->vi.rate) ; - psf_log_printf (psf, "Encoded by: %s\n", vdata->vc.vendor) ; - - /* Throw the comments plus a few lines about the bitstream we're decoding. */ - for (k = 0 ; k < ARRAY_LEN (vorbis_metatypes) ; k++) - { char *dd ; - - dd = vorbis_comment_query (&vdata->vc, vorbis_metatypes [k].name, 0) ; - if (dd == NULL) - continue ; - - if (printed_metadata_msg == 0) - { psf_log_printf (psf, "Metadata :\n") ; - printed_metadata_msg = 1 ; - } ; - - psf_store_string (psf, vorbis_metatypes [k].id, dd) ; - psf_log_printf (psf, " %-10s : %s\n", vorbis_metatypes [k].name, dd) ; + if (!offset) + report_hole = 1 ; + position -= synced ; + continue ; } ; - psf_log_printf (psf, "End\n") ; + if (report_hole) + { psf_log_printf (psf, "Ogg : Skipped %d bytes looking for the next page. Corrupted bitstream?!\n", position) ; + report_hole = 0 ; + } ; + + if (synced > 0) + { /* Have a page */ + if (offset) + *offset += position ; + return og->header_len + og->body_len ; + } ; + + /* + ** Else readmax == 0, Out of data. Try to read more in without + ** invalidating our boundary (readmax) constraint. + */ + if (readmax == 0) + return 0 ; + if (readmax > 0) + nb_read = SF_MIN ((sf_count_t) OGG_SYNC_READ_SIZE, readmax - position) ; + else + nb_read = OGG_SYNC_READ_SIZE ; + buffer = (unsigned char *) ogg_sync_buffer (&odata->osync, nb_read) ; + read_ret = psf_fread (buffer, 1, nb_read, psf) ; + if (read_ret == 0) + return psf->error ? -1 : 0 ; + ogg_sync_wrote (&odata->osync, read_ret) ; } ; - - psf->sf.samplerate = vdata->vi.rate ; - psf->sf.channels = vdata->vi.channels ; - psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ; - - /* OK, got and parsed all three headers. Initialize the Vorbis - ** packet->PCM decoder. - ** Central decode state. */ - vorbis_synthesis_init (&vdata->vd, &vdata->vi) ; - - /* Local state for most of the decode so multiple block decodes can - ** proceed in parallel. We could init multiple vorbis_block structures - ** for vd here. */ - vorbis_block_init (&vdata->vd, &vdata->vb) ; - - vdata->loc = 0 ; - return 0 ; -} /* ogg_read_header */ +} /* ogg_sync_next_page */ -static int -ogg_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) -{ - OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; - VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; - int k, ret ; +int +ogg_stream_next_page (SF_PRIVATE *psf, OGG_PRIVATE *odata) +{ int nn ; - vorbis_info_init (&vdata->vi) ; - - /* The style of encoding should be selectable here, VBR quality mode. */ - ret = vorbis_encode_init_vbr (&vdata->vi, psf->sf.channels, psf->sf.samplerate, vdata->quality) ; - -#if 0 - ret = vorbis_encode_init (&vdata->vi, psf->sf.channels, psf->sf.samplerate, -1, 128000, -1) ; /* average bitrate mode */ - ret = ( vorbis_encode_setup_managed (&vdata->vi, psf->sf.channels, - psf->sf.samplerate, -1, 128000, -1) || - vorbis_encode_ctl (&vdata->vi, OV_ECTL_RATEMANAGE_AVG, NULL) || - vorbis_encode_setup_init (&vdata->vi)) ; -#endif - if (ret) - return SFE_BAD_OPEN_FORMAT ; - - vdata->loc = 0 ; - - /* add a comment */ - vorbis_comment_init (&vdata->vc) ; - - vorbis_comment_add_tag (&vdata->vc, "ENCODER", "libsndfile") ; - for (k = 0 ; k < SF_MAX_STRINGS ; k++) - { const char * name ; - - if (psf->strings [k].type == 0) - break ; - - switch (psf->strings [k].type) - { case SF_STR_TITLE : name = "TITLE" ; break ; - case SF_STR_COPYRIGHT : name = "COPYRIGHT" ; break ; - case SF_STR_SOFTWARE : name = "SOFTWARE" ; break ; - case SF_STR_ARTIST : name = "ARTIST" ; break ; - case SF_STR_COMMENT : name = "COMMENT" ; break ; - case SF_STR_DATE : name = "DATE" ; break ; - case SF_STR_ALBUM : name = "ALBUM" ; break ; - case SF_STR_LICENSE : name = "LICENSE" ; break ; - case SF_STR_TRACKNUMBER : name = "TRACKNUMBER" ; break ; - case SF_STR_GENRE : name = "GENRE" ; break ; - default : continue ; - } ; - - vorbis_comment_add_tag (&vdata->vc, name, psf->strings [k].str) ; - } ; - - /* set up the analysis state and auxiliary encoding storage */ - vorbis_analysis_init (&vdata->vd, &vdata->vi) ; - vorbis_block_init (&vdata->vd, &vdata->vb) ; - - /* - ** Set up our packet->stream encoder. - ** Pick a random serial number ; that way we can more likely build - ** chained streams just by concatenation. - */ - - ogg_stream_init (&odata->os, psf_rand_int32 ()) ; - - /* Vorbis streams begin with three headers ; the initial header (with - most of the codec setup parameters) which is mandated by the Ogg - bitstream spec. The second header holds any comment fields. The - third header holds the bitstream codebook. We merely need to - make the headers, then pass them to libvorbis one at a time ; - libvorbis handles the additional Ogg bitstream constraints */ - - { ogg_packet header ; - ogg_packet header_comm ; - ogg_packet header_code ; - int result ; - - vorbis_analysis_headerout (&vdata->vd, &vdata->vc, &header, &header_comm, &header_code) ; - ogg_stream_packetin (&odata->os, &header) ; /* automatically placed in its own page */ - ogg_stream_packetin (&odata->os, &header_comm) ; - ogg_stream_packetin (&odata->os, &header_code) ; - - /* This ensures the actual - * audio data will start on a new page, as per spec - */ - while ((result = ogg_stream_flush (&odata->os, &odata->og)) != 0) - { psf_fwrite (odata->og.header, 1, odata->og.header_len, psf) ; - psf_fwrite (odata->og.body, 1, odata->og.body_len, psf) ; - } ; - } - - return 0 ; -} /* ogg_write_header */ - -static int -ogg_close (SF_PRIVATE *psf) -{ - OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; - VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; - - if (odata == NULL || vdata == NULL) + if (odata->eos) return 0 ; - /* Clean up this logical bitstream ; before exit we shuld see if we're - ** followed by another [chained]. */ + for ( ; ; ) + { nn = ogg_sync_next_page (psf, &odata->opage, -1, NULL) ; + if (nn == 0) + { psf_log_printf (psf, "Ogg : File ended unexpectedly without an End-Of-Stream flag set.\n") ; + odata->eos = 1 ; + } + if (nn <= 0) + return nn ; - if (psf->file.mode == SFM_WRITE) - { - if (psf->write_current <= 0) - ogg_write_header (psf, 0) ; + if (ogg_page_serialno (&odata->opage) == odata->ostream.serialno) + break ; + } ; - vorbis_analysis_wrote (&vdata->vd, 0) ; - while (vorbis_analysis_blockout (&vdata->vd, &vdata->vb) == 1) - { + if (ogg_page_eos (&odata->opage)) + odata->eos = 1 ; - /* analysis, assume we want to use bitrate management */ - vorbis_analysis (&vdata->vb, NULL) ; - vorbis_bitrate_addblock (&vdata->vb) ; + if (ogg_stream_pagein (&odata->ostream, &odata->opage) < 0) + { psf->error = SFE_INTERNAL ; + return -1 ; + } - while (vorbis_bitrate_flushpacket (&vdata->vd, &odata->op)) - { /* weld the packet into the bitstream */ - ogg_stream_packetin (&odata->os, &odata->op) ; + return 1 ; +} /* ogg_stream_next_page */ - /* write out pages (if any) */ - while (!odata->eos) - { int result = ogg_stream_pageout (&odata->os, &odata->og) ; - if (result == 0) break ; - psf_fwrite (odata->og.header, 1, odata->og.header_len, psf) ; - psf_fwrite (odata->og.body, 1, odata->og.body_len, psf) ; +int +ogg_stream_unpack_page (SF_PRIVATE *psf, OGG_PRIVATE *odata) +{ int nn ; + int i ; + int found_hole = 0 ; + ogg_packet *ppkt = odata->pkt ; - /* this could be set above, but for illustrative purposes, I do - it here (to show that vorbis does know where the stream ends) */ + odata->pkt_indx = 0 ; + nn = ogg_stream_packetout (&odata->ostream, ppkt) ; + if (nn == 0) + { /* + ** Steam is out of packets. Read in more pages until there is one, or + ** the stream ends, or an error occurs. + */ + for ( ; nn == 0 ; nn = ogg_stream_packetout (&odata->ostream, ppkt)) + { nn = ogg_stream_next_page (psf, odata) ; + if (nn <= 0) + { odata->pkt_len = 0 ; + return nn ; + } + } + /* + ** In the case of the for loop exiting because + ** ogg_stream_packetout() == -1, fall-through. + */ + } - if (ogg_page_eos (&odata->og)) odata->eos = 1 ; + if (nn == -1) + { /* + ** libOgg found a hole. That is, the next packet found was out of + ** sequence. As such, "flush" the hole marker by removing the invalid + ** packet, as the valid packets are queued behind it. + */ + psf_log_printf (psf, "Ogg : Warning, libogg reports a hole at %d bytes.\n", ogg_sync_ftell (psf)) ; + nn = ogg_stream_packetout (&odata->ostream, ppkt) ; + found_hole = 1 ; + } + + /* + ** Unpack all the packets on the page. It is undocumented (like much of + ** libOgg behavior) but all packets from a page read into the stream are + ** guarenteed to remain valid in memory until a new page is read into the + ** stream. + */ + for (i = 1 ; ; i++) + { /* Not an off-by-one, there are 255 not 256 packets max. */ + if (i == 255) + { if (ogg_stream_packetpeek (&odata->ostream, NULL) == 1) + { psf->error = SFE_INTERNAL ; + return -1 ; + } + break ; + } + if (ogg_stream_packetout (&odata->ostream, ++ ppkt) != 1) + break ; + } + odata->pkt_len = i ; + + /* 1 = ok, 2 = ok, and found a hole. */ + return 1 + found_hole ; +} /* ogg_stream_unpack_page */ + +sf_count_t +ogg_sync_last_page_before (SF_PRIVATE *psf, OGG_PRIVATE *odata, uint64_t *gp_out, sf_count_t offset, int32_t serialno) +{ sf_count_t begin, end, original_end, chunk_size, ret ; + sf_count_t position = 0 ; + uint64_t gp = -1 ; + int left_link ; + + /* Based on code from Xiph.org's Opusfile */ + + original_end = end = begin = offset ; + offset = -1 ; + chunk_size = OGG_CHUNK_SIZE ; + do + { begin = SF_MAX (begin - chunk_size, (sf_count_t) 0) ; + position = ogg_sync_fseek (psf, begin, SEEK_SET) ; + if (position < 0) + return position ; + left_link = 0 ; + while (position < end) + { ret = ogg_sync_next_page (psf, &odata->opage, end - position, &position) ; + if (ret <= 0) + return -1 ; + if (ogg_page_serialno (&odata->opage) == serialno) + { uint64_t page_gp = ogg_page_granulepos (&odata->opage) ; + if (page_gp != (uint64_t) -1) + { offset = position ; + gp = page_gp ; + } + } + else + left_link = 1 ; + position += ret ; + } + + if ((left_link || !begin) && offset < 0) + { psf->error = SFE_MALFORMED_FILE ; + return -1 ; + } + + chunk_size = SF_MIN (2 * chunk_size, (sf_count_t) OGG_CHUNK_SIZE_MAX) ; + end = SF_MIN (begin + OGG_PAGE_SIZE_MAX - 1, original_end) ; + } + while (offset < 0) ; + + *gp_out = gp ; + return offset ; +} /* ogg_sync_last_page_before */ + +int +ogg_stream_seek_page_search (SF_PRIVATE *psf, OGG_PRIVATE *odata, uint64_t target_gp, uint64_t pcm_start, uint64_t pcm_end, uint64_t *best_gp, sf_count_t begin, sf_count_t end) +{ ogg_page page ; + uint64_t gp ; + sf_count_t d0, d1, d2 ; + sf_count_t best ; + sf_count_t best_start ; + sf_count_t boundary ; + sf_count_t next_boundary ; + sf_count_t page_offset = -1 ; + sf_count_t seek_pos = -1 ; + sf_count_t bisect ; + sf_count_t chunk_size ; + int buffering = SF_FALSE ; + int force_bisect = SF_FALSE ; + int ret ; + int has_packets ; + + *best_gp = pcm_start ; + best = best_start = begin ; + boundary = end ; + + ogg_stream_reset_serialno (&odata->ostream, odata->ostream.serialno) ; + + /* + ** This code is based on op_pcm_seek_page() from Opusfile, which is in turn + ** based on "new search algorithm by Nicholas Vinen" from libvorbisfile. + */ + + d2 = d1 = d0 = end - begin ; + while (begin < end) + { /* + ** Figure out if and where to try and seek in the file. + */ + if (end - begin < OGG_CHUNK_SIZE) + bisect = begin ; + else + { /* Update the interval size history */ + d0 = d1 >> 1 ; + d1 = d2 >> 1 ; + d2 = (end - begin) >> 1 ; + if (force_bisect == SF_TRUE) + bisect = begin + ((end - begin) >> 1) ; + else + { /* Take a decent guess. */ + bisect = begin + ogg_page_search_do_rescale (target_gp - pcm_start, pcm_end - pcm_start, end - begin) ; + } + if (bisect - OGG_CHUNK_SIZE < begin) + bisect = begin ; + else + bisect -= OGG_CHUNK_SIZE ; + force_bisect = SF_FALSE ; + } + + /* + ** Avoid an actual fseek if we can (common for final iterations.) + */ + if (seek_pos != bisect) + { if (buffering == SF_TRUE) + ogg_stream_reset (&odata->ostream) ; + buffering = SF_FALSE ; + page_offset = -1 ; + seek_pos = ogg_sync_fseek (psf, bisect, SEEK_SET) ; + if (seek_pos < 0) + return seek_pos ; + } + + chunk_size = OGG_CHUNK_SIZE ; + next_boundary = boundary ; + + /* + ** Scan forward, figure out where we landed. + ** The ideal case is we see a page that ends before our target followed + ** by a page that ends after our target. + ** If we are too far before or after, breaking out will bisect what we + ** have found so far. + */ + while (begin < end) + { ret = ogg_sync_next_page (psf, &page, boundary - seek_pos, &seek_pos) ; + if (ret <= 0) + return ret ; + page_offset = seek_pos ; + if (ret == 0) + { /* + ** There are no more pages in this interval from our stream + ** with a granulepos less than our target. + */ + if (bisect <= begin + 1) + { /* Scanned the whole interval, so we are done. */ + end = begin ; + } + else + { /* + ** Otherwise, back up one chunk. First discard any data + ** from a continued packet. + */ + if (buffering) + ogg_stream_reset (&odata->ostream) ; + buffering = SF_FALSE ; + bisect = SF_MAX (bisect - chunk_size, begin) ; + seek_pos = ogg_sync_fseek (psf, bisect, SEEK_SET) ; + if (seek_pos < 0) + return seek_pos ; + /* Bump up the chunk size. */ + chunk_size = SF_MIN (2 * chunk_size, (sf_count_t) OGG_CHUNK_SIZE_MAX) ; + /* + ** If we did find a page from another stream or without a + ** timestamp, don't read past it. + */ + boundary = next_boundary ; + } + continue ; + } + + /* Found a page. Advance seek_pos past it */ + seek_pos += page.header_len + page.body_len ; + /* + ** Save the offset of the first page we found after the seek, + ** regardless of the stream it came from or whether or not it has a + ** timestamp. + */ + next_boundary = SF_MIN (page_offset, next_boundary) ; + + /* If not from our stream, continue. */ + if (odata->ostream.serialno != (uint32_t) ogg_page_serialno (&page)) + continue ; + + /* + ** The Ogg spec says that a page with a granule pos of -1 must not + ** contain and packets which complete, but the lack of biconditional + ** wording means that /technically/ a packet which does not complete + ** any packets can have a granule pos other than -1. To make matters + ** worse, older versions of libogg did just that. + */ + has_packets = ogg_page_packets (&page) > 0 ; + gp = has_packets ? ogg_page_granulepos (&page) : -1 ; + if (gp == (uint64_t) -1) + { if (buffering == SF_TRUE) + { if (!has_packets) + ogg_stream_pagein (&odata->ostream, &page) ; + else + { /* + ** If packets did end on this page, but we still didn't + ** have a valid granule position (in violation of the + ** spec!), stop buffering continued packet data. + ** Otherwise we might continue past the packet we + ** actually wanted. + */ + ogg_stream_reset (&odata->ostream) ; + buffering = SF_FALSE ; + } + } + continue ; + } + + if (gp < target_gp) + { /* + ** We found a page that ends before our target. Advance to + ** the raw offset of the next page. + */ + begin = seek_pos ; + if (pcm_start > gp || pcm_end < gp) + break ; + /* Save the byte offset of after this page. */ + best = best_start = begin ; + if (buffering) + ogg_stream_reset (&odata->ostream) ; + /* Check to see if the last packet continues. */ + if (page.header [27 + page.header [26] - 1] == 255) + { ogg_page_search_continued_data (odata, &page) ; + /* + ** If we have a continued packet, remember the offset of + ** this page's start, so that if we do wind up having to + ** seek back here later, we can prime the stream with the + ** continued packet data. With no continued packet, we + ** remember the end of the page. + */ + best_start = page_offset ; + } ; + /* + ** Then force buffering on, so that if a packet starts (but + ** does not end) on the next page, we still avoid the extra + ** seek back. + */ + buffering = SF_TRUE ; + *best_gp = pcm_start = gp ; + if (target_gp - gp > 48000) + { /* Out by over a second. Try another bisection. */ + break ; + } + /* Otherwise, keep scanning forward (do NOT use begin+1). */ + bisect = begin ; + } + else + { /* + ** Found a page that ends after our target. If we had just + ** scanned the whole interval before we found it, we're good. + */ + if (bisect <= begin + 1) + end = begin ; + else + { end = bisect ; + /* + ** In later iterations, don't read past the first page we + ** found. + */ + boundary = next_boundary ; + /* + ** If we're not making much progress shrinking the interval + ** size, start forcing straight bisection to limit the + ** worst case. + */ + force_bisect = end - begin > d0 * 2 ? SF_TRUE : SF_FALSE ; + /* + ** Don't let pcm_end get out of range! That could happen + ** with an invalid timestamp. + */ + if (pcm_end > gp && pcm_start <= gp) + pcm_end = gp ; + } + break ; } } } - } - /* ogg_page and ogg_packet structs always point to storage in - libvorbis. They are never freed or manipulated directly */ + /* + ** If we are buffering, the page we want is currently buffered in the + ** Ogg stream structure, or in the Ogg page which has not been submitted. + ** If not, we need to seek back and load it again. + */ + if (buffering == SF_FALSE) + { if (best_start != page_offset) + { page_offset = -1 ; + seek_pos = ogg_sync_fseek (psf, best_start, SEEK_SET) ; + if (seek_pos < 0) + return seek_pos ; + } + if (best_start < best) + { if (page_offset < 0) + { ret = ogg_sync_next_page (psf, &page, -1, &seek_pos) ; + if (seek_pos != best_start) + return -1 ; + } + ogg_page_search_continued_data (odata, &page) ; + page_offset = -1 ; + } + } ; - vorbis_block_clear (&vdata->vb) ; - vorbis_dsp_clear (&vdata->vd) ; - vorbis_comment_clear (&vdata->vc) ; - vorbis_info_clear (&vdata->vi) ; /* must be called last */ - /* should look here to reopen if chained */ - - /* OK, clean up the framer */ - ogg_sync_clear (&odata->oy) ; - ogg_stream_clear (&odata->os) ; + if (page_offset >= 0) + ogg_stream_pagein (&odata->ostream, &page) ; return 0 ; -} /* ogg_close */ +} /* ogg_stream_seek_page_search */ int ogg_open (SF_PRIVATE *psf) { OGG_PRIVATE* odata = calloc (1, sizeof (OGG_PRIVATE)) ; - VORBIS_PRIVATE* vdata = calloc (1, sizeof (VORBIS_PRIVATE)) ; + sf_count_t pos = psf_ftell (psf) ; int error = 0 ; - if (vdata == NULL || odata == NULL) - return SFE_MALLOC_FAILED ; - psf->container_data = odata ; - psf->codec_data = vdata ; + psf->container_close = ogg_close ; if (psf->file.mode == SFM_RDWR) return SFE_BAD_MODE_RW ; -#if HAVE_VORBIS_VERSION_STRING - psf_log_printf (psf, "Vorbis library version : %s\n", vorbis_version_string ()) ; -#endif - if (psf->file.mode == SFM_READ) - { /* Call this here so it only gets called once, so no memory is leaked. */ - ogg_sync_init (&odata->oy) ; - - if ((error = ogg_read_header (psf, 1))) + if ((error = ogg_stream_classify (psf, odata)) != 0) return error ; - psf->read_short = ogg_read_s ; - psf->read_int = ogg_read_i ; - psf->read_float = ogg_read_f ; - psf->read_double = ogg_read_d ; - psf->sf.frames = ogg_length (psf) ; - } ; + if (SF_ENDIAN (psf->sf.format) != 0) + return SFE_BAD_ENDIAN ; - psf->container_close = ogg_close ; - if (psf->file.mode == SFM_WRITE) - { - /* Set the default vorbis quality here. */ - vdata->quality = 0.4 ; + switch (psf->sf.format) + { case SF_FORMAT_OGG | SF_FORMAT_VORBIS : + return ogg_vorbis_open (psf) ; - psf->write_header = ogg_write_header ; - psf->write_short = ogg_write_s ; - psf->write_int = ogg_write_i ; - psf->write_float = ogg_write_f ; - psf->write_double = ogg_write_d ; + case SF_FORMAT_OGGFLAC : + /* Reset everything to an initial state. */ + ogg_sync_clear (&odata->osync) ; + ogg_stream_clear (&odata->ostream) ; + psf_fseek (psf, pos, SEEK_SET) ; + free (psf->container_data) ; + psf->container_data = NULL ; + psf->container_close = NULL ; + return flac_open (psf) ; - psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */ - psf->str_flags = SF_STR_ALLOW_START ; - } ; + case SF_FORMAT_OGG | SF_FORMAT_OPUS : + return ogg_opus_open (psf) ; - psf->bytewidth = 1 ; - psf->blockwidth = psf->bytewidth * psf->sf.channels ; +#if ENABLE_EXPERIMENTAL_CODE + case SF_FORMAT_OGG | SF_FORMAT_SPEEX : + return ogg_speex_open (psf) ; - psf->seek = ogg_seek ; - psf->command = ogg_command ; - - /* FIXME, FIXME, FIXME : Hack these here for now and correct later. */ - psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ; - psf->sf.sections = 1 ; - - psf->datalength = 1 ; - psf->dataoffset = 0 ; - /* End FIXME. */ - - return error ; -} /* ogg_open */ - -static int -ogg_command (SF_PRIVATE *psf, int command, void * data, int datasize) -{ VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; - - switch (command) - { case SFC_SET_VBR_ENCODING_QUALITY : - if (data == NULL || datasize != sizeof (double)) - return 1 ; - - if (psf->have_written) - return 1 ; - - vdata->quality = *((double *) data) ; - - /* Clip range. */ - vdata->quality = SF_MAX (0.0, SF_MIN (1.0, vdata->quality)) ; - - psf_log_printf (psf, "%s : Setting SFC_SET_VBR_ENCODING_QUALITY to %f.\n", __func__, vdata->quality) ; - break ; + case SF_FORMAT_OGG | SF_FORMAT_PCM_16 : + case SF_FORMAT_OGG | SF_FORMAT_PCM_24 : + return ogg_pcm_open (psf) ; +#endif default : - return 0 ; - } ; - - return 0 ; -} /* ogg_command */ - -static int -ogg_rnull (int samples, void *UNUSED (vptr), int UNUSED (off) , int channels, float **UNUSED (pcm)) -{ - return samples * channels ; -} /* ogg_rnull */ - -static int -ogg_rshort (int samples, void *vptr, int off, int channels, float **pcm) -{ - short *ptr = (short*) vptr + off ; - int i = 0, j, n ; - for (j = 0 ; j < samples ; j++) - for (n = 0 ; n < channels ; n++) - { float value = pcm [n][j] ; - - if (CPU_CLIPS_POSITIVE == 0 && value >= 1.0) - { ptr [i++] = 0x7fff ; - continue ; - } ; - if (CPU_CLIPS_NEGATIVE == 0 && value <= -1.0) - { ptr [i++] = 0x8000 ; - continue ; - } ; - - ptr [i++] = lrintf (value * 32767.0f) ; - } ; - - return i ; -} /* ogg_rshort */ - -static int -ogg_rint (int samples, void *vptr, int off, int channels, float **pcm) -{ - int *ptr = (int*) vptr + off ; - int i = 0, j, n ; - - for (j = 0 ; j < samples ; j++) - for (n = 0 ; n < channels ; n++) - { float value = pcm [n][j] ; - - if (CPU_CLIPS_POSITIVE == 0 && value >= 1.0) - { ptr [i++] = 0x7fffffff ; - continue ; - } ; - if (CPU_CLIPS_NEGATIVE == 0 && value <= -1.0) - { ptr [i++] = 0x80000000 ; - continue ; - } ; - - ptr [i++] = lrintf (value * 2147483647.0f) ; - } ; - - return i ; -} /* ogg_rint */ - -static int -ogg_rfloat (int samples, void *vptr, int off, int channels, float **pcm) -{ - float *ptr = (float*) vptr + off ; - int i = 0, j, n ; - for (j = 0 ; j < samples ; j++) - for (n = 0 ; n < channels ; n++) - ptr [i++] = pcm [n][j] ; - return i ; -} /* ogg_rfloat */ - -static int -ogg_rdouble (int samples, void *vptr, int off, int channels, float **pcm) -{ - double *ptr = (double*) vptr + off ; - int i = 0, j, n ; - for (j = 0 ; j < samples ; j++) - for (n = 0 ; n < channels ; n++) - ptr [i++] = pcm [n][j] ; - return i ; -} /* ogg_rdouble */ - - -static sf_count_t -ogg_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) -{ - VORBIS_PRIVATE *vdata = psf->codec_data ; - OGG_PRIVATE *odata = psf->container_data ; - int result, len, samples, i = 0 ; - float **pcm ; - - len = lens / psf->sf.channels ; - - while ((samples = vorbis_synthesis_pcmout (&vdata->vd, &pcm)) > 0) - { if (samples > len) samples = len ; - i += transfn (samples, ptr, i, psf->sf.channels, pcm) ; - len -= samples ; - /* tell libvorbis how many samples we actually consumed */ - vorbis_synthesis_read (&vdata->vd, samples) ; - vdata->loc += samples ; - if (len == 0) - return i ; /* Is this necessary */ - } - goto start0 ; /* Jump into the nasty nest */ - while (len > 0 && !odata->eos) - { - while (len > 0 && !odata->eos) - { result = ogg_sync_pageout (&odata->oy, &odata->og) ; - if (result == 0) break ; /* need more data */ - if (result < 0) - { /* missing or corrupt data at this page position */ - psf_log_printf (psf, "Corrupt or missing data in bitstream ; continuing...\n") ; - } - else - { /* can safely ignore errors at this point */ - ogg_stream_pagein (&odata->os, &odata->og) ; - start0: - while (1) - { result = ogg_stream_packetout (&odata->os, &odata->op) ; - if (result == 0) - break ; /* need more data */ - if (result < 0) - { /* missing or corrupt data at this page position */ - /* no reason to complain ; already complained above */ - } - else - { /* we have a packet. Decode it */ - if (vorbis_synthesis (&vdata->vb, &odata->op) == 0) /* test for success! */ - vorbis_synthesis_blockin (&vdata->vd, &vdata->vb) ; - /* - ** The **pcm variable is a multichannel float vector. In stereo, for - ** example, pcm [0] is left, and pcm [1] is right. samples is - ** the size of each channel. Convert the float values - ** (-1.<=range<=1.) to whatever PCM format and write it out. - */ - - while ((samples = vorbis_synthesis_pcmout (&vdata->vd, &pcm)) > 0) - { if (samples>len) samples = len ; - i += transfn (samples, ptr, i, psf->sf.channels, pcm) ; - len -= samples ; - /* tell libvorbis how many samples we actually consumed */ - vorbis_synthesis_read (&vdata->vd, samples) ; - vdata->loc += samples ; - if (len == 0) - return i ; /* Is this necessary */ - } ; - } - } - if (ogg_page_eos (&odata->og)) odata->eos = 1 ; - } - } - if (!odata->eos) - { char *buffer ; - int bytes ; - buffer = ogg_sync_buffer (&odata->oy, 4096) ; - bytes = psf_fread (buffer, 1, 4096, psf) ; - ogg_sync_wrote (&odata->oy, bytes) ; - if (bytes == 0) odata->eos = 1 ; - } - } - return i ; -} /* ogg_read_sample */ - -static sf_count_t -ogg_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t lens) -{ return ogg_read_sample (psf, (void*) ptr, lens, ogg_rshort) ; -} /* ogg_read_s */ - -static sf_count_t -ogg_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t lens) -{ return ogg_read_sample (psf, (void*) ptr, lens, ogg_rint) ; -} /* ogg_read_i */ - -static sf_count_t -ogg_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t lens) -{ return ogg_read_sample (psf, (void*) ptr, lens, ogg_rfloat) ; -} /* ogg_read_f */ - -static sf_count_t -ogg_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t lens) -{ return ogg_read_sample (psf, (void*) ptr, lens, ogg_rdouble) ; -} /* ogg_read_d */ - -/*============================================================================== -*/ - -static void -ogg_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames) -{ - vorbis_analysis_wrote (&vdata->vd, in_frames) ; - - /* - ** Vorbis does some data preanalysis, then divvies up blocks for - ** more involved (potentially parallel) processing. Get a single - ** block for encoding now. - */ - while (vorbis_analysis_blockout (&vdata->vd, &vdata->vb) == 1) - { - /* analysis, assume we want to use bitrate management */ - vorbis_analysis (&vdata->vb, NULL) ; - vorbis_bitrate_addblock (&vdata->vb) ; - - while (vorbis_bitrate_flushpacket (&vdata->vd, &odata->op)) - { - /* weld the packet into the bitstream */ - ogg_stream_packetin (&odata->os, &odata->op) ; - - /* write out pages (if any) */ - while (!odata->eos) - { int result = ogg_stream_pageout (&odata->os, &odata->og) ; - if (result == 0) - break ; - psf_fwrite (odata->og.header, 1, odata->og.header_len, psf) ; - psf_fwrite (odata->og.body, 1, odata->og.body_len, psf) ; - - /* This could be set above, but for illustrative purposes, I do - ** it here (to show that vorbis does know where the stream ends) */ - if (ogg_page_eos (&odata->og)) - odata->eos = 1 ; - } ; - } ; - } ; - - vdata->loc += in_frames ; -} /* ogg_write_data */ - - -static sf_count_t -ogg_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens) -{ - int i, m, j = 0 ; - OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; - VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; - int in_frames = lens / psf->sf.channels ; - float **buffer = vorbis_analysis_buffer (&vdata->vd, in_frames) ; - for (i = 0 ; i < in_frames ; i++) - for (m = 0 ; m < psf->sf.channels ; m++) - buffer [m][i] = (float) (ptr [j++]) / 32767.0f ; - - ogg_write_samples (psf, odata, vdata, in_frames) ; - - return lens ; -} /* ogg_write_s */ - -static sf_count_t -ogg_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens) -{ int i, m, j = 0 ; - OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; - VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; - int in_frames = lens / psf->sf.channels ; - float **buffer = vorbis_analysis_buffer (&vdata->vd, in_frames) ; - for (i = 0 ; i < in_frames ; i++) - for (m = 0 ; m < psf->sf.channels ; m++) - buffer [m][i] = (float) (ptr [j++]) / 2147483647.0f ; - - ogg_write_samples (psf, odata, vdata, in_frames) ; - - return lens ; -} /* ogg_write_i */ - -static sf_count_t -ogg_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens) -{ int i, m, j = 0 ; - OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; - VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; - int in_frames = lens / psf->sf.channels ; - float **buffer = vorbis_analysis_buffer (&vdata->vd, in_frames) ; - for (i = 0 ; i < in_frames ; i++) - for (m = 0 ; m < psf->sf.channels ; m++) - buffer [m][i] = ptr [j++] ; - - ogg_write_samples (psf, odata, vdata, in_frames) ; - - return lens ; -} /* ogg_write_f */ - -static sf_count_t -ogg_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens) -{ int i, m, j = 0 ; - OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; - VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; - int in_frames = lens / psf->sf.channels ; - float **buffer = vorbis_analysis_buffer (&vdata->vd, in_frames) ; - for (i = 0 ; i < in_frames ; i++) - for (m = 0 ; m < psf->sf.channels ; m++) - buffer [m][i] = (float) ptr [j++] ; - - ogg_write_samples (psf, odata, vdata, in_frames) ; - - return lens ; -} /* ogg_write_d */ - -static sf_count_t -ogg_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset) -{ - OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; - VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; - - if (odata == NULL || vdata == NULL) - return 0 ; - - if (offset < 0) - { psf->error = SFE_BAD_SEEK ; - return ((sf_count_t) -1) ; - } ; - - if (psf->file.mode == SFM_READ) - { sf_count_t target = offset - vdata->loc ; - - if (target < 0) - { /* 12 to allow for OggS bit */ - psf_fseek (psf, 12, SEEK_SET) ; - ogg_read_header (psf, 0) ; /* Reset state */ - target = offset ; - } ; - - while (target > 0) - { sf_count_t m = target > 4096 ? 4096 : target ; - - /* - ** Need to multiply by channels here because the seek is done in - ** terms of frames and the read function is done in terms of - ** samples. - */ - ogg_read_sample (psf, (void *) NULL, m * psf->sf.channels, ogg_rnull) ; - - target -= m ; - } ; - - return vdata->loc ; - } ; - - return 0 ; -} /* ogg_seek */ - -/*============================================================================== -** Most of the following code was snipped from Mike Smith's ogginfo utility -** which is part of vorbis-tools. -** Vorbis tools is released under the GPL but Mike has kindly allowed the -** following to be relicensed as LGPL for libsndfile. -*/ - -typedef struct -{ - int isillegal ; - int shownillegal ; - int isnew ; - int end ; - - uint32_t serial ; /* must be 32 bit unsigned */ - ogg_stream_state os ; - - vorbis_info vi ; - vorbis_comment vc ; - sf_count_t lastgranulepos ; - int doneheaders ; -} stream_processor ; - -typedef struct -{ - stream_processor *streams ; - int allocated ; - int used ; - int in_headers ; -} stream_set ; - -static stream_set * -create_stream_set (void) -{ stream_set *set = calloc (1, sizeof (stream_set)) ; - - if (set) - { set->streams = calloc (5, sizeof (stream_processor)) ; - set->allocated = 5 ; - set->used = 0 ; - } ; - - return set ; -} /* create_stream_set */ - -static void -vorbis_end (stream_processor *stream, sf_count_t * len) -{ *len += stream->lastgranulepos ; - vorbis_comment_clear (&stream->vc) ; - vorbis_info_clear (&stream->vi) ; -} /* vorbis_end */ - -static void -free_stream_set (stream_set *set, sf_count_t * len) -{ int i ; - - for (i = 0 ; i < set->used ; i++) - { if (!set->streams [i].end) - vorbis_end (&set->streams [i], len) ; - ogg_stream_clear (&set->streams [i].os) ; - } ; - - free (set->streams) ; - free (set) ; -} /* free_stream_set */ - -static int -streams_open (stream_set *set) -{ int i, res = 0 ; - - for (i = 0 ; i < set->used ; i++) - if (!set->streams [i].end) - res ++ ; - return res ; -} /* streams_open */ - -static stream_processor * -find_stream_processor (stream_set *set, ogg_page *page) -{ uint32_t serial = ogg_page_serialno (page) ; - int i, found = 0 ; - int invalid = 0 ; - - stream_processor *stream ; - - for (i = 0 ; i < set->used ; i++) - { - if (serial == set->streams [i].serial) - { /* We have a match! */ - found = 1 ; - stream = & (set->streams [i]) ; - - set->in_headers = 0 ; - /* if we have detected EOS, then this can't occur here. */ - if (stream->end) - { stream->isillegal = 1 ; - return stream ; - } - - stream->isnew = 0 ; - stream->end = ogg_page_eos (page) ; - stream->serial = serial ; - return stream ; - } ; - } ; - - /* If there are streams open, and we've reached the end of the - ** headers, then we can't be starting a new stream. - ** XXX: might this sometimes catch ok streams if EOS flag is missing, - ** but the stream is otherwise ok? - */ - if (streams_open (set) && !set->in_headers) - invalid = 1 ; - - set->in_headers = 1 ; - - if (set->allocated < set->used) - stream = &set->streams [set->used] ; - else - { set->allocated += 5 ; - set->streams = realloc (set->streams, sizeof (stream_processor) * set->allocated) ; - stream = &set->streams [set->used] ; - } ; - - set->used++ ; - - stream->isnew = 1 ; - stream->isillegal = invalid ; - - { - int res ; - ogg_packet packet ; - - /* We end up processing the header page twice, but that's ok. */ - ogg_stream_init (&stream->os, serial) ; - ogg_stream_pagein (&stream->os, page) ; - res = ogg_stream_packetout (&stream->os, &packet) ; - if (res <= 0) - return NULL ; - else if (packet.bytes >= 7 && memcmp (packet.packet, "\x01vorbis", 7) == 0) - { - stream->lastgranulepos = 0 ; - vorbis_comment_init (&stream->vc) ; - vorbis_info_init (&stream->vi) ; - } ; - - res = ogg_stream_packetout (&stream->os, &packet) ; - - /* re-init, ready for processing */ - ogg_stream_clear (&stream->os) ; - ogg_stream_init (&stream->os, serial) ; - } - - stream->end = ogg_page_eos (page) ; - stream->serial = serial ; - - return stream ; -} /* find_stream_processor */ - -static int -ogg_length_get_next_page (SF_PRIVATE *psf, ogg_sync_state * osync, ogg_page *page) -{ static const int CHUNK_SIZE = 4500 ; - - while (ogg_sync_pageout (osync, page) <= 0) - { char * buffer = ogg_sync_buffer (osync, CHUNK_SIZE) ; - int bytes = psf_fread (buffer, 1, 4096, psf) ; - - if (bytes <= 0) - { ogg_sync_wrote (osync, 0) ; - return 0 ; - } ; - - ogg_sync_wrote (osync, bytes) ; - } ; - - return 1 ; -} /* ogg_length_get_next_page */ - -static sf_count_t -ogg_length_aux (SF_PRIVATE * psf) -{ - ogg_sync_state osync ; - ogg_page page ; - int gotpage = 0 ; - sf_count_t len = 0 ; - stream_set *processors ; - - processors = create_stream_set () ; - if (processors == NULL) - return 0 ; // out of memory? - - ogg_sync_init (&osync) ; - - while (ogg_length_get_next_page (psf, &osync, &page)) - { - stream_processor *p = find_stream_processor (processors, &page) ; - gotpage = 1 ; - - if (!p) - { len = 0 ; break ; - } ; + } ; - if (p->isillegal && !p->shownillegal) - { - p->shownillegal = 1 ; - /* If it's a new stream, we want to continue processing this page - ** anyway to suppress additional spurious errors - */ - if (!p->isnew) continue ; - } ; + psf_log_printf (psf, "%s : bad psf->sf.format 0x%x.\n", __func__, psf->sf.format) ; + return SFE_INTERNAL ; +} /* ogg_open */ - if (!p->isillegal) - { ogg_packet packet ; - int header = 0 ; +/*============================================================================== +** Private functions. +*/ - ogg_stream_pagein (&p->os, &page) ; - if (p->doneheaders < 3) - header = 1 ; +static int +ogg_close (SF_PRIVATE *psf) +{ OGG_PRIVATE* odata = psf->container_data ; - while (ogg_stream_packetout (&p->os, &packet) > 0) - { - if (p->doneheaders < 3) - { if (vorbis_synthesis_headerin (&p->vi, &p->vc, &packet) < 0) - continue ; - p->doneheaders ++ ; - } ; - } ; - if (!header) - { sf_count_t gp = ogg_page_granulepos (&page) ; - if (gp > 0) p->lastgranulepos = gp ; - } ; - if (p->end) - { vorbis_end (p, &len) ; - p->isillegal = 1 ; - } ; + ogg_sync_clear (&odata->osync) ; + ogg_stream_clear (&odata->ostream) ; + + return 0 ; +} /* ogg_close */ + +static int +ogg_stream_classify (SF_PRIVATE *psf, OGG_PRIVATE* odata) +{ int error ; + + /* Call this here so it only gets called once, so no memory is leaked. */ + ogg_sync_init (&odata->osync) ; + ogg_stream_init (&odata->ostream, 0) ; + + /* Load the first page in the physical bitstream. */ + if ((error = ogg_read_first_page (psf, odata)) != 0) + return error ; + + odata->codec = ogg_page_classify (psf, &odata->opage) ; + + switch (odata->codec) + { case OGG_VORBIS : + psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ; + return 0 ; + + case OGG_FLAC : + case OGG_FLAC0 : + psf->sf.format = SF_FORMAT_OGGFLAC ; + return 0 ; + + case OGG_SPEEX : + psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_SPEEX ; + return 0 ; + + case OGG_OPUS : + psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_OPUS ; + return 0 ; + + case OGG_PCM : + psf_log_printf (psf, "Detected Ogg/PCM data. This is not supported yet.\n") ; + return SFE_UNIMPLEMENTED ; + + default : + break ; + } ; + + psf_log_printf (psf, "This Ogg bitstream contains some uknown data type.\n") ; + return SFE_UNIMPLEMENTED ; +} /* ogg_stream_classify */ + +/*============================================================================== +*/ + +static struct +{ const char *str, *name ; + int len, codec ; +} codec_lookup [] = +{ { "Annodex", "Annodex", 8, OGG_ANNODEX }, + { "AnxData", "AnxData", 7, OGG_ANXDATA }, + { "\177FLAC", "Flac1", 5, OGG_FLAC }, + { "fLaC", "Flac0", 4, OGG_FLAC0 }, + { "PCM ", "PCM", 8, OGG_PCM }, + { "Speex", "Speex", 5, OGG_SPEEX }, + { "\001vorbis", "Vorbis", 7, OGG_VORBIS }, + { "OpusHead", "Opus", 8, OGG_OPUS }, +} ; + +static int +ogg_page_classify (SF_PRIVATE * psf, const ogg_page * og) +{ int k, len ; + + for (k = 0 ; k < ARRAY_LEN (codec_lookup) ; k++) + { if (codec_lookup [k].len > og->body_len) + continue ; + + if (memcmp (og->body, codec_lookup [k].str, codec_lookup [k].len) == 0) + { psf_log_printf (psf, "Ogg stream data : %s\n", codec_lookup [k].name) ; + psf_log_printf (psf, "Stream serialno : %u\n", (uint32_t) ogg_page_serialno (og)) ; + return codec_lookup [k].codec ; } ; } ; - ogg_sync_clear (&osync) ; - free_stream_set (processors, &len) ; + len = og->body_len < 8 ? og->body_len : 8 ; - return len ; -} /* ogg_length_aux */ + psf_log_printf (psf, "Ogg_stream data : '") ; + for (k = 0 ; k < len ; k++) + psf_log_printf (psf, "%c", isprint (og->body [k]) ? og->body [k] : '.') ; + psf_log_printf (psf, "' ") ; + for (k = 0 ; k < len ; k++) + psf_log_printf (psf, " %02x", og->body [k] & 0xff) ; + psf_log_printf (psf, "\n") ; -static sf_count_t -ogg_length (SF_PRIVATE *psf) -{ sf_count_t length ; - int error ; + return 0 ; +} /* ogg_page_classify */ - if (psf->sf.seekable == 0) - return SF_COUNT_MAX ; +/* +** Scale x from the range [0, from] to the range [0, to] +*/ +static uint64_t +ogg_page_search_do_rescale (uint64_t x, uint64_t from, uint64_t to) +{ uint64_t frac ; + uint64_t ret ; + int i ; - psf_fseek (psf, 0, SEEK_SET) ; - length = ogg_length_aux (psf) ; + /* I should have paid more attention in CSc 349A: Numerical Analysis */ + if (x >= from) + return to ; + if (x == 0) + return 0 ; + frac = 0 ; + for (i = 0 ; i < 63 ; i++) + { frac <<= 1 ; + if (x >= from >> 1) + { x -= from - x ; + frac |= 1 ; + } + else + x <<= 1 ; + } + ret = 0 ; + for (i = 0 ; i < 63 ; i++) + { if (frac & 1) + ret = (ret & to & 1) + (ret >> 1) + (to >> 1) ; + else + ret >>= 1 ; + frac >>= 1 ; + } + return ret ; +} /* ogg_page_search_do_rescale */ - psf_fseek (psf, 12, SEEK_SET) ; - if ((error = ogg_read_header (psf, 0)) != 0) - psf->error = error ; +static void +ogg_page_search_continued_data (OGG_PRIVATE *odata, ogg_page *page) +{ ogg_stream_pagein (&odata->ostream, page) ; + while (ogg_stream_packetout (&odata->ostream, &odata->opacket)) ; +} /* ogg_page_search_continued_data */ - return length ; -} /* ogg_length */ - -#else /* HAVE_EXTERNAL_LIBS */ +#else /* HAVE_EXTERNAL_XIPH_LIBS */ int ogg_open (SF_PRIVATE *psf) diff --git a/lib-src/libsndfile/src/ogg.h b/lib-src/libsndfile/src/ogg.h new file mode 100644 index 000000000..5c837a8e3 --- /dev/null +++ b/lib-src/libsndfile/src/ogg.h @@ -0,0 +1,134 @@ +/* +** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2018 Arthur Taylor +** +** This program is free software ; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program ; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#ifndef SF_SRC_OGG_H +#define SF_SRC_OGG_H + +enum +{ OGG_ANNODEX = 300, + OGG_ANXDATA, + OGG_FLAC, + OGG_FLAC0, + OGG_PCM, + OGG_SPEEX, + OGG_VORBIS, + OGG_OPUS, +} ; + +typedef struct +{ /* Sync and verify incoming physical bitstream */ + ogg_sync_state osync ; + /* Take physical pages, weld into a logical stream of packets */ + ogg_stream_state ostream ; + /* One Ogg bitstream page. Codec packets are inside */ + ogg_page opage ; + /* One raw packet of data for decode */ + ogg_packet opacket ; + + /* Unpacked packets. 255 is max there can ever be in one page. */ + ogg_packet pkt [255] ; + /* How many packets */ + int pkt_len ; + /* Current packet */ + int pkt_indx ; + + int eos ; + int codec ; +} OGG_PRIVATE ; + + +#define readint(buf, base) (((buf [base + 3] << 24) & 0xff000000) | \ + ((buf [base + 2] <<16) & 0xff0000) | \ + ((buf [base + 1] << 8) & 0xff00) | \ + (buf [base] & 0xff)) + +int ogg_read_first_page (SF_PRIVATE *, OGG_PRIVATE *) ; + +/* +** Write the whole Ogg page out. Convenience function as the ogg_page struct +** splits header and body data into separate buffers. +*/ +int ogg_write_page (SF_PRIVATE *, ogg_page *) ; + +/* +** Wrapper around psf_ftell() that returns the current offset in the file after +** the most recent page that has been returned by ogg_sync_pageout(). +*/ +sf_count_t ogg_sync_ftell (SF_PRIVATE *) ; + +/* +** Wrapper around psf_fseek() that on success resets the ogg_sync_state struct +** so that it doesn't get corrupted. +*/ +sf_count_t ogg_sync_fseek (SF_PRIVATE *, sf_count_t offset, int whence) ; + +/* +** Get the next page from the physical bitstream, reading in data as necessary. +** Pays no attention to Ogg BOS/EOS markers or stream serial numbers. +** The page is buffered in the ogg_sync_state struct, (replacing any other +** buffered there) and also returned in *og. readmax sets a boundary for how +** many bytes more may be read from the file, use already buffered only, or +** unlimited reading in the case of a positive, zero or negative argument +** respectively. If a pointer to a sf_count_t is passed in offset, then it will +** be incremented by how many bytes were skipped to find the next page header. +** (Useful for seeking, normally zero.) Returns the page size in bytes on +** success, 0 on out-of-data (be it end of file or readmax reached) and -1 on +** error with psf->error set appropriately. +*/ +int ogg_sync_next_page (SF_PRIVATE * psf, ogg_page *og, sf_count_t readmax, sf_count_t *offset) ; + +/* +** Load the last page of a stream before the provided file offset. Searches the +** physical bitstream, and selects a page of the passed serialno. The page +** found is loaded in the sync buffer and exposed in odata->opage, and not +** loaded into the ogg_stream_state. If found, the granulepos is returned in +** *gp_out. Returns the file offset *before* the last page on success, or -1 on +** error, setting psf->error as appropriate. +*/ +sf_count_t ogg_sync_last_page_before (SF_PRIVATE *psf, OGG_PRIVATE *odata, uint64_t *gp_out, sf_count_t offset, int32_t serialno) ; + +/* +** Load the next page from the virtual bitstream, reading data as necessary. +** Reads in pages from the physical bitstream, skipping pages until one of the +** virtual bitstream of interest is found, and then feeds it into the +** ogg_stream_state of odata->ostream, where it is buffered. Heeds EOS markers. +** Returns 1 on success, 0 on end of stream, and -1 on fatal error. +*/ +int ogg_stream_next_page (SF_PRIVATE * psf, OGG_PRIVATE *odata) ; + +/* +** Loads the next page using ogg_stream_next_page() and unpacks all packets +** into the array odata->pkt, updating odata->pkt_len and setting +** odata->pkt_indx to 0. Returns 1 if okay, 2 if okay but a hole was found +** in the bitstream, 0 if on end of stream, and -1 on fatal error. +*/ +int ogg_stream_unpack_page (SF_PRIVATE *psf, OGG_PRIVATE *odata) ; + +/* +** Seek within the Ogg virtual bitstream for a page containing target_gp. +** Preforms a bisection search. If not found exactly, the best result is +** returned in *best_gp. Found page is loaded into the virtual bitstream, +** ready for unpacking. Arguments pcm_start and pcm_end are the highest and +** lowest granule positions of the file. begin and end are the file offsets. +*/ +int ogg_stream_seek_page_search (SF_PRIVATE *psf, OGG_PRIVATE *odata, + uint64_t target_gp, uint64_t pcm_start, uint64_t pcm_end, + uint64_t *best_gp, sf_count_t begin, sf_count_t end) ; + +#endif /* SF_SRC_OGG_H */ diff --git a/lib-src/libsndfile/src/ogg_opus.c b/lib-src/libsndfile/src/ogg_opus.c new file mode 100644 index 000000000..8fd2b2033 --- /dev/null +++ b/lib-src/libsndfile/src/ogg_opus.c @@ -0,0 +1,1747 @@ +/* +** Copyright (C) 2013-2019 Erik de Castro Lopo +** Copyright (C) 2018 Arthur Taylor +** +** This program is free software ; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program ; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +/* +** This file contains code based on OpusFile and Opus-Tools, both by +** Xiph.Org. COPYING from each is identical and is as follows: +** +** Copyright (c) 1994-2013 Xiph.Org Foundation and contributors +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** - Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** - Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** +** - Neither the name of the Xiph.Org Foundation nor the names of its +** contributors may be used to endorse or promote products derived from +** this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION +** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +/* +** TODO: +** - Channel mapping modification / reporting +** - connect psf->channel_map and Opus channel mapping somehow? +** - Gain parameters and their mappings +*/ + +/* +** Opus Sample, Frame, and Samples/Channel Terminology +** +** libsndfile refers to one PCM value as a 'sample,' and a group of samples of +** the same sample time, one for each channel, as a 'frame.' This differs from +** Opus, which has no corresponding name for sample, and refers to a group of +** PCM values, one per channel (aka libsndfile frames) as 'samples.' +** Further, Opus has an object called a 'frame' that is made up of multiple +** Opus-samples. +** All this means that one has to be careful with what is meant by each term. +** In an attempt to avoid ambiguity, this file adopts the following terms: +** - Samples shall refer to discrete PCM values, regardless of any channel +** considerations. This is the same as what libsndfile calls samples. +** - Samples/channel shall refer to groups of samples, one for each channel. +** This is what Opus calles samples, and what libsndfile calles frames. It +** has the advantage that its name is also the formula to calculate it. +** +** +** Opus vs OggOpus +** +** In this file a distinction is made between Opus and OggOpus. Opus refers to +** the codec alone, support for which is by libopus. OggOpus refers to an Opus +** payload encapsulated in an Ogg stream. This is also know as an "Opus file." +** The OggOpus spec includes information on header and granule position +** interpretation, which is outside of the scope of the Opus spec. As such, an +** attempt here is made to refer to either Opus or OggOpus depending on which +** spec is being referenced. See https://wiki.xiph.org/OggOpus +** +** +** Opus Sample Rates +** +** Opus only supports a fixed number of sample rates: 48kHz, 24kHz, 16kHz, +** 12kHz, 8kHz. Audio may be decoded or encoded at any of these rates, +** independent of the rate it was encoded at or to be decoded at respectively. +** Other sample rates must be converted to one of these rates. +** +** As 44.1kHz (CD sample rate) and 22.5kHz are popular sample rates, and to +** support any other sample rate there may be, the Opus header includes a field +** to save the input (original) sample rate before converting it to a supported +** one. Implementations are recommended by the Opus spec to do a sample rate +** conversion at encode, but decode at 48kHz if outputting to hardware, or do +** the reverse sample rate conversion if outputting to file. +** +** Heretofore libsndfile does not contain a sample rate converter, so doing the +** sample rate conversion is not supported. Instead audio must be provided by +** the user at a supported rate. However, the input sample rate field can be +** set and retrieved by the user using sf_command(). At decode we choose to +** decode at the lowest valid rate that is greater than or equal to the input +** sample rate. +** +** +** OggOpus Granule Positions +** +** Ogg streams include a strictly increasing granule position value. The +** interpretation of this value is dependent on the payload type. For Opus +** streams the granule position is the count of samples in the stream when +** encoding/decoding at 48kHz. Note that the actual position of the output +** sample relative to the granule position is offset by the preskip amount. +** That is, if a packet ends with a granule position of x, the last sample +** output when decoding is actually sample (x - preskip). +** +** Further, to allow for clipping off of the front of a stream without +** rewriting all following granule positions, an Opus stream granule position +** may be offset by a constant amount. This amount is evident by comparing the +** granule position of the first page of an Opus stream on which an audio +** packet completes is greater than the sum of the samples of all audio +** packets completed on the page. Only the first such page is allows to have an +** 'excessive' granule position, and only if it is not also the last page of +** the stream (e_o_s bit is not set.) +** +** The granule position is an unsigned 64-bit integer, with the special value +** of UINT64_MAX/-1 being treated as invalid. However, as not all platforms +** support unsigned 64-bit integers, libOgg uses signed 64-bit integers for the +** granule position. +** +** Remembering that signed integer overflow/underflow is explicitly undefined +** in C, and as we already assume support for unsigned 64-bit integers, the +** easiest way to deal with this problem is to modify granule positions as +** unsigned integers. +*/ + + +#include "sfconfig.h" + +#include +#include +#include +#include +#include +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" + +#if HAVE_EXTERNAL_XIPH_LIBS + +#include +#include +#include + +#include "ogg.h" +#include "ogg_vcomment.h" + +#define OGG_OPUS_COMMENT_PAD (512) /* Same as oggenc default */ +#define OGG_OPUS_PAGE_LATENCY (1000 * 48) /* 1 second */ + +/* +** Opus packets can be any multiple of 2.5ms (at 48kHz). We use the recommended +** default for non-realtime of 20ms. While longer packets reduce the overhead +** data somewhat, it also decreases the quality. +*/ +#define OGG_OPUS_ENCODE_PACKET_LEN(samplerate) ((20 * (samplerate)) / 1000) + +/* +** How long does it take for a decoder to converge (avoiding flush on seek. +*/ +#define OGG_OPUS_PREROLL (80 * 48) /* 80 milliseconds */ + +typedef struct +{ int version ; + + /* Number of channels, 1...255 */ + int channels ; + + /* Encoder latency, the amount to skip before valid data comes out. */ + int preskip ; + + /* The sample rate of a the encoded source, as it may have been converted. */ + int input_samplerate ; + + /* 'baked-in' gain to apply, dB S7.8 format. Should be zero when possible. */ + int16_t gain ; + + /* Channel mapping type. See OggOpus spec */ + int channel_mapping ; + + /* The rest is only used if channel_mapping != 0 */ + /* How many streams are there? */ + int nb_streams ; + + /* How man of those streams are coupled? (aka stereo) */ + int nb_coupled ; + + /* Mapping of opus streams to output channels */ + unsigned char stream_map [255] ; +} OpusHeader ; + +typedef struct +{ uint32_t serialno ; + OpusHeader header ; + + /* Granule position before the current packet */ + uint64_t pkt_pos ; + + /* Granule position at the end of the current page (encode: last completed) */ + uint64_t pg_pos ; + + /* integer coefficient of (current sample rate) / 48000Hz */ + int sr_factor ; + + /* Current position in buffer expressed as samples/channel */ + int loc ; + + /* Current data fill (decode) or target (encode) of buffer expressed in samples/channel */ + int len ; + + /* Size of the buffer storage, in sizeof (float) * channels */ + int buffersize ; + + /* Samples, either decoded from a packet, or assembling for encode. */ + float *buffer ; + + union { + /* decode only members */ + struct { + OpusMSDecoder *state ; + uint64_t gp_start ; + uint64_t gp_end ; + sf_count_t last_offset ; + } decode ; + + /* encode only members */ + struct { + OpusMSEncoder *state ; + + /* How many Ogg page segments are in Ogg page currently being assembled. */ + int last_segments ; + + int bitrate ; + + /* Least significant bit of the source (aka bitwidth) */ + int lsb ; + int lsb_last ; + } encode ; + } u ; +} OPUS_PRIVATE ; + +/*----------------------------------------------------------------------------------------------- +** Private function prototypes. +*/ + +static int ogg_opus_close (SF_PRIVATE *psf) ; +static void opus_print_header (SF_PRIVATE *psf, OpusHeader *h) ; +static int opus_read_header_packet (SF_PRIVATE *psf, OpusHeader *h, ogg_packet *opacket) ; +static int ogg_opus_read_header (SF_PRIVATE * psf) ; +static int ogg_opus_setup_decoder (SF_PRIVATE *psf, int input_samplerate) ; + +static int ogg_opus_setup_encoder (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) ; +static int ogg_opus_write_header (SF_PRIVATE * psf, int calc_length) ; +static void ogg_opus_flush (SF_PRIVATE *psf) ; +static int ogg_opus_unpack_next_page (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) ; +static int ogg_opus_calculate_page_duration (OGG_PRIVATE *odata) ; +static int ogg_opus_read_refill (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) ; +static int ogg_opus_write_out (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) ; + +static sf_count_t ogg_opus_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; +static sf_count_t ogg_opus_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; +static sf_count_t ogg_opus_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; +static sf_count_t ogg_opus_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; + +static sf_count_t ogg_opus_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; +static sf_count_t ogg_opus_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; +static sf_count_t ogg_opus_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; +static sf_count_t ogg_opus_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; + +static sf_count_t ogg_opus_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; +static sf_count_t ogg_opus_seek_null_read (SF_PRIVATE *psf, sf_count_t offset) ; +static sf_count_t ogg_opus_seek_manual (SF_PRIVATE *psf, uint64_t target_gp) ; +static int ogg_opus_seek_page_search (SF_PRIVATE *psf, uint64_t target_gp) ; + +static int ogg_opus_analyze_file (SF_PRIVATE *psf) ; +static int ogg_opus_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; +static int ogg_opus_byterate (SF_PRIVATE *psf) ; + +/*----------------------------------------------------------------------------------------------- +*/ + +static vorbiscomment_ident opustags_ident = { "OpusTags", 8 } ; + +/*----------------------------------------------------------------------------------------------- +** Exported functions. +*/ + +int +ogg_opus_open (SF_PRIVATE *psf) +{ OGG_PRIVATE* odata = psf->container_data ; + OPUS_PRIVATE* oopus = calloc (1, sizeof (OPUS_PRIVATE)) ; + int error = 0 ; + + if (odata == NULL) + { psf_log_printf (psf, "%s : odata is NULL???\n", __func__) ; + return SFE_INTERNAL ; + } ; + + psf->codec_data = oopus ; + if (oopus == NULL) + return SFE_MALLOC_FAILED ; + + if (psf->file.mode == SFM_RDWR) + return SFE_BAD_MODE_RW ; + + psf_log_printf (psf, "Opus library version: %s\n", opus_get_version_string ()) ; + + psf->codec_close = ogg_opus_close ; + if (psf->file.mode == SFM_READ) + { if ((error = ogg_opus_read_header (psf))) + return error ; + if ((error = ogg_opus_analyze_file (psf))) + return error ; + + psf->read_short = ogg_opus_read_s ; + psf->read_int = ogg_opus_read_i ; + psf->read_float = ogg_opus_read_f ; + psf->read_double = ogg_opus_read_d ; + } ; + + if (psf->file.mode == SFM_WRITE) + { if ((error = ogg_opus_setup_encoder (psf, odata, oopus))) + return error ; + + psf->write_header = ogg_opus_write_header ; + psf->write_short = ogg_opus_write_s ; + psf->write_int = ogg_opus_write_i ; + psf->write_float = ogg_opus_write_f ; + psf->write_double = ogg_opus_write_d ; + + psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */ + psf->strings.flags = SF_STR_ALLOW_START ; + psf->datalength = 0 ; + psf->dataoffset = 0 ; /* will be updated */ + } ; + + psf->seek = ogg_opus_seek ; + psf->command = ogg_opus_command ; + psf->byterate = ogg_opus_byterate ; + psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_OPUS ; + + return error ; +} /* ogg_opus_open */ + +/*============================================================================== +** Private functions. +*/ + +static int +ogg_opus_close (SF_PRIVATE *psf) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + + if (!oopus) + return 0 ; + + if (psf->file.mode == SFM_WRITE) + { if (psf->have_written) + ogg_opus_flush (psf) ; + else { + /* Write a header... it is expected. */ + ogg_opus_write_header (psf, 0) ; + } ; + ogg_packet_clear (&odata->opacket) ; + if (oopus->u.encode.state) + { opus_multistream_encoder_destroy (oopus->u.encode.state) ; + oopus->u.encode.state = NULL ; + } ; + } + else if (psf->file.mode == SFM_READ) + { if (oopus->u.decode.state) + { opus_multistream_decoder_destroy (oopus->u.decode.state) ; + oopus->u.decode.state = NULL ; + } ; + } ; + + psf->codec_data = NULL ; + if (oopus->buffer) + free (oopus->buffer) ; + free (oopus) ; + + return 0 ; +} /* ogg_opus_close */ + +static void +opus_print_header (SF_PRIVATE *psf, OpusHeader *h) +{ psf_log_printf (psf, "Opus Header Metadata\n") ; + psf_log_printf (psf, " OggOpus version : %d\n", h->version) ; + psf_log_printf (psf, " Channels : %d\n", h->channels) ; + psf_log_printf (psf, " Preskip : %d samples @48kHz\n", h->preskip) ; + psf_log_printf (psf, " Input Samplerate : %d Hz\n", h->input_samplerate) ; + psf_log_printf (psf, " Gain : %d.%d\n", arith_shift_right (h->gain & 0xF0, 8), h->gain & 0x0F) ; + psf_log_printf (psf, " Channel Mapping : ") ; + switch (h->channel_mapping) + { case 0 : psf_log_printf (psf, "0 (mono or stereo)\n") ; break ; + case 1 : psf_log_printf (psf, "1 (surround, AC3 channel order)\n") ; break ; + case 255 : psf_log_printf (psf, "255 (no channel order)\n") ; break ; + default : psf_log_printf (psf, "%d (unknown or unsupported)\n", h->channel_mapping) ; break ; + } ; + + if (h->channel_mapping > 0) + { int i ; + psf_log_printf (psf, " streams total : %d\n", h->nb_streams) ; + psf_log_printf (psf, " streams coupled : %d\n", h->nb_coupled) ; + psf_log_printf (psf, " stream mapping : [") ; + for (i = 0 ; i < h->channels - 1 ; i++) + psf_log_printf (psf, "%d,", h->stream_map [i]) ; + psf_log_printf (psf, "%d]\n", h->stream_map [i]) ; + } ; +} /* opus_print_header */ + +static int +opus_read_header_packet (SF_PRIVATE *psf, OpusHeader *h, ogg_packet *opacket) +{ int count, i ; + + /* + ** Opus headers are 19 bytes, in the case of type 0 channel mapping, + ** or 19 + 2 + (1 * channel count) bytes for other channel mappings, to a + ** maximum of 276 (255 channels). + */ + + if (opacket->bytes < 19 || opacket->bytes > 276) + return SFE_MALFORMED_FILE ; + + if (memcmp (opacket->packet, "OpusHead", 8) != 0) + return SFE_MALFORMED_FILE ; + + /* + ** Copy the header page into the binheader so we can use binheader + ** functions to safely unpack it. + */ + count = psf_binheader_writef (psf, "ob", BHWo (0), BHWv (opacket->packet), BHWz (opacket->bytes)) ; + psf->header.end = count ; + + count = psf_binheader_readf (psf, "ep1", 8, &h->version) ; + if (! (h->version == 1 || h->version == 0)) + { psf_log_printf (psf, "Opus : Unknown / unsupported embedding scheme version: %d.\n", h->version) ; + return SFE_UNIMPLEMENTED ; + } ; + + count += psf_binheader_readf (psf, "e12421", &h->channels, &h->preskip, + &h->input_samplerate, &h->gain, &h->channel_mapping) ; + + if (h->channel_mapping == 0) + { if (h->channels > 2) + return SFE_MALFORMED_FILE ; + + /* + ** Setup the stream mapping, so we can use the multistream decoder, + ** rather than have to deal with two decoder pointer types + */ + h->nb_streams = 1 ; + h->nb_coupled = h->channels - 1 ; + h->stream_map [0] = 0 ; + h->stream_map [1] = 1 ; + } + else + { if (opacket->bytes < 19 + 2 + h->channels) + return SFE_MALFORMED_FILE ; + + if (h->channel_mapping == 1 && h->channels > 8) + return SFE_MALFORMED_FILE ; + + count += psf_binheader_readf (psf, "11", &h->nb_streams, &h->nb_coupled) ; + + if (h->nb_streams < 1 || + h->nb_coupled > h->nb_streams || + h->nb_coupled + h->nb_streams > 255) + return SFE_MALFORMED_FILE ; + + for (i = 0 ; i < h->channels ; i++) + { count += psf_binheader_readf (psf, "1", &(h->stream_map [i])) ; + if (h->stream_map [i] > h->nb_streams + h->nb_coupled && h->stream_map [i] != 255) + return SFE_MALFORMED_FILE ; + } ; + } ; + + if (count != opacket->bytes) + { /* OggOpus spec mandates that this is a hard error. */ + psf_log_printf (psf, "Opus : Error, extra data in Ogg Opus header.\n") ; + return SFE_MALFORMED_FILE ; + } ; + + opus_print_header (psf, h) ; + + return 0 ; +} /* ogg_opus_read_header_packet */ + +static int +ogg_opus_read_header (SF_PRIVATE *psf) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + int error ; + + /* + ** First page is already loaded by the ogg container code when it + ** classified the stream, no need to re-load it now. + */ + + if (ogg_page_packets (&odata->opage) != 1 || !ogg_page_bos (&odata->opage)) + return SFE_MALFORMED_FILE ; + + oopus->serialno = ogg_page_serialno (&odata->opage) ; + if ((error = opus_read_header_packet (psf, &oopus->header, &odata->opacket))) + return error ; + + /* + ** The comment header MUST be next. It is one packet, that packet MUST begin + ** on the second page of the stream, but it MAY span multiple pages. + */ + + while (ogg_stream_packetout (&odata->ostream, &odata->opacket) != 1) + { if (ogg_stream_next_page (psf, odata) != 1) + { /* out of data... technically that's malformed. */ + return psf->error ? psf->error : SFE_MALFORMED_FILE ; + } ; + } ; + + if ((error = vorbiscomment_read_tags (psf, &odata->opacket, &opustags_ident))) + return error ; + + return ogg_opus_setup_decoder (psf, oopus->header.input_samplerate) ; +} /* ogg_opus_read_header */ + +static int +ogg_opus_setup_decoder (SF_PRIVATE *psf, int input_samplerate) +{ OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + OpusMSDecoder *decoder ; + int sr_factor ; + int error ; + + /* + ** Decide what sample rate to decode at. We choose the lowest valid rate + ** that is greater or equal to the original rate. + ** + ** Opus documentation recommends always decoding at 48000Hz if the file is + ** being decoded for playback, since most hardware will resample it back to + ** 48000Hz anyways. We don't know if that's true, maybe the user is + ** decoding for editing or transcoding purposes. + */ + if (input_samplerate > 24000) + sr_factor = 1 ; + else if (input_samplerate > 16000) + sr_factor = 2 ; + else if (input_samplerate > 12000) + sr_factor = 3 ; + else if (input_samplerate > 8000) + sr_factor = 4 ; + else + sr_factor = 6 ; + + decoder = opus_multistream_decoder_create ( + 48000 / sr_factor, + oopus->header.channels, + oopus->header.nb_streams, + oopus->header.nb_coupled, + oopus->header.stream_map, + &error) ; + + if (error != OPUS_OK) + { psf_log_printf (psf, "Opus : Failed to create multistream decoder: %s\n", + opus_strerror (error)) ; + return SFE_INTERNAL ; + } + + /* + ** Replace the decoder, if one was already initialized (see + ** SFC_GET_ORIGINAL_SAMPLERATE) + */ + if (oopus->u.decode.state) + opus_multistream_decoder_destroy (oopus->u.decode.state) ; + oopus->u.decode.state = decoder ; + + oopus->sr_factor = sr_factor ; + psf->sf.samplerate = 48000 / sr_factor ; + psf->sf.channels = oopus->header.channels ; + oopus->loc = oopus->len = 0 ; + + /* + ** The Opus decoder can do our gain for us. The OggOpus header contains a + ** gain field. This field, unlike various gain-related tags, is intended to + ** be a perminent baked-in gain applied before any user-configurable gain + ** (eg replay-gain.) This is so the gain of track can be set without having + ** to re-encode. + ** + ** Both the header.gain field and the parameter are in the Q7.8 format. + ** + ** TODO: Make this configurable? Include other gain sources too? + */ + opus_multistream_decoder_ctl (oopus->u.decode.state, OPUS_SET_GAIN (oopus->header.gain)) ; + + /* + ** Opus packets can vary in length, with the legal values being 2.5, 5, 10, + ** 20, 40 or 60ms. The recommended default for non-realtime is 20ms. As + ** such, allocate a buffer of that size now, we'll realloc later if a + ** larger one is needed. + ** + ** buffersize is expressed in samples/channel, as that is what opus_decode + ** expects. + */ + if (oopus->buffer) + { free (oopus->buffer) ; + oopus->buffer = NULL ; + } ; + oopus->buffersize = 20 * psf->sf.samplerate / 1000 ; + oopus->buffer = malloc (sizeof (float) * psf->sf.channels * oopus->buffersize) ; + if (oopus->buffer == NULL) + return SFE_MALLOC_FAILED ; + + return 0 ; +} /* ogg_opus_setup_decoder */ + +static int +ogg_opus_setup_encoder (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) +{ int error ; + + switch (psf->sf.samplerate) + { case 8000 : + case 12000 : + case 16000 : + case 24000 : + case 48000 : + oopus->sr_factor = 48000 / psf->sf.samplerate ; + break ; + default : + return SFE_OPUS_BAD_SAMPLERATE ; + } ; + + if (psf->sf.channels <= 2) + { oopus->header.channel_mapping = 0 ; + oopus->header.nb_streams = 1 ; + oopus->header.nb_coupled = psf->sf.channels - 1 ; + oopus->header.stream_map [0] = 0 ; + oopus->header.stream_map [1] = 1 ; + + oopus->u.encode.state = opus_multistream_encoder_create ( + psf->sf.samplerate, + psf->sf.channels, + oopus->header.nb_streams, + oopus->header.nb_coupled, + oopus->header.stream_map, + OPUS_APPLICATION_AUDIO, + &error) ; + } + else + { if (psf->sf.channels <= 8) + { /* Use Vorbis/AC3 channel mappings for surround. */ + oopus->header.channel_mapping = 1 ; + } + else + { /* There is no channel mapping, just audio, in parallel, good luck */ + oopus->header.channel_mapping = 255 ; + } + + oopus->u.encode.state = opus_multistream_surround_encoder_create ( + psf->sf.samplerate, + psf->sf.channels, + oopus->header.channel_mapping, + &oopus->header.nb_streams, + &oopus->header.nb_coupled, + oopus->header.stream_map, + OPUS_APPLICATION_AUDIO, + &error) ; + } + + if (error != OPUS_OK) + { psf_log_printf (psf, "Opus : Error, opus_multistream_encoder_create returned %s\n", opus_strerror (error)) ; + return SFE_BAD_OPEN_FORMAT ; + } ; + + opus_multistream_encoder_ctl (oopus->u.encode.state, OPUS_GET_BITRATE (&oopus->u.encode.bitrate)) ; + psf_log_printf (psf, "Encoding at target bitrate of %dbps\n", oopus->u.encode.bitrate) ; + + /* TODO: Make configurable? */ + error = opus_multistream_encoder_ctl (oopus->u.encode.state, OPUS_SET_COMPLEXITY (10)) ; + if (error != OPUS_OK) + { /* Non-fatal */ + psf_log_printf (psf, "Opus : OPUS_SET_COMPLEXITY returned: %s\n", opus_strerror (error)) ; + } + + /* + ** Get the encoder delay. This can vary depending on implementation and + ** encoder configuration. + ** GOTCHA: This returns the preskip at the encoder samplerate, not the + ** granulepos rate of 48000Hz needed for header.preskip. + */ + error = opus_multistream_encoder_ctl (oopus->u.encode.state, OPUS_GET_LOOKAHEAD (&oopus->header.preskip)) ; + if (error != OPUS_OK) + { psf_log_printf (psf, "Opus : OPUS_GET_LOOKAHEAD returned: %s\n", opus_strerror (error)) ; + return SFE_BAD_OPEN_FORMAT ; + } ; + oopus->header.preskip *= oopus->sr_factor ; + + oopus->len = OGG_OPUS_ENCODE_PACKET_LEN (psf->sf.samplerate) ; + oopus->buffer = malloc (sizeof (float) * psf->sf.channels * oopus->len) ; + if (oopus->buffer == NULL) + return SFE_MALLOC_FAILED ; + + /* + ** Set up the resident ogg packet structure, ready for writing into. + ** 1275 * 3 + 7 bytes of packet per stream is from opusenc from opus-tools + */ + ogg_packet_clear (&odata->opacket) ; + oopus->buffersize = (1275 * 3 + 7) * oopus->header.nb_streams ; + odata->opacket.packet = malloc (oopus->buffersize) ; + odata->opacket.packetno = 2 ; + if (odata->opacket.packet == NULL) + return SFE_MALLOC_FAILED ; + + oopus->serialno = psf_rand_int32 () ; + ogg_stream_init (&odata->ostream, oopus->serialno) ; + + return 0 ; +} /* ogg_opus_setup_encoder */ + +static int +ogg_opus_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + int nn ; + ogg_packet op ; + + oopus->header.version = 1 ; + oopus->header.channels = psf->sf.channels ; + + /* FIXME: Allow the user to set this ?! */ + oopus->header.gain = 0 ; + + if (psf->dataoffset > 0) + { if (psf->have_written) + { /* + ** Might be possible to deal with this, but it's difficult as we + ** have to take Ogg Page header sizes in to account, not just + ** packet sizes. + */ + return SFE_UNIMPLEMENTED ; + } + if (psf_is_pipe (psf)) + return SFE_NOT_SEEKABLE ; + if (psf_fseek (psf, 0, SEEK_SET) < 0) + return SFE_SEEK_FAILED ; + ogg_stream_reset_serialno (&odata->ostream, oopus->serialno) ; + psf->dataoffset = 0 ; + } + else + opus_print_header (psf, &oopus->header) ; + + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; + + /* Opus Header Marker */ + psf_binheader_writef (psf, "eb", BHWv ("OpusHead"), BHWz (8)) ; + + /* Ogg Embedding scheme version, Channel Count, Preskip Samples */ + psf_binheader_writef (psf, "e112", BHW1 (oopus->header.version), BHW1 (psf->sf.channels), BHW2 (oopus->header.preskip)) ; + + /* + ** If an original samplerate has not been set by the user command + ** SFC_SET_ORIGINAL_SAMPLERATE, write the current samplerate. + */ + if (oopus->header.input_samplerate) + psf_binheader_writef (psf, "e4", BHW4 (oopus->header.input_samplerate)) ; + else + psf_binheader_writef (psf, "e4", BHW4 (psf->sf.samplerate)) ; + + /* Input Sample Rate, Gain (S7.8 format), Channel Mapping Type */ + psf_binheader_writef (psf, "e21", BHW2 (oopus->header.gain), BHW1 (oopus->header.channel_mapping)) ; + + /* Channel mappings, required if not using type 0 (mono/stereo) */ + if (oopus->header.channel_mapping > 0) + { psf_binheader_writef (psf, "11", BHW1 (oopus->header.nb_streams), BHW1 (oopus->header.nb_coupled)) ; + for (nn = 0 ; nn < oopus->header.channels ; nn++) + psf_binheader_writef (psf, "1", BHW1 (oopus->header.stream_map [nn])) ; + } ; + + op.packet = psf->header.ptr ; + op.bytes = psf->header.indx ; + op.b_o_s = 1 ; + op.e_o_s = 0 ; + op.granulepos = 0 ; + op.packetno = 1 ; + + /* The first page MUST only contain the header, so flush it out now */ + ogg_stream_packetin (&odata->ostream, &op) ; + for ( ; (nn = ogg_stream_flush (&odata->ostream, &odata->opage)) ; ) + { if (! (nn = ogg_write_page (psf, &odata->opage))) + { psf_log_printf (psf, "Opus : Failed to write header!\n") ; + if (psf->error) + return psf->error ; + return SFE_INTERNAL ; + } ; + psf->dataoffset += nn ; + } + + /* + ** Metadata Tags (manditory) + ** + ** All tags must be in one packet, which may span pages, and these pages + ** must not contain any other packets, so flush. The vendor string should + ** be the libopus library version, as it is doing the actual encoding. We + ** put the libsndfile identifier in the ENCODER tag. + ** + ** See: https://wiki.xiph.org/VorbisComment#ENCODER + */ + vorbiscomment_write_tags (psf, &op, &opustags_ident, opus_get_version_string (), - (OGG_OPUS_COMMENT_PAD)) ; + op.packetno = 2 ; + ogg_stream_packetin (&odata->ostream, &op) ; + for ( ; (nn = ogg_stream_flush (&odata->ostream, &odata->opage)) ; ) + { if (! (nn = ogg_write_page (psf, &odata->opage))) + { psf_log_printf (psf, "Opus : Failed to write comments!\n") ; + if (psf->error) + return psf->error ; + return SFE_INTERNAL ; + } ; + psf->dataoffset += nn ; + } + + return 0 ; +} /* ogg_opus_write_header */ + +static void +ogg_opus_flush (SF_PRIVATE *psf) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + uint64_t last_granulepos ; + int nbytes ; + int len ; + int last_packet ; + + /* + ** Need to flush both samples waiting for a complete packet and samples + ** currently 'inside' the encoder because of its latency. In the case of + ** the latter, we need to encode an equivalent amount of silence to push + ** them out. + ** + ** Note that the last packet's granule position might be less than the + ** total number of samples completed in it. This is how Ogg embedded Opus + ** encodes the amount of appended padding to truncate for gapless playback. + */ + + last_granulepos = oopus->pkt_pos + (oopus->sr_factor * oopus->loc) + oopus->header.preskip ; + last_packet = SF_FALSE ; + memset (&(oopus->buffer [oopus->loc * psf->sf.channels]), 0, sizeof (float) * psf->sf.channels * (oopus->len - oopus->loc)) ; + + for (last_packet = SF_FALSE ; last_packet == SF_FALSE ; ) + { oopus->pkt_pos += oopus->len * oopus->sr_factor ; + if (oopus->pkt_pos >= last_granulepos) + { last_packet = SF_TRUE ; + /* + ** Try to shorten the last packet to the smallest valid packet size + ** to minimize padding samples. + */ + len = (oopus->len * oopus->sr_factor) - (oopus->pkt_pos - last_granulepos) ; + if (len <= 120) /* 2.5 ms */ + len = 120 / oopus->sr_factor ; + else if (len <= 240) /* 5 ms */ + len = 240 / oopus->sr_factor ; + else if (len <= 480) /* 10 ms */ + len = 480 / oopus->sr_factor ; + else + len = oopus->len ; + } + else + len = oopus->len ; + + nbytes = opus_multistream_encode_float (oopus->u.encode.state, oopus->buffer, + len, odata->opacket.packet, oopus->buffersize) ; + + if (nbytes < 0) + { psf_log_printf (psf, "Opus : opus_multistream_encode_float returned: %s\n", opus_strerror (nbytes)) ; + break ; + } + + odata->opacket.bytes = nbytes ; + odata->opacket.packetno++ ; + if (last_packet) + { odata->opacket.granulepos = (ogg_int64_t) last_granulepos ; + odata->opacket.e_o_s = 1 ; + } + else + odata->opacket.granulepos = (ogg_int64_t) oopus->pkt_pos ; + + ogg_stream_packetin (&odata->ostream, &odata->opacket) ; + while (ogg_stream_pageout (&odata->ostream, &odata->opage)) + ogg_write_page (psf, &odata->opage) ; + } ; + + while (ogg_stream_flush (&odata->ostream, &odata->opage)) + ogg_write_page (psf, &odata->opage) ; +} /* ogg_opus_flush */ + +static int +ogg_opus_calculate_page_duration (OGG_PRIVATE *odata) +{ int i, samples, duration ; + ogg_packet *ppkt ; + + duration = 0 ; + for (i = 0 , ppkt = odata->pkt ; i < odata->pkt_len ; i++, ppkt++) + { /* Use 48kHz to get the sample count for use with granule positions. */ + samples = opus_packet_get_nb_samples (ppkt->packet, ppkt->bytes, 48000) ; + if (samples > 0) + duration += samples ; + } ; + return duration ; +} /* ogg_opus_calculate_page_duration */ + +static int +ogg_opus_unpack_next_page (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) +{ int nn ; + + nn = ogg_stream_unpack_page (psf, odata) ; + + if (nn == 1) + { oopus->pkt_pos = oopus->pg_pos ; + oopus->pg_pos = odata->pkt [odata->pkt_len - 1].granulepos ; + } + else if (nn == 2) + { uint64_t gp, last_page ; + + /* Found a hole. Need to recalculated pkt_pos from pg_pos */ + last_page = oopus->pg_pos ; + oopus->pg_pos = odata->pkt [odata->pkt_len - 1].granulepos ; + gp = ogg_opus_calculate_page_duration (odata) ; + oopus->pkt_pos = oopus->pg_pos - gp ; + psf_log_printf (psf, "Opus : Hole found appears to be of length %d samples.\n", + (oopus->pkt_pos - last_page) / oopus->sr_factor) ; + /* + ** Could save the hole size here, and have ogg_opus_read_refill() + ** do packet loss concealment until the hole is gone, but libopus does + ** PLC by generating white-noise for the duration of the hole. That is + ** the correct thing for use in telephony, but it isn't generally + ** appropriate here. It actually sounds better with no PLC, as the + ** lapped nature of full-width Opus means the two edges of the hole + ** will be blended together. + */ + return 1 ; + } + + return nn ; +} /* ogg_opus_unpack_next_page */ + +static int +ogg_opus_read_refill (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) +{ uint64_t pkt_granulepos ; + int nn, nsamp ; + ogg_packet *ppkt ; + + if (odata->pkt_indx == odata->pkt_len) + { nn = ogg_opus_unpack_next_page (psf, odata, oopus) ; + if (nn <= 0) + return nn ; + } + + if (odata->pkt_indx == odata->pkt_len) + return 0 ; + + ppkt = odata->pkt + odata->pkt_indx ; + nsamp = opus_multistream_decode_float (oopus->u.decode.state, + ppkt->packet, ppkt->bytes, oopus->buffer, oopus->buffersize, 0) ; + + if (nsamp == OPUS_BUFFER_TOO_SMALL) + { nsamp = opus_packet_get_nb_samples (ppkt->packet, ppkt->bytes, psf->sf.samplerate) ; + psf_log_printf (psf, "Growing decode buffer to hold %d samples from %d\n", + nsamp, oopus->buffersize) ; + if (nsamp > 5760) + { psf_log_printf (psf, "Packet is larger than maximum allowable of 120ms!? Skipping.\n") ; + return 0 ; + } ; + oopus->buffersize = nsamp ; + + free (oopus->buffer) ; + oopus->buffer = NULL ; + oopus->buffer = malloc (sizeof (float) * oopus->buffersize * psf->sf.channels) ; + if (oopus->buffer == NULL) + { psf->error = SFE_MALLOC_FAILED ; + oopus->buffersize = 0 ; + return -1 ; + } ; + + nsamp = opus_multistream_decode_float (oopus->u.decode.state, + ppkt->packet, ppkt->bytes, oopus->buffer, oopus->buffersize, 0) ; + } ; + odata->pkt_indx ++ ; + + if (nsamp < 0) + { psf_log_printf (psf, "Opus : opus_multistream_decode returned: %s\n", + opus_strerror (nsamp)) ; + psf->error = SFE_INTERNAL ; + return nsamp ; + } ; + + /* + ** Check for if this decoded packet is the last of the stream, in + ** which case a page granule position which is shorter than the + ** sample count of all packets in the page indicates that the last + ** samples are padding and should be dropped. + */ + pkt_granulepos = oopus->pkt_pos + (nsamp * oopus->sr_factor) ; + if (pkt_granulepos <= oopus->pg_pos) + { oopus->len = nsamp ; + } + else + { if (ogg_page_eos (&odata->opage)) + { /* + ** Possible for pg_pos < pkt_pos if there is a trailing + ** packet. It's not supposed to happen, but could. + */ + oopus->len = SF_MAX ((int) (oopus->pg_pos - oopus->pkt_pos) / oopus->sr_factor, 0) ; + } + else + { /* + ** From https://wiki.xiph.org/OggOpus#Granule_Position + ** A decoder MUST reject as invalid any stream where the granule + ** position is smaller than the number of samples contained in + ** packets that complete on the first page with a completed + ** packet, unless that page has the 'end of stream' flag set. It + ** MAY defer this action until it decodes the last packet + ** completed on that page. + */ + psf_log_printf (psf, "Opus : Mid-strem page's granule position %d is less than total samples of %d\n", oopus->pg_pos, pkt_granulepos) ; + psf->error = SFE_MALFORMED_FILE ; + return -1 ; + } ; + } ; + + if (oopus->len > oopus->buffersize) + { free (oopus->buffer) ; + oopus->buffersize = oopus->len ; + oopus->buffer = malloc (sizeof (float) * oopus->buffersize * psf->sf.channels) ; + if (oopus->buffer == NULL) + { psf->error = SFE_MALLOC_FAILED ; + oopus->buffersize = 0 ; + return -1 ; + } ; + } ; + + /* + ** Check for if this decoded packet contains samples from before the pre- + ** skip point, indicating that these samples are padding to get the decoder + ** to converge and should be dropped. + */ + if (oopus->pkt_pos < (unsigned) oopus->header.preskip) + oopus->loc = SF_MIN ((oopus->header.preskip - (int) oopus->pkt_pos) / oopus->sr_factor, oopus->len) ; + else + oopus->loc = 0 ; + + oopus->pkt_pos = pkt_granulepos ; + + return nsamp ; +} /* ogg_opus_read_refill */ + +static int +ogg_opus_write_out (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) +{ int nbytes ; + + if (oopus->u.encode.lsb != oopus->u.encode.lsb_last) + opus_multistream_encoder_ctl (oopus->u.encode.state, OPUS_SET_LSB_DEPTH (oopus->u.encode.lsb)) ; + + nbytes = opus_multistream_encode_float (oopus->u.encode.state, + oopus->buffer, oopus->len, + odata->opacket.packet, oopus->buffersize) ; + + if (nbytes < 0) + { psf_log_printf (psf, "Opus : Error, opus_multistream_encode_float returned: %s\n", opus_strerror (nbytes)) ; + psf->error = SFE_INTERNAL ; + return nbytes ; + } ; + + oopus->u.encode.last_segments += (nbytes + 255) / 255 ; + oopus->pkt_pos += oopus->len * oopus->sr_factor ; + odata->opacket.bytes = nbytes ; + odata->opacket.granulepos = oopus->pkt_pos ; + odata->opacket.packetno++ ; + + /* + ** Decide whether to flush the Ogg page *before* adding the new packet to + ** it. Check both for if there is more than 1 second of audio (our default + ** Ogg page latency) or if adding the packet would cause a continued page, + ** in which case we might as well make a new page anyways. + */ + for ( ; ; ) + { if (oopus->pkt_pos - oopus->pg_pos >= OGG_OPUS_PAGE_LATENCY || oopus->u.encode.last_segments >= 255) + nbytes = ogg_stream_flush_fill (&odata->ostream, &odata->opage, 255 * 255) ; + else + nbytes = ogg_stream_pageout_fill (&odata->ostream, &odata->opage, 255 * 255) ; + if (nbytes > 0) + { /* + ** LibOgg documentation is noted as being bad by it's author. Ogg + ** page header byte 26 is the segment count. + */ + oopus->u.encode.last_segments -= odata->opage.header [26] ; + oopus->pg_pos = oopus->pkt_pos ; + ogg_write_page (psf, &odata->opage) ; + } + else + break ; + } ; + + ogg_stream_packetin (&odata->ostream, &odata->opacket) ; + oopus->loc = 0 ; + oopus->u.encode.lsb_last = oopus->u.encode.lsb ; + oopus->u.encode.lsb = 0 ; + + return 1 ; +} /* ogg_opus_write_out */ + +static sf_count_t +ogg_opus_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total = 0 ; + sf_count_t readlen, i ; + float *iptr ; + + while (total < len) + { if (oopus->loc == oopus->len) + { if (ogg_opus_read_refill (psf, odata, oopus) <= 0) + return total ; + } ; + + readlen = SF_MIN (len - total, (sf_count_t) (oopus->len - oopus->loc) * psf->sf.channels) ; + if (readlen > 0) + { iptr = oopus->buffer + oopus->loc * psf->sf.channels ; + i = total ; + total += readlen ; + + if (psf->float_int_mult) + { float inverse = 1.0 / psf->float_max ; + for ( ; i < total ; i++) + { ptr [i] = lrintf (((*(iptr++)) * inverse) * 32767.0f) ; + } ; + } + else + { for ( ; i < total ; i++) + { ptr [i] = lrintf ((*(iptr++)) * 32767.0f) ; + } ; + } ; + oopus->loc += (readlen / psf->sf.channels) ; + } ; + } ; + return total ; +} /* ogg_opus_read_s */ + +static sf_count_t +ogg_opus_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total = 0 ; + sf_count_t readlen, i ; + float *iptr ; + + while (total < len) + { if (oopus->loc == oopus->len) + { if (ogg_opus_read_refill (psf, odata, oopus) <= 0) + return total ; + } ; + + readlen = SF_MIN (len - total, (sf_count_t) (oopus->len - oopus->loc) * psf->sf.channels) ; + if (readlen > 0) + { iptr = oopus->buffer + oopus->loc * psf->sf.channels ; + i = total ; + total += readlen ; + + if (psf->float_int_mult) + { float inverse = 1.0 / psf->float_max ; + for ( ; i < total ; i++) + { ptr [i] = lrintf (((*(iptr++)) * inverse) * 2147483647.0f) ; + } + } + else + { for ( ; i < total ; i++) + { ptr [i] = lrintf ((*(iptr++)) * 2147483647.0f) ; + } + } ; + oopus->loc += (readlen / psf->sf.channels) ; + } ; + } ; + return total ; +} /* ogg_opus_read_i */ + +static sf_count_t +ogg_opus_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total = 0 ; + sf_count_t readlen ; + + while (total < len) + { if (oopus->loc == oopus->len) + { if (ogg_opus_read_refill (psf, odata, oopus) <= 0) + return total ; + } ; + + readlen = SF_MIN (len - total, (sf_count_t) (oopus->len - oopus->loc) * psf->sf.channels) ; + if (readlen > 0) + { memcpy (&(ptr [total]), &(oopus->buffer [oopus->loc * psf->sf.channels]), sizeof (float) * readlen) ; + total += readlen ; + oopus->loc += (readlen / psf->sf.channels) ; + } ; + } ; + return total ; +} /* ogg_opus_read_f */ + +static sf_count_t +ogg_opus_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total = 0 ; + sf_count_t readlen, i ; + float *fptr ; + + while (total < len) + { if (oopus->loc >= oopus->len) + { if (ogg_opus_read_refill (psf, odata, oopus) <= 0) + return total ; + } ; + + readlen = SF_MIN (len - total, (sf_count_t) (oopus->len - oopus->loc) * psf->sf.channels) ; + + if (readlen > 0) + { fptr = oopus->buffer + oopus->loc * psf->sf.channels ; + i = total ; + total += readlen ; + for ( ; i < total ; i++) + { ptr [i] = *fptr++ ; + } ; + oopus->loc += readlen / psf->sf.channels ; + } ; + } ; + return total ; +} /* ogg_opus_read_d */ + +static sf_count_t +ogg_opus_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total, i ; + int writelen ; + float *optr ; + + if (oopus->u.encode.lsb < 16) + oopus->u.encode.lsb = 16 ; + + for (total = 0 ; total < len ; ) + { if (oopus->loc >= oopus->len) + { /* Need to encode the buffer */ + if (ogg_opus_write_out (psf, odata, oopus) <= 0) + return total ; + } ; + + writelen = SF_MIN (len - total, (sf_count_t) (oopus->len - oopus->loc) * psf->sf.channels) ; + if (writelen) + { optr = oopus->buffer + oopus->loc * psf->sf.channels ; + i = total ; + total += writelen ; + for ( ; i < total ; i++) + { *optr++ = (float) (ptr [i]) / 32767.0f ; + } + oopus->loc += (writelen / psf->sf.channels) ; + } ; + } ; + return total ; +} /* ogg_opus_write_s */ + +static sf_count_t +ogg_opus_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total, i ; + int writelen ; + float *optr ; + + if (oopus->u.encode.lsb < 24) + oopus->u.encode.lsb = 24 ; + + for (total = 0 ; total < len ; ) + { if (oopus->loc >= oopus->len) + { /* Need to encode the buffer */ + if (ogg_opus_write_out (psf, odata, oopus) <= 0) + return total ; + } ; + + writelen = SF_MIN (len - total, (sf_count_t) (oopus->len - oopus->loc) * psf->sf.channels) ; + if (writelen) + { optr = oopus->buffer + oopus->loc * psf->sf.channels ; + i = total ; + total += writelen ; + for ( ; i < total ; i++) + { *optr++ = (float) (ptr [i]) / 2147483647.0f ; + } ; + oopus->loc += (writelen / psf->sf.channels) ; + } ; + } ; + return total ; +} /* ogg_opus_write_i */ + +static sf_count_t +ogg_opus_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total ; + int writelen ; + + if (oopus->u.encode.lsb < 24) + oopus->u.encode.lsb = 24 ; + + for (total = 0 ; total < len ; ) + { if (oopus->loc >= oopus->len) + { /* Need to encode the buffer */ + if (ogg_opus_write_out (psf, odata, oopus) <= 0) + return total ; + } ; + + writelen = SF_MIN (len - total, (sf_count_t) (oopus->len - oopus->loc) * psf->sf.channels) ; + if (writelen) + { memcpy (&(oopus->buffer [oopus->loc * psf->sf.channels]), &(ptr [total]), sizeof (float) * writelen) ; + total += writelen ; + oopus->loc += (writelen / psf->sf.channels) ; + } ; + } ; + return total ; +} /* ogg_opus_write_f */ + +static sf_count_t +ogg_opus_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total, i ; + int writelen ; + float *optr ; + + if (oopus->u.encode.lsb < 24) + oopus->u.encode.lsb = 24 ; + + for (total = 0 ; total < len ; ) + { if (oopus->loc >= oopus->len) + { /* Need to encode the buffer */ + if (ogg_opus_write_out (psf, odata, oopus) <= 0) + return total ; + } ; + + writelen = SF_MIN (len - total, (sf_count_t) (oopus->len - oopus->loc) * psf->sf.channels) ; + if (writelen) + { optr = oopus->buffer + oopus->loc * psf->sf.channels ; + i = total ; + total += writelen ; + for ( ; i < total ; i++) + { *optr++ = (float) (ptr [i]) ; + } ; + oopus->loc += (writelen / psf->sf.channels) ; + } ; + } ; + return total ; +} /* ogg_opus_write_d */ + +static int +ogg_opus_analyze_file (SF_PRIVATE *psf) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + uint64_t gp ; + sf_count_t saved_offset, last_page ; + int error ; + + psf->sf.sections = 1 ; + psf->sf.frames = SF_COUNT_MAX ; + oopus->u.decode.gp_end = (uint64_t) -1 ; + oopus->u.decode.last_offset = SF_COUNT_MAX ; + + psf->dataoffset = ogg_sync_ftell (psf) ; + if (psf->filelength != SF_COUNT_MAX) + psf->datalength = psf->filelength - psf->dataoffset ; + else + psf->datalength = SF_COUNT_MAX ; + + /* + ** Calculate the start granule position offset + ** + ** OggOpus streams are allowed to start with a granule position other than + ** zero. This allows for cutting the beginning off of streams without + ** having to modify all following granule positions, or for recording/ + ** joining a live stream in the middle. To figure out the offset, we need + ** to sum up how many samples are in all the packets that complete in the + ** page and subtract it from the page granule position. + ** + ** If this is the last page of the steam (EOS set), this is not possible, + ** as the granule position may be /less/ than the number of samples, to + ** indicate how many samples are end-padding. In this case the granule + ** position offset of the file must be 0, as otherwise it is considered + ** malformed. + */ + error = ogg_opus_unpack_next_page (psf, odata, oopus) ; + if (error < 0 && psf->error) + return psf->error ; + + gp = ogg_opus_calculate_page_duration (odata) ; + if (gp <= 0) + { psf_log_printf (psf, "Opus : Page duration of zero!\n") ; + return SFE_MALFORMED_FILE ; + } ; + + if (!ogg_page_eos (&odata->opage)) + { if (gp > oopus->pg_pos) + { psf_log_printf (psf, "Opus : First data page's granule position is less than total number of samples on the page!\n") ; + return SFE_MALFORMED_FILE ; + } + oopus->pkt_pos = oopus->pg_pos - gp ; + } + else if (gp < oopus->pg_pos) + { psf_log_printf (psf, "Opus : First data page is also the last, and granule position has an (ambigious) offset.\n") ; + return SFE_MALFORMED_FILE ; + } ; + oopus->u.decode.gp_start = oopus->pkt_pos ; + + if (!psf->sf.seekable) + return 0 ; + + /* + ** Find the last page and fetch the last granule position. + ** First, save were we are now. + */ + saved_offset = ogg_sync_ftell (psf) ; + + /* This uses the sync page buffer, the stream page buffer is untouched. */ + last_page = ogg_sync_last_page_before (psf, odata, &oopus->u.decode.gp_end, psf->filelength, oopus->serialno) ; + if (last_page > 0) + { if (!ogg_page_eos (&odata->opage)) + psf_log_printf (psf, "Ogg : Last page lacks an end-of-stream bit.\n") ; + if (last_page + odata->opage.header_len + odata->opage.body_len < psf->filelength) + psf_log_printf (psf, "Ogg : Junk after the last page.\n") ; + oopus->u.decode.last_offset = last_page ; + + if (oopus->u.decode.gp_end != (uint64_t) -1) + { psf->sf.frames = (oopus->u.decode.gp_end - oopus->u.decode.gp_start + - oopus->header.preskip) / oopus->sr_factor ; + } ; + } + + /* Go back to where we left off. */ + ogg_sync_fseek (psf, saved_offset, SEEK_SET) ; + return 0 ; +} /* ogg_opus_analyze_file */ + +/* +** ogg_opus_seek_null_read +** +** Decode samples, doing nothing with them, until the desired granule position +** is reached. +*/ +static sf_count_t +ogg_opus_seek_null_read (SF_PRIVATE *psf, sf_count_t offset) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t total ; + sf_count_t readlen ; + + total = oopus->pkt_pos / oopus->sr_factor ; + total += oopus->loc ; + + for ( ; total < offset ; ) + { if (oopus->loc == oopus->len) + { if (ogg_opus_read_refill (psf, odata, oopus) <= 0) + return total ; + /* + ** Ignore pre-skip skipping. The preskip was accounted for in the + ** arugment to offset, so we need to count it. + */ + oopus->loc = 0 ; + } ; + + readlen = SF_MIN ((int) (offset - total), (oopus->len - oopus->loc)) ; + if (readlen > 0) + { total += readlen ; + oopus->loc += readlen ; + } ; + } ; + return total ; +} /* ogg_opus_seek_null_read */ + +/* +** Search within the file for the page with the highest granule position at or +** before our target. +*/ +static int +ogg_opus_seek_page_search (SF_PRIVATE *psf, uint64_t target_gp) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + uint64_t pcm_start ; + uint64_t pcm_end ; + uint64_t best_gp ; + sf_count_t begin ; + sf_count_t end ; + int ret ; + + best_gp = pcm_start = oopus->u.decode.gp_start ; + pcm_end = oopus->u.decode.gp_end ; + begin = psf->dataoffset ; + + /* Adjust the target to give time to converge. */ + if (target_gp >= OGG_OPUS_PREROLL) + target_gp -= OGG_OPUS_PREROLL ; + if (target_gp < pcm_start) + target_gp = pcm_start ; + + /* Seek to beginning special case */ + if (target_gp < pcm_start + (uint64_t) oopus->header.preskip) + end = begin ; + else + end = oopus->u.decode.last_offset ; + + ogg_stream_seek_page_search (psf, odata, target_gp, pcm_start, pcm_end, &best_gp, begin, end) ; + + oopus->loc = 0 ; + oopus->len = 0 ; + if ((ret = ogg_opus_unpack_next_page (psf, odata, oopus)) != 1) + return ret ; + oopus->pkt_pos = best_gp ; + opus_multistream_decoder_ctl (oopus->u.decode.state, OPUS_RESET_STATE) ; + /* Gain decoder settings survive resets. */ + + return 0 ; +} /* ogg_opus_seek_page_search */ + +static sf_count_t +ogg_opus_seek_manual (SF_PRIVATE *psf, uint64_t target_gp) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + sf_count_t pos ; + int nn ; + + if (target_gp > OGG_OPUS_PREROLL) + target_gp -= OGG_OPUS_PREROLL ; + if (target_gp < oopus->pg_pos) + target_gp = oopus->pg_pos ; + + if (oopus->pg_pos > target_gp) + { ogg_stream_reset (&odata->ostream) ; + pos = ogg_sync_fseek (psf, psf->dataoffset, SEEK_SET) ; + if (pos < 0) + return pos ; + oopus->pg_pos = oopus->u.decode.gp_start ; + opus_multistream_decoder_ctl (oopus->u.decode.state, OPUS_RESET_STATE) ; + } ; + + while (oopus->pg_pos < target_gp) + { nn = ogg_opus_unpack_next_page (psf, odata, oopus) ; + if (nn <= 0) + return nn ; + } ; + + return 1 ; +} /* ogg_opus_seek_manual */ + +static sf_count_t +ogg_opus_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) +{ OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + uint64_t target_gp ; + uint64_t current ; + int ret ; + + /* Only support seeking in read mode. */ + if (mode != SFM_READ || psf->file.mode != SFM_READ) + { psf->error = SFE_BAD_SEEK ; + return PSF_SEEK_ERROR ; + } ; + + current = oopus->pkt_pos + oopus->loc * oopus->sr_factor ; + /* + ** Remember, there are preskip granulepos worth of samples at the front of + ** the stream which are bunk. Also, granule positions can be offset. + */ + target_gp = offset * oopus->sr_factor + oopus->u.decode.gp_start + oopus->header.preskip ; + + if (oopus->u.decode.gp_end == (uint64_t) -1) + { /* + ** Don't know the end of the file. Could be a chained file we don't yet + ** support. Oh well, just do it manually. + */ + ogg_opus_seek_manual (psf, target_gp) ; + } + else + { /* + ** Avoid seeking in the file if where we want is just ahead or exactly + ** were we are. To avoid needing to flush the decoder we choose pre- + ** roll plus 10ms. + */ + if (target_gp < current || target_gp - current > OGG_OPUS_PREROLL + 10 * 48) + { ret = ogg_opus_seek_page_search (psf, target_gp) ; + if (ret < 0) + { /* + ** Page seek failed, what to do? Could be bad data. We can + ** either fall-back to manual seeking or bail. Manaul seeking + ** from the beginning has the advantage of finding where the + ** file goes bad. + */ + ret = ogg_opus_seek_manual (psf, target_gp) ; + if (ret < 0) + { /* + ** If were here, and there is no error, we can be pretty + ** sure that it's the file that is to blame. + */ + if (!psf->error) + psf->error = SFE_MALFORMED_FILE ; + return ret ; + } ; + } ; + } ; + } ; + + /* + ** We've seeked or skipped through pages until just before our target, + ** now decode until we hit it. + */ + offset = ogg_opus_seek_null_read (psf, target_gp / oopus->sr_factor) ; + return offset - ((oopus->header.preskip + oopus->u.decode.gp_start) / oopus->sr_factor) ; + +} /* ogg_opus_seek */ + +static int +ogg_opus_command (SF_PRIVATE *psf, int command, void *data, int datasize) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + double quality ; + int error ; + + switch (command) + { case SFC_SET_CHANNEL_MAP_INFO : + /* TODO: figure this out */ + break ; + + case SFC_SET_COMPRESSION_LEVEL : + /* + ** Argument: double, range 0.0 (lest compressed, best quality) to + ** 1.0 (most compressed, worst quality) + */ + if (data == NULL || datasize != SIGNED_SIZEOF (double)) + return SFE_BAD_COMMAND_PARAM ; + + /* Usable bitrate range is [6, 256] kbps per channel. */ + quality = *((double *) data) ; + oopus->u.encode.bitrate = (int) (((1.0 - quality) * (250000.0)) + 6000.0) * psf->sf.channels ; + if (opus_multistream_encoder_ctl (oopus->u.encode.state, OPUS_SET_BITRATE (oopus->u.encode.bitrate)) == OPUS_OK) + { psf_log_printf (psf, "User changed encoding target bitrate to %dbps\n", oopus->u.encode.bitrate) ; + return SF_TRUE ; + } + psf_log_printf (psf, "Failed to set user encoding target bitrate of %dbps\n", oopus->u.encode.bitrate) ; + return SF_FALSE ; + break ; + + case SFC_SET_ORIGINAL_SAMPLERATE : + if (data == NULL || datasize != SIGNED_SIZEOF (int)) + return SFE_BAD_COMMAND_PARAM ; + /* + ** Only allow changing the input samplerate if at the beginning + ** of the stream, because while it might be possible to change + ** samplerate mid-decode, or to re-write the header for encode, + ** ain't nobody got time to implement and test that. + */ + if (psf->file.mode == SFM_WRITE) + { if (psf->have_written) + return SF_FALSE ; + oopus->header.input_samplerate = *((int *) data) ; + } + else { + if (oopus->pkt_pos > oopus->u.decode.gp_start || oopus->loc > 0) + return SF_FALSE ; + if ((error = ogg_opus_setup_decoder (psf, *((int *) data)))) + return error ; + odata->pkt_indx = 0 ; + /* Adjust file frames count. */ + if (oopus->u.decode.gp_end != (uint64_t) -1) + psf->sf.frames = (oopus->u.decode.gp_end - oopus->u.decode.gp_start + - oopus->header.preskip) / oopus->sr_factor ; + } ; + return SF_TRUE ; + + case SFC_GET_ORIGINAL_SAMPLERATE : + if (data == NULL || datasize != SIGNED_SIZEOF (int)) + return SFE_BAD_COMMAND_PARAM ; + *((int *) data) = oopus->header.input_samplerate ; + return SF_TRUE ; + + default : + break ; + } + + return SF_FALSE ; +} /* ogg_opus_command */ + +static int +ogg_opus_byterate (SF_PRIVATE *psf) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + OPUS_PRIVATE *oopus = (OPUS_PRIVATE *) psf->codec_data ; + + if (psf->file.mode == SFM_READ) + { if (odata->pkt_indx == odata->pkt_len) + { if (ogg_opus_unpack_next_page (psf, odata, oopus) < 0) + return -1 ; + } ; + + if (odata->pkt_indx < odata->pkt_len) + { ogg_packet *ppkt = &odata->pkt [odata->pkt_indx] ; + return (ppkt->bytes * 8000) / opus_packet_get_nb_samples (ppkt->packet, ppkt->bytes, 8000) ; + } ; + + if (psf->datalength != SF_COUNT_MAX) + return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ; + } ; + + if (psf->file.mode == SFM_WRITE && oopus->u.encode.state != NULL) + return (oopus->u.encode.bitrate + 7) / 8 ; + + return -1 ; +} /* ogg_opus_byterate */ + +#else /* HAVE_EXTERNAL_XIPH_LIBS */ + +int +ogg_opus_open (SF_PRIVATE *psf) +{ + psf_log_printf (psf, "This version of libsndfile was compiled without Ogg/Opus support.\n") ; + return SFE_UNIMPLEMENTED ; +} /* ogg_opus_open */ + +#endif diff --git a/lib-src/libsndfile/src/ogg_pcm.c b/lib-src/libsndfile/src/ogg_pcm.c new file mode 100644 index 000000000..d57d0c7ae --- /dev/null +++ b/lib-src/libsndfile/src/ogg_pcm.c @@ -0,0 +1,166 @@ +/* +** Copyright (C) 2008-2016 Erik de Castro Lopo +** +** This program is free software ; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program ; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + + +#include "sfconfig.h" + +#include +#include +#include +#include +#include +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" + +#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS) + +#include + +#include "ogg.h" + +typedef struct +{ int32_t serialno ; + + + void * state ; +} OPCM_PRIVATE ; + +static int opcm_read_header (SF_PRIVATE * psf) ; +static int opcm_close (SF_PRIVATE *psf) ; + +int +ogg_pcm_open (SF_PRIVATE *psf) +{ OGG_PRIVATE* odata = psf->container_data ; + OPCM_PRIVATE* opcm = calloc (1, sizeof (OPCM_PRIVATE)) ; + int error = 0 ; + + if (odata == NULL) + { psf_log_printf (psf, "%s : odata is NULL???\n", __func__) ; + return SFE_INTERNAL ; + } ; + + psf->codec_data = opcm ; + if (opcm == NULL) + return SFE_MALLOC_FAILED ; + + if (psf->file.mode == SFM_RDWR) + return SFE_BAD_MODE_RW ; + + if (psf->file.mode == SFM_READ) + { /* Call this here so it only gets called once, so no memory is leaked. */ + ogg_sync_init (&odata->osync) ; + + if ((error = opcm_read_header (psf))) + return error ; + +#if 0 + psf->read_short = opcm_read_s ; + psf->read_int = opcm_read_i ; + psf->read_float = opcm_read_f ; + psf->read_double = opcm_read_d ; + psf->sf.frames = opcm_length (psf) ; +#endif + } ; + + psf->codec_close = opcm_close ; + + if (psf->file.mode == SFM_WRITE) + { +#if 0 + /* Set the default opcm quality here. */ + vdata->quality = 0.4 ; + + psf->write_header = opcm_write_header ; + psf->write_short = opcm_write_s ; + psf->write_int = opcm_write_i ; + psf->write_float = opcm_write_f ; + psf->write_double = opcm_write_d ; +#endif + + psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */ + psf->strings.flags = SF_STR_ALLOW_START ; + } ; + + psf->bytewidth = 1 ; + psf->blockwidth = psf->bytewidth * psf->sf.channels ; + +#if 0 + psf->seek = opcm_seek ; + psf->command = opcm_command ; +#endif + + /* FIXME, FIXME, FIXME : Hack these here for now and correct later. */ + psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_SPEEX ; + psf->sf.sections = 1 ; + + psf->datalength = 1 ; + psf->dataoffset = 0 ; + /* End FIXME. */ + + return error ; +} /* ogg_pcm_open */ + +static int +opcm_read_header (SF_PRIVATE * UNUSED (psf)) +{ + return 0 ; +} /* opcm_read_header */ + +static int +opcm_close (SF_PRIVATE * UNUSED (psf)) +{ + + + return 0 ; +} /* opcm_close */ + + + +/* +encoded_speex_frames = (frames_per_packet * Packets) + = 1 * 272 + = 272 + +audio_samples = encoded_speex_frames * frame_size + = 272 * 640 + = 174080 + +duration = audio_samples / rate + = 174080 / 44100 + = 3.947 +*/ + +#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS */ + +int +ogg_pcm_open (SF_PRIVATE *psf) +{ + psf_log_printf (psf, "This version of libsndfile was compiled without Ogg/Speex support.\n") ; + return SFE_UNIMPLEMENTED ; +} /* ogg_pcm_open */ + +#endif diff --git a/lib-src/libsndfile/src/ogg_speex.c b/lib-src/libsndfile/src/ogg_speex.c new file mode 100644 index 000000000..45b4d0442 --- /dev/null +++ b/lib-src/libsndfile/src/ogg_speex.c @@ -0,0 +1,427 @@ +/* +** Copyright (C) 2008-2016 Erik de Castro Lopo +** +** This program is free software ; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program ; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + + +#include "sfconfig.h" + +#include +#include +#include +#include +#include +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" + +#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS) + +#include + +#include +#include +#include +#include + +#include "ogg.h" + +#define OGG_SPX_READ_SIZE 200 + +typedef struct +{ SpeexBits bits ; + + int32_t serialno ; + + int frame_size, granule_frame_size, nframes ; + int force_mode ; + + SpeexStereoState stereo ; + SpeexHeader header ; + + void * state ; +} SPX_PRIVATE ; + +static int spx_read_header (SF_PRIVATE * psf) ; +static int spx_close (SF_PRIVATE *psf) ; +static void *spx_header_read (SF_PRIVATE * psf, ogg_packet *op, spx_int32_t enh_enabled, int force_mode) ; +static void spx_print_comments (const char *comments, int length) ; + +int +ogg_speex_open (SF_PRIVATE *psf) +{ OGG_PRIVATE* odata = psf->container_data ; + SPX_PRIVATE* spx = calloc (1, sizeof (SPX_PRIVATE)) ; + int error = 0 ; + + if (odata == NULL) + { psf_log_printf (psf, "%s : odata is NULL???\n", __func__) ; + return SFE_INTERNAL ; + } ; + + psf->codec_data = spx ; + if (spx == NULL) + return SFE_MALLOC_FAILED ; + + if (psf->file.mode == SFM_RDWR) + return SFE_BAD_MODE_RW ; + + if (psf->file.mode == SFM_READ) + { /* Call this here so it only gets called once, so no memory is leaked. */ + ogg_sync_init (&odata->osync) ; + + if ((error = spx_read_header (psf))) + return error ; + +#if 0 + psf->read_short = spx_read_s ; + psf->read_int = spx_read_i ; + psf->read_float = spx_read_f ; + psf->read_double = spx_read_d ; + psf->sf.frames = spx_length (psf) ; +#endif + } ; + + psf->codec_close = spx_close ; + + if (psf->file.mode == SFM_WRITE) + { +#if 0 + /* Set the default spx quality here. */ + vdata->quality = 0.4 ; + + psf->write_header = spx_write_header ; + psf->write_short = spx_write_s ; + psf->write_int = spx_write_i ; + psf->write_float = spx_write_f ; + psf->write_double = spx_write_d ; +#endif + + psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */ + psf->strings.flags = SF_STR_ALLOW_START ; + } ; + + psf->bytewidth = 1 ; + psf->blockwidth = psf->bytewidth * psf->sf.channels ; + +#if 0 + psf->seek = spx_seek ; + psf->command = spx_command ; +#endif + + /* FIXME, FIXME, FIXME : Hack these here for now and correct later. */ + psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_SPEEX ; + psf->sf.sections = 1 ; + + psf->datalength = 1 ; + psf->dataoffset = 0 ; + /* End FIXME. */ + + return error ; +} /* ogg_speex_open */ + +#define le_short (x) (x) + +static int +spx_read_header (SF_PRIVATE * psf) +{ static SpeexStereoState STEREO_INIT = SPEEX_STEREO_STATE_INIT ; + + OGG_PRIVATE* odata = psf->container_data ; + SPX_PRIVATE* spx = psf->codec_data ; + + ogg_int64_t page_granule = 0 ; + int stream_init = 0 ; + int page_nb_packets = 0 ; + int packet_count = 0 ; + int enh_enabled = 1 ; + int force_mode = -1 ; + char * data ; + int nb_read ; + int lookahead ; + +printf ("%s %d\n", __func__, __LINE__) ; + + psf_log_printf (psf, "Speex header\n") ; + odata->eos = 0 ; + + /* Reset ogg stuff which has already been used in src/ogg.c. */ + ogg_stream_reset (&odata->ostream) ; + ogg_sync_reset (&odata->osync) ; + + /* Seek to start of stream. */ + psf_fseek (psf, 0, SEEK_SET) ; + + /* Initialize. */ + ogg_sync_init (&odata->osync) ; + speex_bits_init (&spx->bits) ; + + /* Set defaults. */ + psf->sf.channels = -1 ; + psf->sf.samplerate = 0 ; + spx->stereo = STEREO_INIT ; + + /* Get a pointer to the ogg buffer and read data into it. */ + data = ogg_sync_buffer (&odata->osync, OGG_SPX_READ_SIZE) ; + nb_read = psf_fread (data, 1, OGG_SPX_READ_SIZE, psf) ; + ogg_sync_wrote (&odata->osync, nb_read) ; + + /* Now we chew on Ogg packets. */ + while (ogg_sync_pageout (&odata->osync, &odata->opage) == 1) + { if (stream_init == 0) + { ogg_stream_init (&odata->ostream, ogg_page_serialno (&odata->opage)) ; + stream_init = 1 ; + } ; + + if (ogg_page_serialno (&odata->opage) != odata->ostream.serialno) + { /* so all streams are read. */ + ogg_stream_reset_serialno (&odata->ostream, ogg_page_serialno (&odata->opage)) ; + } ; + + /*Add page to the bitstream*/ + ogg_stream_pagein (&odata->ostream, &odata->opage) ; + page_granule = ogg_page_granulepos (&odata->opage) ; + page_nb_packets = ogg_page_packets (&odata->opage) ; + + /*Extract all available packets*/ + while (odata->eos == 0 && ogg_stream_packetout (&odata->ostream, &odata->opacket) == 1) + { if (odata->opacket.bytes >= 8 && memcmp (odata->opacket.packet, "Speex ", 8) == 0) + { spx->serialno = odata->ostream.serialno ; + } ; + + if (spx->serialno == -1 || odata->ostream.serialno != spx->serialno) + break ; + + if (packet_count == 0) + { spx->state = spx_header_read (psf, &odata->opacket, enh_enabled, force_mode) ; + if (! spx->state) + break ; + + speex_decoder_ctl (spx->state, SPEEX_GET_LOOKAHEAD, &lookahead) ; + if (spx->nframes == 0) + spx->nframes = 1 ; + } + else if (packet_count == 1) + { spx_print_comments ((const char*) odata->opacket.packet, odata->opacket.bytes) ; + } + else if (packet_count < 2 + spx->header.extra_headers) + { /* Ignore extra headers */ + } + packet_count ++ ; + } ; + } ; + + psf_log_printf (psf, "End\n") ; + + psf_log_printf (psf, "packet_count %d\n", packet_count) ; + psf_log_printf (psf, "page_nb_packets %d\n", page_nb_packets) ; + psf_log_printf (psf, "page_granule %lld\n", page_granule) ; + + return 0 ; +} /* spx_read_header */ + +static int +spx_close (SF_PRIVATE *psf) +{ SPX_PRIVATE* spx = psf->codec_data ; + + if (spx->state) + speex_decoder_destroy (spx->state) ; + + if (spx) + speex_bits_destroy (&spx->bits) ; + + return 0 ; +} /* spx_close */ + + + +static void * +spx_header_read (SF_PRIVATE * psf, ogg_packet *op, spx_int32_t enh_enabled, int force_mode) +{ SPX_PRIVATE* spx = psf->codec_data ; + void *st ; + const SpeexMode *mode ; + SpeexHeader *tmp_header ; + int modeID ; + SpeexCallback callback ; + + tmp_header = speex_packet_to_header ((char*) op->packet, op->bytes) ; + if (tmp_header == NULL) + { psf_log_printf (psf, "Cannot read Speex header\n") ; + return NULL ; + } ; + + memcpy (&spx->header, tmp_header, sizeof (spx->header)) ; + free (tmp_header) ; + tmp_header = NULL ; + + if (spx->header.mode >= SPEEX_NB_MODES || spx->header.mode < 0) + { psf_log_printf (psf, "Mode number %d does not (yet/any longer) exist in this version\n", spx->header.mode) ; + return NULL ; + } ; + + modeID = spx->header.mode ; + if (force_mode != -1) + modeID = force_mode ; + + mode = speex_lib_get_mode (modeID) ; + + if (spx->header.speex_version_id > 1) + { psf_log_printf (psf, "This file was encoded with Speex bit-stream version %d, which I don't know how to decode\n", spx->header.speex_version_id) ; + return NULL ; + } ; + + if (mode->bitstream_version < spx->header.mode_bitstream_version) + { psf_log_printf (psf, "The file was encoded with a newer version of Speex. You need to upgrade in order to play it.\n") ; + return NULL ; + } ; + + if (mode->bitstream_version > spx->header.mode_bitstream_version) + { psf_log_printf (psf, "The file was encoded with an older version of Speex. You would need to downgrade the version in order to play it.\n") ; + return NULL ; + } ; + + st = speex_decoder_init (mode) ; + if (!st) + { psf_log_printf (psf, "Decoder initialization failed.\n") ; + return NULL ; + } ; + + speex_decoder_ctl (st, SPEEX_SET_ENH, &enh_enabled) ; + speex_decoder_ctl (st, SPEEX_GET_FRAME_SIZE, &spx->frame_size) ; + spx->granule_frame_size = spx->frame_size ; + + if (!psf->sf.samplerate) + psf->sf.samplerate = spx->header.rate ; + /* Adjust rate if --force-* options are used */ + if (force_mode != -1) + { if (spx->header.mode < force_mode) + { psf->sf.samplerate <<= (force_mode - spx->header.mode) ; + spx->granule_frame_size >>= (force_mode - spx->header.mode) ; + } ; + if (spx->header.mode > force_mode) + { psf->sf.samplerate >>= (spx->header.mode - force_mode) ; + spx->granule_frame_size <<= (spx->header.mode - force_mode) ; + } ; + } ; + + speex_decoder_ctl (st, SPEEX_SET_SAMPLING_RATE, &psf->sf.samplerate) ; + + spx->nframes = spx->header.frames_per_packet ; + + if (psf->sf.channels == -1) + psf->sf.channels = spx->header.nb_channels ; + + if (! (psf->sf.channels == 1)) + { psf->sf.channels = 2 ; + callback.callback_id = SPEEX_INBAND_STEREO ; + callback.func = speex_std_stereo_request_handler ; + callback.data = &spx->stereo ; + speex_decoder_ctl (st, SPEEX_SET_HANDLER, &callback) ; + } ; + + spx->header.speex_version [sizeof (spx->header.speex_version) - 1] = 0 ; + + psf_log_printf (psf, " Encoder ver : %s\n Frames/packet : %d\n", + spx->header.speex_version, spx->header.frames_per_packet) ; + + if (spx->header.bitrate > 0) + psf_log_printf (psf, " Bit rate : %d\n", spx->header.bitrate) ; + + psf_log_printf (psf, " Sample rate : %d\n Mode : %s\n VBR : %s\n Channels : %d\n", + psf->sf.samplerate, mode->modeName, (spx->header.vbr ? "yes" : "no"), psf->sf.channels) ; + + psf_log_printf (psf, " Extra headers : %d\n", spx->header.extra_headers) ; + + return st ; +} /* spx_header_read */ + + +static void +spx_print_comments (const char *c, int length) +{ + const char *end ; + int len, i, nb_fields ; + +printf ("%s %d\n", __func__, __LINE__) ; + if (length < 8) + { fprintf (stderr, "Invalid/corrupted comments\n") ; + return ; + } + end = c + length ; + len = readint (c, 0) ; + c += 4 ; + if (len < 0 || c + len > end) + { fprintf (stderr, "Invalid/corrupted comments\n") ; + return ; + } + (void) fwrite (c, 1, len, stderr) ; + c += len ; + fprintf (stderr, "\n") ; + if (c + 4 > end) + { fprintf (stderr, "Invalid/corrupted comments\n") ; + return ; + } + nb_fields = readint (c, 0) ; + c += 4 ; + for (i = 0 ; i < nb_fields ; i++) + { if (c + 4 > end) + { fprintf (stderr, "Invalid/corrupted comments\n") ; + return ; + } ; + len = readint (c, 0) ; + c += 4 ; + if (len < 0 || c + len > end) + { fprintf (stderr, "Invalid/corrupted comments\n") ; + return ; + } + (void) fwrite (c, 1, len, stderr) ; + c += len ; + fprintf (stderr, "\n") ; + } ; + return ; +} /* spx_print_comments */ + + +/* +encoded_speex_frames = (frames_per_packet * Packets) + = 1 * 272 + = 272 + +audio_samples = encoded_speex_frames * frame_size + = 272 * 640 + = 174080 + +duration = audio_samples / rate + = 174080 / 44100 + = 3.947 +*/ + +#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_XIPH_LIBS */ + +int +ogg_speex_open (SF_PRIVATE *psf) +{ + psf_log_printf (psf, "This version of libsndfile was compiled without Ogg/Speex support.\n") ; + return SFE_UNIMPLEMENTED ; +} /* ogg_speex_open */ + +#endif diff --git a/lib-src/libsndfile/src/ogg_vcomment.c b/lib-src/libsndfile/src/ogg_vcomment.c new file mode 100644 index 000000000..252ed61d0 --- /dev/null +++ b/lib-src/libsndfile/src/ogg_vcomment.c @@ -0,0 +1,277 @@ +/* +** Copyright (C) 2008-2019 Erik de Castro Lopo +** Copyright (C) 2018 Arthur Taylor +** +** This program is free software ; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program ; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" + +#if HAVE_EXTERNAL_XIPH_LIBS + +#include + +#include "ogg_vcomment.h" + +typedef struct +{ int id ; + const char *name ; +} STR_PAIR ; + +/* See https://xiph.org/vorbis/doc/v-comment.html */ +static STR_PAIR vorbiscomment_mapping [] = +{ { SF_STR_TITLE, "TITLE" }, + { SF_STR_COPYRIGHT, "COPYRIGHT", }, + { SF_STR_SOFTWARE, "ENCODER", }, + { SF_STR_ARTIST, "ARTIST" }, + { SF_STR_COMMENT, "COMMENT" }, + { SF_STR_DATE, "DATE", }, + { SF_STR_ALBUM, "ALBUM" }, + { SF_STR_LICENSE, "LICENSE", }, + { SF_STR_TRACKNUMBER, "TRACKNUMBER", }, + { SF_STR_GENRE, "GENRE", }, + { 0, NULL, }, +} ; + +/*----------------------------------------------------------------------------------------------- +** Private function prototypes. +*/ + +static int vorbiscomment_lookup_id (const char *name) ; +static const char * vorbiscomment_lookup_name (int id) ; + +static inline size_t read_32bit_size_t (const unsigned char * ptr) +{ /* Read a 32 bit positive value from the provided pointer. */ + return LE2H_32_PTR (ptr) & 0x7fffffff ; +} /* read_32bit_size_t */ + +/*----------------------------------------------------------------------------------------------- +** Exported functions. +*/ + +int +vorbiscomment_read_tags (SF_PRIVATE *psf, ogg_packet *packet, vorbiscomment_ident *ident) +{ unsigned char *p, *ep ; + char *tag, *c ; + size_t tag_size, tag_len = 0 ; + unsigned int ntags, i = 0 ; + int id, ret = 0 ; + + /* + ** The smallest possible header is the ident string length plus two 4-byte + ** integers, (vender string length, tags count.) + */ + if (packet->bytes < (ident ? ident->length : 0) + 4 + 4) + return SFE_MALFORMED_FILE ; + + /* Our working pointer. */ + p = packet->packet ; + /* Our end pointer for bound checking. */ + ep = p + packet->bytes ; + + if (ident) + { if (memcmp (p, ident->ident, ident->length) != 0) + { psf_log_printf (psf, "Expected comment packet identifier missing.\n") ; + return SFE_MALFORMED_FILE ; + } ; + p += ident->length ; + } ; + + tag_size = 1024 ; + tag = malloc (tag_size) ; + /* Unlikely */ + if (!tag) + return SFE_MALLOC_FAILED ; + + psf_log_printf (psf, "VorbisComment Metadata\n") ; + + /* + ** Vendor tag, manditory, no field name. + */ + tag_len = read_32bit_size_t (p) ; + p += 4 ; + if (tag_len > 0) + { /* Bound checking. 4 bytes for remaining manditory fields. */ + if (p + tag_len + 4 > ep) + { ret = SFE_MALFORMED_FILE ; + goto free_tag_out ; + } ; + if (tag_len > tag_size - 1) + { free (tag) ; + tag_size = tag_len + 1 ; + tag = malloc (tag_size) ; + /* Unlikely */ + if (!tag) + return SFE_MALLOC_FAILED ; + } ; + memcpy (tag, p, tag_len) ; p += tag_len ; + tag [tag_len] = '\0' ; + psf_log_printf (psf, " Vendor: %s\n", tag) ; + } ; + + /* + ** List of tags of the form NAME=value + ** Allowable characters for NAME are the same as shell variable names. + */ + ntags = read_32bit_size_t (p) ; + p += 4 ; + for (i = 0 ; i < ntags ; i++) + { if (p + 4 > ep) + { ret = SFE_MALFORMED_FILE ; + goto free_tag_out ; + } ; + tag_len = read_32bit_size_t (p) ; + p += 4 ; + if (p + tag_len > ep) + { ret = SFE_MALFORMED_FILE ; + goto free_tag_out ; + } ; + if (tag_len > tag_size - 1) + { free (tag) ; + tag_size = tag_len + 1 ; + tag = malloc (tag_size) ; + /* Unlikely */ + if (!tag) + return SFE_MALLOC_FAILED ; + } ; + memcpy (tag, p, tag_len) ; p += tag_len ; + tag [tag_len] = '\0' ; + psf_log_printf (psf, " %s\n", tag) ; + for (c = tag ; *c ; c++) + { if (*c == '=') + break ; + *c = toupper (*c) ; + } ; + if (!c) + { psf_log_printf (psf, "Malformed Vorbis comment, no '=' found.\n") ; + continue ; + } ; + *c = '\0' ; + if ((id = vorbiscomment_lookup_id (tag)) != 0) + psf_store_string (psf, id, c + 1) ; + } ; + +free_tag_out: + if (tag != NULL) + free (tag) ; + return ret ; +} /* vorbiscomment_read_tags */ + +int +vorbiscomment_write_tags (SF_PRIVATE *psf, ogg_packet *packet, vorbiscomment_ident *ident, const char *vendor, int targetsize) +{ int i, ntags ; + int tags_start ; + const char *tag_name ; + int tag_name_len, tag_body_len ; + + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; + + /* Packet identifier */ + if (ident) + psf_binheader_writef (psf, "eb", BHWv (ident->ident), BHWz (ident->length)) ; + + /* Manditory Vendor Tag */ + tag_name_len = vendor ? strlen (vendor) : 0 ; + psf_binheader_writef (psf, "e4b", BHW4 (tag_name_len), BHWv (vendor), BHWz (tag_name_len)) ; + + /* Tags Count. Skip for now, write after. */ + tags_start = psf->header.indx ; + psf_binheader_writef (psf, "j", BHWj (4)) ; + + ntags = 0 ; + /* Write each tag */ + for (i = 0 ; i < SF_MAX_STRINGS ; i++) + { if (psf->strings.data [i].type == 0) + continue ; + + tag_name = vorbiscomment_lookup_name (psf->strings.data [i].type) ; + if (tag_name == NULL) + continue ; + + tag_name_len = strlen (tag_name) ; + tag_body_len = strlen (psf->strings.storage + psf->strings.data [i].offset) ; + if (targetsize > 0 && tag_name_len + tag_body_len + psf->header.indx > targetsize) + { /* If we are out of space, stop now. */ + return SFE_STR_MAX_DATA ; + } + psf_binheader_writef (psf, "e4b1b", + BHW4 (tag_name_len + 1 + tag_body_len), + BHWv (tag_name), BHWz (tag_name_len), + BHW1 ('='), + BHWv (psf->strings.storage + psf->strings.data [i].offset), BHWz (tag_body_len)) ; + ntags++ ; + } ; + + if (targetsize < 0) + { /* + ** Padding. + ** + ** Pad to a minimum of -targetsize, but make sure length % 255 + ** = 254 so that we get the most out of the ogg segment lacing. + */ + psf_binheader_writef (psf, "z", BHWz ((psf->header.indx + -targetsize + 255) / 255 * 255 - 1)) ; + } + else if (targetsize > 0) + psf_binheader_writef (psf, "z", BHWz (targetsize - psf->header.indx)) ; + + packet->packet = psf->header.ptr ; + packet->bytes = psf->header.indx ; + packet->b_o_s = 0 ; + packet->e_o_s = 0 ; + + /* Seek back and write the tag count. */ + psf_binheader_writef (psf, "eo4", BHWo (tags_start), BHW4 (ntags)) ; + + return 0 ; +} /* vorbiscomment_write_tags */ + +/*============================================================================== +** Private functions. +*/ + +static int +vorbiscomment_lookup_id (const char * name) +{ STR_PAIR *p ; + + for (p = vorbiscomment_mapping ; p->id ; p++) + { if (!strcmp (name, p->name)) + return p->id ; + } ; + + return 0 ; +} /* vorbiscomment_lookup_id */ + +static const char * +vorbiscomment_lookup_name (int id) +{ STR_PAIR *p ; + + for (p = vorbiscomment_mapping ; p->id ; p++) + { if (p->id == id) + return p->name ; + } ; + + return NULL ; +} /* vorbiscomment_lookup_name */ + +#endif /* HAVE_EXTERNAL_XIPH_LIBS */ diff --git a/lib-src/libsndfile/src/ogg_vcomment.h b/lib-src/libsndfile/src/ogg_vcomment.h new file mode 100644 index 000000000..c25d900f6 --- /dev/null +++ b/lib-src/libsndfile/src/ogg_vcomment.h @@ -0,0 +1,45 @@ +/* +** Copyright (C) 2008-2018 Erik de Castro Lopo +** Copyright (C) 2018 Arthur Taylor +** +** This program is free software ; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program ; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#ifndef SF_SRC_OGG_VCOMMENT_H +#define SF_SRC_OGG_VCOMMENT_H + +/* +** Voriscomment identifier. Some Ogg stream embedding schemes require it. +*/ +typedef struct +{ const char *ident ; + int length ; +} vorbiscomment_ident ; + +/* +** Read all vorbiscomment tags from *packet. Tags which match ones used +** by libsndfile strings are loaded into *psf. Ogg streams which require an +** identifier for the tags packet should pass it in *ident. +*/ +int vorbiscomment_read_tags (SF_PRIVATE *psf, ogg_packet *packet, vorbiscomment_ident *ident) ; + +/* +** Write metadata strings stored in *psf to *packet. The packet is optionally +** prefixed with *ident. The always-present vendor field should be the library +** used for encoding the audio data. +*/ +int vorbiscomment_write_tags (SF_PRIVATE *psf, ogg_packet *packet, vorbiscomment_ident *ident, const char *vendor, int targetsize) ; + +#endif /* SF_SRC_OGG_VCOMMENT_H */ diff --git a/lib-src/libsndfile/src/ogg_vorbis.c b/lib-src/libsndfile/src/ogg_vorbis.c new file mode 100644 index 000000000..0f895729a --- /dev/null +++ b/lib-src/libsndfile/src/ogg_vorbis.c @@ -0,0 +1,907 @@ +/* +** Copyright (C) 2002-2016 Erik de Castro Lopo +** Copyright (C) 2002-2005 Michael Smith +** Copyright (C) 2007 John ffitch +** +** This program is free software ; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program ; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +/* +** Much of this code is based on the examples in libvorbis from the +** XIPHOPHORUS Company http://www.xiph.org/ which has a BSD-style Licence +** Copyright (c) 2002, Xiph.org Foundation +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** - Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** - Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** +** - Neither the name of the Xiph.org Foundation nor the names of its +** contributors may be used to endorse or promote products derived from +** this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION +** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE, +** DATA, OR PROFITS ; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include +#include +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" + +#if HAVE_EXTERNAL_XIPH_LIBS + +#include +#include +#include + +#include "ogg.h" + +typedef int convert_func (SF_PRIVATE *psf, int, void *, int, int, float **) ; + +static int vorbis_read_header (SF_PRIVATE *psf) ; +static int vorbis_write_header (SF_PRIVATE *psf, int calc_length) ; +static int vorbis_close (SF_PRIVATE *psf) ; +static int vorbis_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; +static int vorbis_byterate (SF_PRIVATE *psf) ; +static sf_count_t vorbis_calculate_page_duration (SF_PRIVATE *psf) ; +static sf_count_t vorbis_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; +static sf_count_t vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; +static sf_count_t vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; +static sf_count_t vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; +static sf_count_t vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; +static sf_count_t vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; +static sf_count_t vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; +static sf_count_t vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; +static sf_count_t vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; +static sf_count_t vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ; +static int vorbis_rnull (SF_PRIVATE *psf, int samples, void *vptr, int off , int channels, float **pcm) ; + +typedef struct +{ int id ; + const char *name ; +} STR_PAIRS ; + + +/* See https://xiph.org/vorbis/doc/v-comment.html */ +static STR_PAIRS vorbis_metatypes [] = +{ { SF_STR_TITLE, "Title" }, + { SF_STR_COPYRIGHT, "Copyright" }, + { SF_STR_SOFTWARE, "Software" }, + { SF_STR_ARTIST, "Artist" }, + { SF_STR_COMMENT, "Comment" }, + { SF_STR_DATE, "Date" }, + { SF_STR_ALBUM, "Album" }, + { SF_STR_LICENSE, "License" }, + { SF_STR_TRACKNUMBER, "Tracknumber" }, + { SF_STR_GENRE, "Genre" }, +} ; + +typedef struct +{ /* Count current location */ + sf_count_t loc ; + /* Struct that stores all the static vorbis bitstream settings */ + vorbis_info vinfo ; + /* Struct that stores all the bitstream user comments */ + vorbis_comment vcomment ; + /* Ventral working state for the packet->PCM decoder */ + vorbis_dsp_state vdsp ; + /* Local working space for packet->PCM decode */ + vorbis_block vblock ; + + /* Encoding quality in range [0.0, 1.0]. */ + double quality ; + + /* Current granule position. */ + uint64_t pcm_current ; + /* Offset of the first samples' granule position. */ + uint64_t pcm_start ; + /* Last valid samples' granule position. */ + uint64_t pcm_end ; + /* File offset of the start of the last page. */ + sf_count_t last_page ; +} VORBIS_PRIVATE ; + +static int +vorbis_read_header (SF_PRIVATE *psf) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + sf_count_t duration ; + int printed_metadata_msg = 0 ; + int i, k, nn ; + + /* + ** The first page of the Ogg stream we are told to try and open as Vorbis + ** has already been loaded into odata->ostream by ogg_open(). + ** + ** Extract the initial header from the first page and verify that the + ** Ogg bitstream is in fact Vorbis data. + */ + + vorbis_info_init (&vdata->vinfo) ; + vorbis_comment_init (&vdata->vcomment) ; + + if (!odata->opacket.b_o_s) + { psf_log_printf (psf, "Vorbis: First packet does not have a beginning-of-stream bit.\n") ; + return SFE_MALFORMED_FILE ; + } + + if (ogg_stream_packetpeek (&odata->ostream, NULL)) + { psf_log_printf (psf, "Vorbis: First page contains extraneous packets!\n") ; + return SFE_MALFORMED_FILE ; + } + + if (vorbis_synthesis_headerin (&vdata->vinfo, &vdata->vcomment, &odata->opacket) < 0) + { /* Error case ; not a vorbis header. */ + psf_log_printf (psf, "Found Vorbis in stream header, but vorbis_synthesis_headerin failed.\n") ; + return SFE_MALFORMED_FILE ; + } ; + + /* + ** At this point, we're sure we're Vorbis. We've set up the logical (Ogg) + ** bitstream decoder. Get the comment and codebook headers and set up the + ** Vorbis decoder. + ** + ** The next two packets in order are the comment and codebook headers. + ** They're likely large and may span multiple pages. Thus we reead + ** and submit data until we get our two pacakets, watching that no + ** pages are missing. If a page is missing, error out ; losing a + ** header page is the only place where missing data is fatal. + */ + + i = 0 ; /* Count of number of packets read */ + while (i < 2) + { nn = ogg_stream_packetout (&odata->ostream, &odata->opacket) ; + + if (nn == 0) + { nn = ogg_stream_next_page (psf, odata) ; + if (nn == 0) + { psf_log_printf (psf, "End of file before finding all Vorbis headers!\n") ; + return SFE_MALFORMED_FILE ; + } ; + if (nn == -1) + { psf_log_printf (psf, "Error reading file while finding Vorbis headers!\n") ; + return psf->error ; + } ; + continue ; + } + + if (nn < 0) + { /* A hole while reading headers. This could be bad. */ + psf_log_printf (psf, "Corrupt secondary header. Exiting.\n") ; + return SFE_MALFORMED_FILE ; + } ; + + vorbis_synthesis_headerin (&vdata->vinfo, &vdata->vcomment, &odata->opacket) ; + i++ ; + } ; + + /* Check for extraneous packets in the last headers page. */ + while (ogg_stream_packetout (&odata->ostream, &odata->opacket) == 1) + { i++ ; + } + if (i > 2) + psf_log_printf (psf, "Vorbis: stream has extraneous header packets.\n") ; + + psf_log_printf (psf, "Bitstream is %d channel, %D Hz\n", vdata->vinfo.channels, vdata->vinfo.rate) ; + psf_log_printf (psf, "Encoded by : %s\n", vdata->vcomment.vendor) ; + + /* Save the offset of the first payload page */ + psf->dataoffset = ogg_sync_ftell (psf) ; + + /* + ** Caculate the granule position offset. The first page with a payload + ** packet shouldn't end in a continued packet. The difference between the + ** page's granule position and the sum of frames on the page tells us the + ** granule position offset. + ** See https://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-132000A.2 + */ + ogg_stream_unpack_page (psf, odata) ; + vdata->pcm_start = odata->pkt [odata->pkt_len - 1].granulepos ; + duration = vorbis_calculate_page_duration (psf) ; + + if (duration < (sf_count_t) vdata->pcm_start) + vdata->pcm_start -= duration ; + else + vdata->pcm_start = 0 ; + + /* + ** Find the end of the stream, save it. Only works if the file is seekable. + */ + vdata->loc = vdata->pcm_start ; + vdata->pcm_end = (uint64_t) -1 ; + psf->datalength = psf->filelength ; + if (!psf->is_pipe) + { sf_count_t last_page ; + sf_count_t saved_offset ; + + saved_offset = ogg_sync_ftell (psf) ; + last_page = ogg_sync_last_page_before (psf, odata, &vdata->pcm_end, psf->filelength, odata->ostream.serialno) ; + if (last_page > 0) + { if (!ogg_page_eos (&odata->opage)) + psf_log_printf (psf, "Ogg: Last page lacks an end-of-stream bit.\n") ; + psf->datalength = last_page + odata->opage.header_len + odata->opage.body_len - psf->dataoffset ; + if (psf->datalength + psf->dataoffset < psf->filelength) + psf_log_printf (psf, "Ogg: Junk after the last page.\n") ; + vdata->last_page = last_page ; + } ; + + ogg_sync_fseek (psf, saved_offset, SEEK_SET) ; + } + + psf_log_printf (psf, "PCM offset : %d\n", vdata->pcm_start) ; + if (vdata->pcm_end != (uint64_t) -1) + psf_log_printf (psf, "PCM end : %d\n", vdata->pcm_end) ; + else + psf_log_printf (psf, "PCM end : unknown\n") ; + + /* Throw the comments plus a few lines about the bitstream we're decoding. */ + for (k = 0 ; k < ARRAY_LEN (vorbis_metatypes) ; k++) + { char *dd ; + + dd = vorbis_comment_query (&vdata->vcomment, vorbis_metatypes [k].name, 0) ; + if (dd == NULL) + continue ; + + if (printed_metadata_msg == 0) + { psf_log_printf (psf, "Metadata :\n") ; + printed_metadata_msg = 1 ; + } ; + + psf_store_string (psf, vorbis_metatypes [k].id, dd) ; + psf_log_printf (psf, " %-10s : %s\n", vorbis_metatypes [k].name, dd) ; + } ; + psf_log_printf (psf, "End\n") ; + + psf->sf.samplerate = vdata->vinfo.rate ; + psf->sf.channels = vdata->vinfo.channels ; + psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ; + psf->sf.frames = (vdata->pcm_end != (uint64_t) -1) ? vdata->pcm_end - vdata->pcm_start : SF_COUNT_MAX ; + + /* OK, got and parsed all three headers. Initialize the Vorbis + ** packet->PCM decoder. + ** Central decode state. */ + vorbis_synthesis_init (&vdata->vdsp, &vdata->vinfo) ; + + /* Local state for most of the decode so multiple block decodes can + ** proceed in parallel. We could init multiple vorbis_block structures + ** for vd here. */ + vorbis_block_init (&vdata->vdsp, &vdata->vblock) ; + + return 0 ; +} /* vorbis_read_header */ + +static int +vorbis_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) +{ + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int k, ret ; + + vorbis_info_init (&vdata->vinfo) ; + + /* The style of encoding should be selectable here, VBR quality mode. */ + ret = vorbis_encode_init_vbr (&vdata->vinfo, psf->sf.channels, psf->sf.samplerate, vdata->quality) ; + +#if 0 + ret = vorbis_encode_init (&vdata->vinfo, psf->sf.channels, psf->sf.samplerate, -1, 128000, -1) ; /* average bitrate mode */ + ret = ( vorbis_encode_setup_managed (&vdata->vinfo, psf->sf.channels, psf->sf.samplerate, -1, 128000, -1) + || vorbis_encode_ctl (&vdata->vinfo, OV_ECTL_RATEMANAGE_AVG, NULL) + || vorbis_encode_setup_init (&vdata->vinfo) + ) ; +#endif + if (ret) + return SFE_BAD_OPEN_FORMAT ; + + vdata->loc = 0 ; + + /* add a comment */ + vorbis_comment_init (&vdata->vcomment) ; + + vorbis_comment_add_tag (&vdata->vcomment, "ENCODER", "libsndfile") ; + for (k = 0 ; k < SF_MAX_STRINGS ; k++) + { const char * name ; + + if (psf->strings.data [k].type == 0) + break ; + + switch (psf->strings.data [k].type) + { case SF_STR_TITLE : name = "TITLE" ; break ; + case SF_STR_COPYRIGHT : name = "COPYRIGHT" ; break ; + case SF_STR_SOFTWARE : name = "SOFTWARE" ; break ; + case SF_STR_ARTIST : name = "ARTIST" ; break ; + case SF_STR_COMMENT : name = "COMMENT" ; break ; + case SF_STR_DATE : name = "DATE" ; break ; + case SF_STR_ALBUM : name = "ALBUM" ; break ; + case SF_STR_LICENSE : name = "LICENSE" ; break ; + case SF_STR_TRACKNUMBER : name = "Tracknumber" ; break ; + case SF_STR_GENRE : name = "Genre" ; break ; + + default : continue ; + } ; + + vorbis_comment_add_tag (&vdata->vcomment, name, psf->strings.storage + psf->strings.data [k].offset) ; + } ; + + /* set up the analysis state and auxiliary encoding storage */ + vorbis_analysis_init (&vdata->vdsp, &vdata->vinfo) ; + vorbis_block_init (&vdata->vdsp, &vdata->vblock) ; + + /* + ** Set up our packet->stream encoder. + ** Pick a random serial number ; that way we can more likely build + ** chained streams just by concatenation. + */ + + ogg_stream_init (&odata->ostream, psf_rand_int32 ()) ; + + /* Vorbis streams begin with three headers ; the initial header (with + most of the codec setup parameters) which is mandated by the Ogg + bitstream spec. The second header holds any comment fields. The + third header holds the bitstream codebook. We merely need to + make the headers, then pass them to libvorbis one at a time ; + libvorbis handles the additional Ogg bitstream constraints */ + + { ogg_packet header ; + ogg_packet header_comm ; + ogg_packet header_code ; + int result ; + + vorbis_analysis_headerout (&vdata->vdsp, &vdata->vcomment, &header, &header_comm, &header_code) ; + ogg_stream_packetin (&odata->ostream, &header) ; /* automatically placed in its own page */ + ogg_stream_packetin (&odata->ostream, &header_comm) ; + ogg_stream_packetin (&odata->ostream, &header_code) ; + + /* This ensures the actual + * audio data will start on a new page, as per spec + */ + while ((result = ogg_stream_flush (&odata->ostream, &odata->opage)) != 0) + { ogg_write_page (psf, &odata->opage) ; + } ; + } + + return 0 ; +} /* vorbis_write_header */ + +static int +vorbis_close (SF_PRIVATE *psf) +{ OGG_PRIVATE* odata = psf->container_data ; + VORBIS_PRIVATE *vdata = psf->codec_data ; + + if (odata == NULL || vdata == NULL) + return 0 ; + + /* Clean up this logical bitstream ; before exit we shuld see if we're + ** followed by another [chained]. */ + + if (psf->file.mode == SFM_WRITE) + { + if (psf->write_current <= 0) + vorbis_write_header (psf, 0) ; + + vorbis_analysis_wrote (&vdata->vdsp, 0) ; + while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1) + { + + /* analysis, assume we want to use bitrate management */ + vorbis_analysis (&vdata->vblock, NULL) ; + vorbis_bitrate_addblock (&vdata->vblock) ; + + while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) + { /* weld the packet into the bitstream */ + ogg_stream_packetin (&odata->ostream, &odata->opacket) ; + + /* write out pages (if any) */ + while (!odata->eos) + { int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ; + if (result == 0) break ; + ogg_write_page (psf, &odata->opage) ; + + /* this could be set above, but for illustrative purposes, I do + it here (to show that vorbis does know where the stream ends) */ + + if (ogg_page_eos (&odata->opage)) odata->eos = 1 ; + } + } + } + } + + /* ogg_page and ogg_packet structs always point to storage in + libvorbis. They are never freed or manipulated directly */ + + vorbis_block_clear (&vdata->vblock) ; + vorbis_dsp_clear (&vdata->vdsp) ; + vorbis_comment_clear (&vdata->vcomment) ; + vorbis_info_clear (&vdata->vinfo) ; + + return 0 ; +} /* vorbis_close */ + +int +ogg_vorbis_open (SF_PRIVATE *psf) +{ OGG_PRIVATE* odata = psf->container_data ; + VORBIS_PRIVATE* vdata ; + int error = 0 ; + + if (odata == NULL) + { psf_log_printf (psf, "%s : odata is NULL???\n", __func__) ; + return SFE_INTERNAL ; + } ; + + vdata = calloc (1, sizeof (VORBIS_PRIVATE)) ; + psf->codec_data = vdata ; + + if (psf->file.mode == SFM_RDWR) + return SFE_BAD_MODE_RW ; + + psf_log_printf (psf, "Vorbis library version : %s\n", vorbis_version_string ()) ; + + if (psf->file.mode == SFM_READ) + { if ((error = vorbis_read_header (psf))) + return error ; + + psf->read_short = vorbis_read_s ; + psf->read_int = vorbis_read_i ; + psf->read_float = vorbis_read_f ; + psf->read_double = vorbis_read_d ; + } ; + + psf->codec_close = vorbis_close ; + if (psf->file.mode == SFM_WRITE) + { + /* Set the default vorbis quality here. */ + vdata->quality = 0.4 ; + + psf->write_header = vorbis_write_header ; + psf->write_short = vorbis_write_s ; + psf->write_int = vorbis_write_i ; + psf->write_float = vorbis_write_f ; + psf->write_double = vorbis_write_d ; + + psf->sf.frames = 0 ; + psf->datalength = 0 ; + psf->filelength = 0 ; + psf->dataoffset = 0 ; + psf->strings.flags = SF_STR_ALLOW_START ; + } ; + + psf->seek = vorbis_seek ; + psf->command = vorbis_command ; + psf->byterate = vorbis_byterate ; + psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ; + psf->sf.sections = 1 ; + + return error ; +} /* ogg_vorbis_open */ + +static int +vorbis_command (SF_PRIVATE *psf, int command, void * data, int datasize) +{ VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + + switch (command) + { case SFC_SET_COMPRESSION_LEVEL : + if (data == NULL || datasize != sizeof (double)) + return SF_FALSE ; + + if (psf->have_written) + return SF_FALSE ; + + vdata->quality = 1.0 - *((double *) data) ; + + /* Clip range. */ + vdata->quality = SF_MAX (0.0, SF_MIN (1.0, vdata->quality)) ; + + psf_log_printf (psf, "%s : Setting SFC_SET_VBR_ENCODING_QUALITY to %f.\n", __func__, vdata->quality) ; + return SF_TRUE ; + + default : + return SF_FALSE ; + } ; + + return SF_FALSE ; +} /* vorbis_command */ + +static int +vorbis_rnull (SF_PRIVATE *UNUSED (psf), int samples, void *UNUSED (vptr), int UNUSED (off) , int channels, float **UNUSED (pcm)) +{ + return samples * channels ; +} /* vorbis_rnull */ + +static int +vorbis_rshort (SF_PRIVATE *psf, int samples, void *vptr, int off, int channels, float **pcm) +{ + short *ptr = (short*) vptr + off ; + int i = 0, j, n ; + if (psf->float_int_mult) + { + float inverse = 1.0 / psf->float_max ; + for (j = 0 ; j < samples ; j++) + for (n = 0 ; n < channels ; n++) + ptr [i++] = lrintf ((pcm [n][j] * inverse) * 32767.0f) ; + } + else + { + for (j = 0 ; j < samples ; j++) + for (n = 0 ; n < channels ; n++) + ptr [i++] = lrintf (pcm [n][j] * 32767.0f) ; + } + return i ; +} /* vorbis_rshort */ + +static int +vorbis_rint (SF_PRIVATE *psf, int samples, void *vptr, int off, int channels, float **pcm) +{ + int *ptr = (int*) vptr + off ; + int i = 0, j, n ; + + if (psf->float_int_mult) + { + float inverse = 1.0 / psf->float_max ; + for (j = 0 ; j < samples ; j++) + for (n = 0 ; n < channels ; n++) + ptr [i++] = lrintf ((pcm [n][j] * inverse) * 2147483647.0f) ; + } + else + { + for (j = 0 ; j < samples ; j++) + for (n = 0 ; n < channels ; n++) + ptr [i++] = lrintf (pcm [n][j] * 2147483647.0f) ; + } + return i ; +} /* vorbis_rint */ + +static int +vorbis_rfloat (SF_PRIVATE *UNUSED (psf), int samples, void *vptr, int off, int channels, float **pcm) +{ + float *ptr = (float*) vptr + off ; + int i = 0, j, n ; + for (j = 0 ; j < samples ; j++) + for (n = 0 ; n < channels ; n++) + ptr [i++] = pcm [n][j] ; + return i ; +} /* vorbis_rfloat */ + +static int +vorbis_rdouble (SF_PRIVATE *UNUSED (psf), int samples, void *vptr, int off, int channels, float **pcm) +{ + double *ptr = (double*) vptr + off ; + int i = 0, j, n ; + for (j = 0 ; j < samples ; j++) + for (n = 0 ; n < channels ; n++) + ptr [i++] = pcm [n][j] ; + return i ; +} /* vorbis_rdouble */ + + +static sf_count_t +vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) +{ VORBIS_PRIVATE *vdata = psf->codec_data ; + OGG_PRIVATE *odata = psf->container_data ; + int len, samples, i = 0 , nn ; + float **pcm ; + + len = lens / psf->sf.channels ; + + while (len > 0) + { /* + ** pcm is a multichannel float vector. In stereo, for + ** example, pcm [0] is left, and pcm [1] is right. samples is + ** the size of each channel. Convert the float values + ** (-1.<=range<=1.) to whatever PCM format and write it out. + */ + while ((samples = vorbis_synthesis_pcmout (&vdata->vdsp, &pcm)) > 0) + { if (samples > len) samples = len ; + i += transfn (psf, samples, ptr, i, psf->sf.channels, pcm) ; + len -= samples ; + /* tell libvorbis how many samples we actually consumed */ + vorbis_synthesis_read (&vdata->vdsp, samples) ; + vdata->loc += samples ; + if (len == 0) + return i ; /* Is this necessary */ + } ; + + /* Out of samples, load the next packet. */ + if (odata->pkt_indx == odata->pkt_len) + { /* Page out of packets, load and unpack the next page. */ + nn = ogg_stream_unpack_page (psf, odata) ; + if (nn <= 0) + return i ; + if (nn == 2) + { /* Ran over a hole. loc is now out of date, need to recalculate. */ + vdata->loc = odata->pkt [odata->pkt_len - 1].granulepos ; + vdata->loc -= vorbis_calculate_page_duration (psf) ; + } + } ; + + /* Decode the packet */ + if (vorbis_synthesis (&vdata->vblock, &(odata->pkt [odata->pkt_indx])) == 0) /* test for success! */ + vorbis_synthesis_blockin (&vdata->vdsp, &vdata->vblock) ; + odata->pkt_indx++ ; + } ; + + return i ; +} /* vorbis_read_sample */ + +static sf_count_t +vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t lens) +{ return vorbis_read_sample (psf, (void*) ptr, lens, vorbis_rshort) ; +} /* vorbis_read_s */ + +static sf_count_t +vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t lens) +{ return vorbis_read_sample (psf, (void*) ptr, lens, vorbis_rint) ; +} /* vorbis_read_i */ + +static sf_count_t +vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t lens) +{ return vorbis_read_sample (psf, (void*) ptr, lens, vorbis_rfloat) ; +} /* vorbis_read_f */ + +static sf_count_t +vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t lens) +{ return vorbis_read_sample (psf, (void*) ptr, lens, vorbis_rdouble) ; +} /* vorbis_read_d */ + +/*============================================================================== +*/ + +static void +vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames) +{ + vorbis_analysis_wrote (&vdata->vdsp, in_frames) ; + + /* + ** Vorbis does some data preanalysis, then divvies up blocks for + ** more involved (potentially parallel) processing. Get a single + ** block for encoding now. + */ + while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1) + { + /* analysis, assume we want to use bitrate management */ + vorbis_analysis (&vdata->vblock, NULL) ; + vorbis_bitrate_addblock (&vdata->vblock) ; + + while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) + { + /* weld the packet into the bitstream */ + ogg_stream_packetin (&odata->ostream, &odata->opacket) ; + + /* write out pages (if any) */ + while (!odata->eos) + { int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ; + if (result == 0) + break ; + ogg_write_page (psf, &odata->opage) ; + + /* This could be set above, but for illustrative purposes, I do + ** it here (to show that vorbis does know where the stream ends) */ + if (ogg_page_eos (&odata->opage)) + odata->eos = 1 ; + } ; + } ; + } ; + + vdata->loc += in_frames ; +} /* vorbis_write_data */ + + +static sf_count_t +vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens) +{ + int i, m, j = 0 ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; + float **buffer = vorbis_analysis_buffer (&vdata->vdsp, in_frames) ; + for (i = 0 ; i < in_frames ; i++) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) (ptr [j++]) / 32767.0f ; + + vorbis_write_samples (psf, odata, vdata, in_frames) ; + + return lens ; +} /* vorbis_write_s */ + +static sf_count_t +vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens) +{ int i, m, j = 0 ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; + float **buffer = vorbis_analysis_buffer (&vdata->vdsp, in_frames) ; + for (i = 0 ; i < in_frames ; i++) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) (ptr [j++]) / 2147483647.0f ; + + vorbis_write_samples (psf, odata, vdata, in_frames) ; + + return lens ; +} /* vorbis_write_i */ + +static sf_count_t +vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens) +{ int i, m, j = 0 ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; + float **buffer = vorbis_analysis_buffer (&vdata->vdsp, in_frames) ; + for (i = 0 ; i < in_frames ; i++) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = ptr [j++] ; + + vorbis_write_samples (psf, odata, vdata, in_frames) ; + + return lens ; +} /* vorbis_write_f */ + +static sf_count_t +vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens) +{ int i, m, j = 0 ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; + float **buffer = vorbis_analysis_buffer (&vdata->vdsp, in_frames) ; + for (i = 0 ; i < in_frames ; i++) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) ptr [j++] ; + + vorbis_write_samples (psf, odata, vdata, in_frames) ; + + return lens ; +} /* vorbis_write_d */ + +static sf_count_t +vorbis_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + sf_count_t target ; + int ret ; + + if (odata == NULL || vdata == NULL) + return 0 ; + + if (offset < 0) + { psf->error = SFE_BAD_SEEK ; + return ((sf_count_t) -1) ; + } ; + + if (psf->file.mode == SFM_READ) + { target = offset + vdata->pcm_start ; + + /* + ** If the end of the file is know, and the seek isn't for the near + ** future, do a search of the file for a good place to start. + */ + ret = 0 ; + if ((vdata->pcm_end != (uint64_t) -1) && + (target < vdata->loc || target - vdata->loc > (2 * psf->sf.samplerate))) + { uint64_t best_gp ; + + best_gp = vdata->pcm_start ; + + ret = ogg_stream_seek_page_search (psf, odata, target, vdata->pcm_start, + vdata->pcm_end, &best_gp, psf->dataoffset, vdata->last_page) ; + if (ret >= 0) + { ret = ogg_stream_unpack_page (psf, odata) ; + if (ret == 1) + { vdata->loc = best_gp ; + vorbis_synthesis_restart (&vdata->vdsp) ; + } ; + } ; + } ; + + if (ret >= 0 && offset + (sf_count_t) vdata->pcm_start >= vdata->loc) + target = offset + vdata->pcm_start - vdata->loc ; + else + { /* Search failed (bad data?), reset to the beginning of the stream. */ + ogg_stream_reset_serialno (&odata->ostream, odata->ostream.serialno) ; + odata->pkt_len = 0 ; + odata->pkt_indx = 0 ; + ogg_sync_fseek (psf, psf->dataoffset, SEEK_SET) ; + vdata->loc = 0 ; + vorbis_synthesis_restart (&vdata->vdsp) ; + target = offset ; + } ; + + while (target > 0) + { sf_count_t m = target > 4096 ? 4096 : target ; + + /* + ** Need to multiply by channels here because the seek is done in + ** terms of frames and the read function is done in terms of + ** samples. + */ + vorbis_read_sample (psf, (void *) NULL, m * psf->sf.channels, vorbis_rnull) ; + + target -= m ; + } ; + + return vdata->loc - vdata->pcm_start ; + } ; + + return 0 ; +} /* vorbis_seek */ + + +static int +vorbis_byterate (SF_PRIVATE *psf) +{ + if (psf->file.mode == SFM_READ) + return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ; + + return -1 ; +} /* vorbis_byterate */ + +static sf_count_t +vorbis_calculate_page_duration (SF_PRIVATE *psf) +{ OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + long thisblock, lastblock ; + sf_count_t duration ; + int i ; + + lastblock = -1 ; + duration = 0 ; + for (i = 0 ; i < odata->pkt_len ; i++) + { thisblock = vorbis_packet_blocksize (&vdata->vinfo, &(odata->pkt [i])) ; + if (thisblock >= 0) + { if (lastblock != -1) + duration += (lastblock + thisblock) >> 2 ; + lastblock = thisblock ; + } ; + } ; + + return duration ; +} + +#else /* HAVE_EXTERNAL_XIPH_LIBS */ + +int +ogg_vorbis_open (SF_PRIVATE *psf) +{ + psf_log_printf (psf, "This version of libsndfile was compiled without Ogg/Vorbis support.\n") ; + return SFE_UNIMPLEMENTED ; +} /* ogg_vorbis_open */ + +#endif diff --git a/lib-src/libsndfile/src/paf.c b/lib-src/libsndfile/src/paf.c index 6595f29b1..7b9494237 100644 --- a/lib-src/libsndfile/src/paf.c +++ b/lib-src/libsndfile/src/paf.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -52,23 +52,19 @@ typedef struct { int version ; int endianness ; - int samplerate ; - int format ; + int samplerate ; + int format ; int channels ; int source ; } PAF_FMT ; typedef struct -{ int max_blocks, channels, samplesperblock, blocksize ; +{ int max_blocks, channels, blocksize ; int read_block, write_block, read_count, write_count ; sf_count_t sample_count ; int *samples ; - unsigned char *block ; -#if HAVE_FLEXIBLE_ARRAY + int *block ; int data [] ; /* ISO C99 struct flexible array. */ -#else - int data [1] ; /* This is a hack and may not work. */ -#endif } PAF24_PRIVATE ; /*------------------------------------------------------------------------------ @@ -163,6 +159,9 @@ paf_read_header (SF_PRIVATE *psf) { PAF_FMT paf_fmt ; int marker ; + if (psf->filelength < PAF_HEADER_LENGTH) + return SFE_PAF_SHORT_HEADER ; + memset (&paf_fmt, 0, sizeof (paf_fmt)) ; psf_binheader_readf (psf, "pm", 0, &marker) ; @@ -199,8 +198,8 @@ paf_read_header (SF_PRIVATE *psf) psf->endian = SF_ENDIAN_BIG ; } ; - if (psf->filelength < PAF_HEADER_LENGTH) - return SFE_PAF_SHORT_HEADER ; + if (paf_fmt.channels < 1 || paf_fmt.channels > SF_MAX_CHANNELS) + return SFE_PAF_BAD_CHANNELS ; psf->datalength = psf->filelength - psf->dataoffset ; @@ -299,26 +298,26 @@ paf_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; if (psf->endian == SF_ENDIAN_BIG) { /* Marker, version, endianness, samplerate */ - psf_binheader_writef (psf, "Em444", PAF_MARKER, 0, 0, psf->sf.samplerate) ; + psf_binheader_writef (psf, "Em444", BHWm (PAF_MARKER), BHW4 (0), BHW4 (0), BHW4 (psf->sf.samplerate)) ; /* format, channels, source */ - psf_binheader_writef (psf, "E444", paf_format, psf->sf.channels, 0) ; + psf_binheader_writef (psf, "E444", BHW4 (paf_format), BHW4 (psf->sf.channels), BHW4 (0)) ; } else if (psf->endian == SF_ENDIAN_LITTLE) { /* Marker, version, endianness, samplerate */ - psf_binheader_writef (psf, "em444", FAP_MARKER, 0, 1, psf->sf.samplerate) ; + psf_binheader_writef (psf, "em444", BHWm (FAP_MARKER), BHW4 (0), BHW4 (1), BHW4 (psf->sf.samplerate)) ; /* format, channels, source */ - psf_binheader_writef (psf, "e444", paf_format, psf->sf.channels, 0) ; + psf_binheader_writef (psf, "e444", BHW4 (paf_format), BHW4 (psf->sf.channels), BHW4 (0)) ; } ; /* Zero fill to dataoffset. */ - psf_binheader_writef (psf, "z", (size_t) (psf->dataoffset - psf->headindex)) ; + psf_binheader_writef (psf, "z", BHWz ((size_t) (psf->dataoffset - psf->header.indx))) ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; return psf->error ; } /* paf_write_header */ @@ -356,18 +355,16 @@ paf24_init (SF_PRIVATE *psf) */ psf->last_op = 0 ; - if (! (psf->codec_data = malloc (paf24size))) + if (! (psf->codec_data = calloc (1, paf24size))) return SFE_MALLOC_FAILED ; ppaf24 = (PAF24_PRIVATE*) psf->codec_data ; - memset (ppaf24, 0, paf24size) ; ppaf24->channels = psf->sf.channels ; ppaf24->samples = ppaf24->data ; - ppaf24->block = (unsigned char*) (ppaf24->data + PAF24_SAMPLES_PER_BLOCK * ppaf24->channels) ; + ppaf24->block = ppaf24->data + PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; ppaf24->blocksize = PAF24_BLOCK_SIZE * ppaf24->channels ; - ppaf24->samplesperblock = PAF24_SAMPLES_PER_BLOCK ; if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR) { paf24_read_block (psf, ppaf24) ; /* Read first block. */ @@ -405,7 +402,7 @@ paf24_init (SF_PRIVATE *psf) else ppaf24->write_block = 0 ; - psf->sf.frames = ppaf24->samplesperblock * ppaf24->max_blocks ; + psf->sf.frames = PAF24_SAMPLES_PER_BLOCK * ppaf24->max_blocks ; ppaf24->sample_count = psf->sf.frames ; return 0 ; @@ -426,8 +423,8 @@ paf24_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) if (mode == SFM_READ && ppaf24->write_count > 0) paf24_write_block (psf, ppaf24) ; - newblock = offset / ppaf24->samplesperblock ; - newsample = offset % ppaf24->samplesperblock ; + newblock = offset / PAF24_SAMPLES_PER_BLOCK ; + newsample = offset % PAF24_SAMPLES_PER_BLOCK ; switch (mode) { case SFM_READ : @@ -460,7 +457,7 @@ paf24_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) return PSF_SEEK_ERROR ; } ; - return newblock * ppaf24->samplesperblock + newsample ; + return newblock * PAF24_SAMPLES_PER_BLOCK + newsample ; } /* paf24_seek */ static int @@ -490,8 +487,8 @@ paf24_read_block (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24) ppaf24->read_block ++ ; ppaf24->read_count = 0 ; - if (ppaf24->read_block * ppaf24->samplesperblock > ppaf24->sample_count) - { memset (ppaf24->samples, 0, ppaf24->samplesperblock * ppaf24->channels) ; + if (ppaf24->read_block * PAF24_SAMPLES_PER_BLOCK > ppaf24->sample_count) + { memset (ppaf24->samples, 0, PAF24_SAMPLES_PER_BLOCK * ppaf24->channels) ; return 1 ; } ; @@ -499,30 +496,15 @@ paf24_read_block (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24) if ((k = psf_fread (ppaf24->block, 1, ppaf24->blocksize, psf)) != ppaf24->blocksize) psf_log_printf (psf, "*** Warning : short read (%d != %d).\n", k, ppaf24->blocksize) ; + /* Do endian swapping if necessary. */ + if ((CPU_IS_BIG_ENDIAN && psf->endian == SF_ENDIAN_LITTLE) || (CPU_IS_LITTLE_ENDIAN && psf->endian == SF_ENDIAN_BIG)) + endswap_int_array (ppaf24->block, 8 * ppaf24->channels) ; - if (CPU_IS_LITTLE_ENDIAN) - { /* Do endian swapping if necessary. */ - if (psf->endian == SF_ENDIAN_BIG) - endswap_int_array (ppaf24->data, 8 * ppaf24->channels) ; - - /* Unpack block. */ - for (k = 0 ; k < PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; k++) - { channel = k % ppaf24->channels ; - cptr = ppaf24->block + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ; - ppaf24->samples [k] = (cptr [0] << 8) | (cptr [1] << 16) | (cptr [2] << 24) ; - } ; - } - else - { /* Do endian swapping if necessary. */ - if (psf->endian == SF_ENDIAN_BIG) - endswap_int_array (ppaf24->data, 8 * ppaf24->channels) ; - - /* Unpack block. */ - for (k = 0 ; k < PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; k++) - { channel = k % ppaf24->channels ; - cptr = ppaf24->block + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ; - ppaf24->samples [k] = (cptr [0] << 8) | (cptr [1] << 16) | (cptr [2] << 24) ; - } ; + /* Unpack block. */ + for (k = 0 ; k < PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; k++) + { channel = k % ppaf24->channels ; + cptr = ((unsigned char *) ppaf24->block) + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ; + ppaf24->samples [k] = (cptr [0] << 8) | (cptr [1] << 16) | (((unsigned) cptr [2]) << 24) ; } ; return 1 ; @@ -533,15 +515,15 @@ paf24_read (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, int *ptr, int len) { int count, total = 0 ; while (total < len) - { if (ppaf24->read_block * ppaf24->samplesperblock >= ppaf24->sample_count) + { if (ppaf24->read_block * PAF24_SAMPLES_PER_BLOCK >= ppaf24->sample_count) { memset (&(ptr [total]), 0, (len - total) * sizeof (int)) ; return total ; } ; - if (ppaf24->read_count >= ppaf24->samplesperblock) + if (ppaf24->read_count >= PAF24_SAMPLES_PER_BLOCK) paf24_read_block (psf, ppaf24) ; - count = (ppaf24->samplesperblock - ppaf24->read_count) * ppaf24->channels ; + count = (PAF24_SAMPLES_PER_BLOCK - ppaf24->read_count) * ppaf24->channels ; count = (len - total > count) ? count : len - total ; memcpy (&(ptr [total]), &(ppaf24->samples [ppaf24->read_count * ppaf24->channels]), count * sizeof (int)) ; @@ -554,7 +536,8 @@ paf24_read (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, int *ptr, int len) static sf_count_t paf24_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ PAF24_PRIVATE *ppaf24 ; +{ BUF_UNION ubuf ; + PAF24_PRIVATE *ppaf24 ; int *iptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -563,8 +546,8 @@ paf24_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) return 0 ; ppaf24 = (PAF24_PRIVATE*) psf->codec_data ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = paf24_read (psf, ppaf24, iptr, readcount) ; @@ -592,7 +575,8 @@ paf24_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t paf24_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ PAF24_PRIVATE *ppaf24 ; +{ BUF_UNION ubuf ; + PAF24_PRIVATE *ppaf24 ; int *iptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -604,8 +588,8 @@ paf24_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 / 0x80000000) : (1.0 / 0x100) ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = paf24_read (psf, ppaf24, iptr, readcount) ; @@ -619,7 +603,8 @@ paf24_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t paf24_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ PAF24_PRIVATE *ppaf24 ; +{ BUF_UNION ubuf ; + PAF24_PRIVATE *ppaf24 ; int *iptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -631,8 +616,8 @@ paf24_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 / 0x80000000) : (1.0 / 0x100) ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = paf24_read (psf, ppaf24, iptr, readcount) ; @@ -657,7 +642,7 @@ paf24_write_block (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24) if (CPU_IS_LITTLE_ENDIAN) { for (k = 0 ; k < PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; k++) { channel = k % ppaf24->channels ; - cptr = ppaf24->block + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ; + cptr = ((unsigned char *) ppaf24->block) + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ; nextsample = ppaf24->samples [k] >> 8 ; cptr [0] = nextsample ; cptr [1] = nextsample >> 8 ; @@ -666,30 +651,30 @@ paf24_write_block (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24) /* Do endian swapping if necessary. */ if (psf->endian == SF_ENDIAN_BIG) - endswap_int_array (ppaf24->data, 8 * ppaf24->channels) ; + endswap_int_array (ppaf24->block, 8 * ppaf24->channels) ; } else if (CPU_IS_BIG_ENDIAN) { /* This is correct. */ for (k = 0 ; k < PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; k++) { channel = k % ppaf24->channels ; - cptr = ppaf24->block + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ; + cptr = ((unsigned char *) ppaf24->block) + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ; nextsample = ppaf24->samples [k] >> 8 ; cptr [0] = nextsample ; cptr [1] = nextsample >> 8 ; cptr [2] = nextsample >> 16 ; } ; - if (psf->endian == SF_ENDIAN_BIG) - endswap_int_array (ppaf24->data, 8 * ppaf24->channels) ; + if (psf->endian == SF_ENDIAN_LITTLE) + endswap_int_array (ppaf24->block, 8 * ppaf24->channels) ; } ; /* Write block to disk. */ if ((k = psf_fwrite (ppaf24->block, 1, ppaf24->blocksize, psf)) != ppaf24->blocksize) psf_log_printf (psf, "*** Warning : short write (%d != %d).\n", k, ppaf24->blocksize) ; - if (ppaf24->sample_count < ppaf24->write_block * ppaf24->samplesperblock + ppaf24->write_count) - ppaf24->sample_count = ppaf24->write_block * ppaf24->samplesperblock + ppaf24->write_count ; + if (ppaf24->sample_count < ppaf24->write_block * PAF24_SAMPLES_PER_BLOCK + ppaf24->write_count) + ppaf24->sample_count = ppaf24->write_block * PAF24_SAMPLES_PER_BLOCK + ppaf24->write_count ; - if (ppaf24->write_count == ppaf24->samplesperblock) + if (ppaf24->write_count == PAF24_SAMPLES_PER_BLOCK) { ppaf24->write_block ++ ; ppaf24->write_count = 0 ; } ; @@ -702,7 +687,7 @@ paf24_write (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, const int *ptr, int len) { int count, total = 0 ; while (total < len) - { count = (ppaf24->samplesperblock - ppaf24->write_count) * ppaf24->channels ; + { count = (PAF24_SAMPLES_PER_BLOCK - ppaf24->write_count) * ppaf24->channels ; if (count > len - total) count = len - total ; @@ -711,7 +696,7 @@ paf24_write (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, const int *ptr, int len) total += count ; ppaf24->write_count += count / ppaf24->channels ; - if (ppaf24->write_count >= ppaf24->samplesperblock) + if (ppaf24->write_count >= PAF24_SAMPLES_PER_BLOCK) paf24_write_block (psf, ppaf24) ; } ; @@ -720,7 +705,8 @@ paf24_write (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, const int *ptr, int len) static sf_count_t paf24_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ PAF24_PRIVATE *ppaf24 ; +{ BUF_UNION ubuf ; + PAF24_PRIVATE *ppaf24 ; int *iptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -729,8 +715,8 @@ paf24_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) return 0 ; ppaf24 = (PAF24_PRIVATE*) psf->codec_data ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -770,7 +756,8 @@ paf24_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t paf24_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ PAF24_PRIVATE *ppaf24 ; +{ BUF_UNION ubuf ; + PAF24_PRIVATE *ppaf24 ; int *iptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -782,8 +769,8 @@ paf24_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFFFFFF) : (1.0 / 0x100) ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -800,7 +787,8 @@ paf24_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t paf24_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ PAF24_PRIVATE *ppaf24 ; +{ BUF_UNION ubuf ; + PAF24_PRIVATE *ppaf24 ; int *iptr ; int k, bufferlen, writecount = 0, count ; sf_count_t total = 0 ; @@ -812,8 +800,8 @@ paf24_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFFFFFF) : (1.0 / 0x100) ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) diff --git a/lib-src/libsndfile/src/pcm.c b/lib-src/libsndfile/src/pcm.c index ec450bcd3..d10336a4b 100644 --- a/lib-src/libsndfile/src/pcm.c +++ b/lib-src/libsndfile/src/pcm.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -258,7 +258,7 @@ pcm_init (SF_PRIVATE *psf) break ; default : - psf_log_printf (psf, "pcm.c returning SFE_UNIMPLEMENTED\nbytewidth %s endian %d\n", psf->bytewidth, psf->endian) ; + psf_log_printf (psf, "pcm.c returning SFE_UNIMPLEMENTED\nbytewidth %d endian %d\n", psf->bytewidth, psf->endian) ; return SFE_UNIMPLEMENTED ; } ; @@ -282,14 +282,14 @@ pcm_init (SF_PRIVATE *psf) static inline void sc2s_array (signed char *src, int count, short *dest) { while (--count >= 0) - { dest [count] = src [count] << 8 ; + { dest [count] = ((uint16_t) src [count]) << 8 ; } ; } /* sc2s_array */ static inline void uc2s_array (unsigned char *src, int count, short *dest) { while (--count >= 0) - { dest [count] = (((short) src [count]) - 0x80) << 8 ; + { dest [count] = (((uint32_t) src [count]) - 0x80) << 8 ; } ; } /* uc2s_array */ @@ -300,7 +300,7 @@ let2s_array (tribyte *src, int count, short *dest) ucptr = ((unsigned char*) src) + 3 * count ; while (--count >= 0) { ucptr -= 3 ; - dest [count] = LET2H_SHORT_PTR (ucptr) ; + dest [count] = LET2H_16_PTR (ucptr) ; } ; } /* let2s_array */ @@ -311,8 +311,8 @@ bet2s_array (tribyte *src, int count, short *dest) ucptr = ((unsigned char*) src) + 3 * count ; while (--count >= 0) { ucptr -= 3 ; - dest [count] = BET2H_SHORT_PTR (ucptr) ; - } ; + dest [count] = BET2H_16_PTR (ucptr) ; + } ; } /* bet2s_array */ static inline void @@ -320,7 +320,7 @@ lei2s_array (int *src, int count, short *dest) { int value ; while (--count >= 0) - { value = LEI2H_INT (src [count]) ; + { value = LE2H_32 (src [count]) ; dest [count] = value >> 16 ; } ; } /* lei2s_array */ @@ -330,7 +330,7 @@ bei2s_array (int *src, int count, short *dest) { int value ; while (--count >= 0) - { value = BEI2H_INT (src [count]) ; + { value = BE2H_32 (src [count]) ; dest [count] = value >> 16 ; } ; } /* bei2s_array */ @@ -341,14 +341,14 @@ bei2s_array (int *src, int count, short *dest) static inline void sc2i_array (signed char *src, int count, int *dest) { while (--count >= 0) - { dest [count] = ((int) src [count]) << 24 ; + { dest [count] = arith_shift_left ((int) src [count], 24) ; } ; } /* sc2i_array */ static inline void uc2i_array (unsigned char *src, int count, int *dest) { while (--count >= 0) - { dest [count] = (((int) src [count]) - 128) << 24 ; + { dest [count] = arith_shift_left (((int) src [count]) - 128, 24) ; } ; } /* uc2i_array */ @@ -357,8 +357,8 @@ bes2i_array (short *src, int count, int *dest) { short value ; while (--count >= 0) - { value = BES2H_SHORT (src [count]) ; - dest [count] = value << 16 ; + { value = BE2H_16 (src [count]) ; + dest [count] = arith_shift_left (value, 16) ; } ; } /* bes2i_array */ @@ -367,8 +367,8 @@ les2i_array (short *src, int count, int *dest) { short value ; while (--count >= 0) - { value = LES2H_SHORT (src [count]) ; - dest [count] = value << 16 ; + { value = LE2H_16 (src [count]) ; + dest [count] = arith_shift_left (value, 16) ; } ; } /* les2i_array */ @@ -379,8 +379,8 @@ bet2i_array (tribyte *src, int count, int *dest) ucptr = ((unsigned char*) src) + 3 * count ; while (--count >= 0) { ucptr -= 3 ; - dest [count] = BET2H_INT_PTR (ucptr) ; - } ; + dest [count] = psf_get_be24 (ucptr, 0) ; + } ; } /* bet2i_array */ static inline void @@ -390,7 +390,7 @@ let2i_array (tribyte *src, int count, int *dest) ucptr = ((unsigned char*) src) + 3 * count ; while (--count >= 0) { ucptr -= 3 ; - dest [count] = LET2H_INT_PTR (ucptr) ; + dest [count] = psf_get_le24 (ucptr, 0) ; } ; } /* let2i_array */ @@ -415,7 +415,7 @@ les2f_array (short *src, int count, float *dest, float normfact) while (--count >= 0) { value = src [count] ; - value = LES2H_SHORT (value) ; + value = LE2H_16 (value) ; dest [count] = ((float) value) * normfact ; } ; } /* les2f_array */ @@ -426,7 +426,7 @@ bes2f_array (short *src, int count, float *dest, float normfact) while (--count >= 0) { value = src [count] ; - value = BES2H_SHORT (value) ; + value = BE2H_16 (value) ; dest [count] = ((float) value) * normfact ; } ; } /* bes2f_array */ @@ -439,7 +439,7 @@ let2f_array (tribyte *src, int count, float *dest, float normfact) ucptr = ((unsigned char*) src) + 3 * count ; while (--count >= 0) { ucptr -= 3 ; - value = LET2H_INT_PTR (ucptr) ; + value = psf_get_le24 (ucptr, 0) ; dest [count] = ((float) value) * normfact ; } ; } /* let2f_array */ @@ -452,9 +452,9 @@ bet2f_array (tribyte *src, int count, float *dest, float normfact) ucptr = ((unsigned char*) src) + 3 * count ; while (--count >= 0) { ucptr -= 3 ; - value = BET2H_INT_PTR (ucptr) ; + value = psf_get_be24 (ucptr, 0) ; dest [count] = ((float) value) * normfact ; - } ; + } ; } /* bet2f_array */ static inline void @@ -463,7 +463,7 @@ lei2f_array (int *src, int count, float *dest, float normfact) while (--count >= 0) { value = src [count] ; - value = LEI2H_INT (value) ; + value = LE2H_32 (value) ; dest [count] = ((float) value) * normfact ; } ; } /* lei2f_array */ @@ -474,7 +474,7 @@ bei2f_array (int *src, int count, float *dest, float normfact) while (--count >= 0) { value = src [count] ; - value = BEI2H_INT (value) ; + value = BE2H_32 (value) ; dest [count] = ((float) value) * normfact ; } ; } /* bei2f_array */ @@ -500,7 +500,7 @@ les2d_array (short *src, int count, double *dest, double normfact) while (--count >= 0) { value = src [count] ; - value = LES2H_SHORT (value) ; + value = LE2H_16 (value) ; dest [count] = ((double) value) * normfact ; } ; } /* les2d_array */ @@ -511,7 +511,7 @@ bes2d_array (short *src, int count, double *dest, double normfact) while (--count >= 0) { value = src [count] ; - value = BES2H_SHORT (value) ; + value = BE2H_16 (value) ; dest [count] = ((double) value) * normfact ; } ; } /* bes2d_array */ @@ -524,7 +524,7 @@ let2d_array (tribyte *src, int count, double *dest, double normfact) ucptr = ((unsigned char*) src) + 3 * count ; while (--count >= 0) { ucptr -= 3 ; - value = LET2H_INT_PTR (ucptr) ; + value = psf_get_le24 (ucptr, 0) ; dest [count] = ((double) value) * normfact ; } ; } /* let2d_array */ @@ -537,7 +537,7 @@ bet2d_array (tribyte *src, int count, double *dest, double normfact) ucptr = ((unsigned char*) src) + 3 * count ; while (--count >= 0) { ucptr -= 3 ; - value = (ucptr [0] << 24) | (ucptr [1] << 16) | (ucptr [2] << 8) ; + value = psf_get_be24 (ucptr, 0) ; dest [count] = ((double) value) * normfact ; } ; } /* bet2d_array */ @@ -548,7 +548,7 @@ lei2d_array (int *src, int count, double *dest, double normfact) while (--count >= 0) { value = src [count] ; - value = LEI2H_INT (value) ; + value = LE2H_32 (value) ; dest [count] = ((double) value) * normfact ; } ; } /* lei2d_array */ @@ -559,7 +559,7 @@ bei2d_array (int *src, int count, double *dest, double normfact) while (--count >= 0) { value = src [count] ; - value = BEI2H_INT (value) ; + value = BE2H_32 (value) ; dest [count] = ((double) value) * normfact ; } ; } /* bei2d_array */ @@ -707,16 +707,17 @@ i2bet_array (const int *src, tribyte *dest, int count) static sf_count_t pcm_read_sc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.scbuf) ; + bufferlen = ARRAY_LEN (ubuf.scbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; - sc2s_array (psf->u.scbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; + sc2s_array (ubuf.scbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -728,16 +729,17 @@ pcm_read_sc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t pcm_read_uc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ; - uc2s_array (psf->u.ucbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ; + uc2s_array (ubuf.ucbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -771,16 +773,17 @@ pcm_read_les2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t pcm_read_bet2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; - bet2s_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + bet2s_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -792,16 +795,17 @@ pcm_read_bet2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t pcm_read_let2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; - let2s_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + let2s_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -813,16 +817,17 @@ pcm_read_let2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t pcm_read_bei2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ; - bei2s_array (psf->u.ibuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ; + bei2s_array (ubuf.ibuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -834,16 +839,17 @@ pcm_read_bei2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t pcm_read_lei2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ; - lei2s_array (psf->u.ibuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ; + lei2s_array (ubuf.ibuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -858,16 +864,17 @@ pcm_read_lei2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t pcm_read_sc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.scbuf) ; + bufferlen = ARRAY_LEN (ubuf.scbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; - sc2i_array (psf->u.scbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; + sc2i_array (ubuf.scbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -879,16 +886,17 @@ pcm_read_sc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t pcm_read_uc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ; - uc2i_array (psf->u.ucbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ; + uc2i_array (ubuf.ucbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -900,16 +908,17 @@ pcm_read_uc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t pcm_read_bes2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - bes2i_array (psf->u.sbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + bes2i_array (ubuf.sbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -921,16 +930,17 @@ pcm_read_bes2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t pcm_read_les2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - les2i_array (psf->u.sbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + les2i_array (ubuf.sbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -942,16 +952,17 @@ pcm_read_les2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t pcm_read_bet2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; - bet2i_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + bet2i_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -963,16 +974,17 @@ pcm_read_bet2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t pcm_read_let2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; - let2i_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + let2i_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1009,19 +1021,20 @@ pcm_read_lei2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t pcm_read_sc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.scbuf) ; + bufferlen = ARRAY_LEN (ubuf.scbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; - sc2f_array (psf->u.scbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; + sc2f_array (ubuf.scbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1033,19 +1046,20 @@ pcm_read_sc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t pcm_read_uc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ; - uc2f_array (psf->u.ucbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ; + uc2f_array (ubuf.ucbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1057,19 +1071,20 @@ pcm_read_uc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t pcm_read_bes2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - bes2f_array (psf->u.sbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + bes2f_array (ubuf.sbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1081,19 +1096,20 @@ pcm_read_bes2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t pcm_read_les2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - les2f_array (psf->u.sbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + les2f_array (ubuf.sbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1105,20 +1121,21 @@ pcm_read_les2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t pcm_read_bet2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; /* Special normfactor because tribyte value is read into an int. */ normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 / 256.0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; - bet2f_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + bet2f_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1130,20 +1147,21 @@ pcm_read_bet2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t pcm_read_let2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; /* Special normfactor because tribyte value is read into an int. */ normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 / 256.0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; - let2f_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + let2f_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1155,19 +1173,20 @@ pcm_read_let2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t pcm_read_bei2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ; - bei2f_array (psf->u.ibuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ; + bei2f_array (ubuf.ibuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1179,19 +1198,20 @@ pcm_read_bei2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t pcm_read_lei2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ; - lei2f_array (psf->u.ibuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ; + lei2f_array (ubuf.ibuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1206,19 +1226,20 @@ pcm_read_lei2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t pcm_read_sc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.scbuf) ; + bufferlen = ARRAY_LEN (ubuf.scbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; - sc2d_array (psf->u.scbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; + sc2d_array (ubuf.scbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1230,19 +1251,20 @@ pcm_read_sc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t pcm_read_uc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ; - uc2d_array (psf->u.ucbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ; + uc2d_array (ubuf.ucbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1254,19 +1276,20 @@ pcm_read_uc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t pcm_read_bes2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - bes2d_array (psf->u.sbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + bes2d_array (ubuf.sbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1278,19 +1301,20 @@ pcm_read_bes2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t pcm_read_les2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - les2d_array (psf->u.sbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + les2d_array (ubuf.sbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1302,19 +1326,20 @@ pcm_read_les2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t pcm_read_bet2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 / 256.0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; - bet2d_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + bet2d_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1326,20 +1351,21 @@ pcm_read_bet2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t pcm_read_let2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; /* Special normfactor because tribyte value is read into an int. */ normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 / 256.0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; - let2d_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + let2d_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1351,19 +1377,20 @@ pcm_read_let2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t pcm_read_bei2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ; - bei2d_array (psf->u.ibuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ; + bei2d_array (ubuf.ibuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1375,19 +1402,20 @@ pcm_read_bei2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t pcm_read_lei2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ; - lei2d_array (psf->u.ibuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ; + lei2d_array (ubuf.ibuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -1404,16 +1432,17 @@ pcm_read_lei2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t pcm_write_s2sc (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.scbuf) ; + bufferlen = ARRAY_LEN (ubuf.scbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2sc_array (ptr + total, psf->u.scbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; + s2sc_array (ptr + total, ubuf.scbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1425,16 +1454,17 @@ pcm_write_s2sc (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t pcm_write_s2uc (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2uc_array (ptr + total, psf->u.ucbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ; + s2uc_array (ptr + total, ubuf.ucbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1446,20 +1476,21 @@ pcm_write_s2uc (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t pcm_write_s2bes (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; if (CPU_IS_BIG_ENDIAN) return psf_fwrite (ptr, sizeof (short), len, psf) ; else - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - endswap_short_copy (psf->u.sbuf, ptr + total, bufferlen) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + endswap_short_copy (ubuf.sbuf, ptr + total, bufferlen) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1471,19 +1502,20 @@ pcm_write_s2bes (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t pcm_write_s2les (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; if (CPU_IS_LITTLE_ENDIAN) return psf_fwrite (ptr, sizeof (short), len, psf) ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - endswap_short_copy (psf->u.sbuf, ptr + total, bufferlen) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + endswap_short_copy (ubuf.sbuf, ptr + total, bufferlen) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1495,16 +1527,17 @@ pcm_write_s2les (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t pcm_write_s2bet (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2bet_array (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen) ; - writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + s2bet_array (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen) ; + writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1516,16 +1549,17 @@ pcm_write_s2bet (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t pcm_write_s2let (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2let_array (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen) ; - writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + s2let_array (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen) ; + writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1537,16 +1571,17 @@ pcm_write_s2let (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t pcm_write_s2bei (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2bei_array (ptr + total, psf->u.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ; + s2bei_array (ptr + total, ubuf.ibuf, bufferlen) ; + writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1558,16 +1593,17 @@ pcm_write_s2bei (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t pcm_write_s2lei (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2lei_array (ptr + total, psf->u.ibuf, bufferlen) ; - writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ; + s2lei_array (ptr + total, ubuf.ibuf, bufferlen) ; + writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1582,16 +1618,17 @@ pcm_write_s2lei (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t pcm_write_i2sc (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.scbuf) ; + bufferlen = ARRAY_LEN (ubuf.scbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2sc_array (ptr + total, psf->u.scbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; + i2sc_array (ptr + total, ubuf.scbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1603,16 +1640,17 @@ pcm_write_i2sc (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t pcm_write_i2uc (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2uc_array (ptr + total, psf->u.ucbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.ucbuf, sizeof (signed char), bufferlen, psf) ; + i2uc_array (ptr + total, ubuf.ucbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.ucbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1624,16 +1662,17 @@ pcm_write_i2uc (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t pcm_write_i2bes (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2bes_array (ptr + total, psf->u.sbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + i2bes_array (ptr + total, ubuf.sbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1645,16 +1684,17 @@ pcm_write_i2bes (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t pcm_write_i2les (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2les_array (ptr + total, psf->u.sbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + i2les_array (ptr + total, ubuf.sbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1666,16 +1706,17 @@ pcm_write_i2les (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t pcm_write_i2bet (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2bet_array (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen) ; - writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + i2bet_array (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen) ; + writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1687,16 +1728,17 @@ pcm_write_i2bet (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t pcm_write_i2let (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2let_array (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen) ; - writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + i2let_array (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen) ; + writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1708,19 +1750,20 @@ pcm_write_i2let (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t pcm_write_i2bei (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; if (CPU_IS_BIG_ENDIAN) return psf_fwrite (ptr, sizeof (int), len, psf) ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - endswap_int_copy (psf->u.ibuf, ptr + total, bufferlen) ; - writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ; + endswap_int_copy (ubuf.ibuf, ptr + total, bufferlen) ; + writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1732,19 +1775,20 @@ pcm_write_i2bei (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t pcm_write_i2lei (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; if (CPU_IS_LITTLE_ENDIAN) return psf_fwrite (ptr, sizeof (int), len, psf) ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - endswap_int_copy (psf->u.ibuf, ptr + total, bufferlen) ; - writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ; + endswap_int_copy (ubuf.ibuf, ptr + total, bufferlen) ; + writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1793,18 +1837,19 @@ f2sc_clip_array (const float *src, signed char *dest, int count, int normalize) static sf_count_t pcm_write_f2sc (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ void (*convert) (const float *, signed char *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, signed char *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? f2sc_clip_array : f2sc_array ; - bufferlen = ARRAY_LEN (psf->u.scbuf) ; + bufferlen = ARRAY_LEN (ubuf.scbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.scbuf, bufferlen, psf->norm_float) ; - writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; + convert (ptr + total, ubuf.scbuf, bufferlen, psf->norm_float) ; + writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1851,18 +1896,19 @@ f2uc_clip_array (const float *src, unsigned char *dest, int count, int normalize static sf_count_t pcm_write_f2uc (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ void (*convert) (const float *, unsigned char *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, unsigned char *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? f2uc_clip_array : f2uc_array ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.ucbuf, bufferlen, psf->norm_float) ; - writecount = psf_fwrite (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ; + convert (ptr + total, ubuf.ucbuf, bufferlen, psf->norm_float) ; + writecount = psf_fwrite (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1923,18 +1969,19 @@ f2bes_clip_array (const float *src, short *dest, int count, int normalize) static sf_count_t pcm_write_f2bes (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ void (*convert) (const float *, short *t, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, short *t, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? f2bes_clip_array : f2bes_array ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.sbuf, bufferlen, psf->norm_float) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + convert (ptr + total, ubuf.sbuf, bufferlen, psf->norm_float) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1995,18 +2042,19 @@ f2les_clip_array (const float *src, short *dest, int count, int normalize) static sf_count_t pcm_write_f2les (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ void (*convert) (const float *, short *t, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, short *t, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? f2les_clip_array : f2les_array ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.sbuf, bufferlen, psf->norm_float) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + convert (ptr + total, ubuf.sbuf, bufferlen, psf->norm_float) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2071,18 +2119,19 @@ f2let_clip_array (const float *src, tribyte *dest, int count, int normalize) static sf_count_t pcm_write_f2let (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ void (*convert) (const float *, tribyte *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, tribyte *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? f2let_clip_array : f2let_array ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen, psf->norm_float) ; - writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + convert (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen, psf->norm_float) ; + writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2147,18 +2196,19 @@ f2bet_clip_array (const float *src, tribyte *dest, int count, int normalize) static sf_count_t pcm_write_f2bet (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ void (*convert) (const float *, tribyte *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, tribyte *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? f2bet_clip_array : f2bet_array ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen, psf->norm_float) ; - writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + convert (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen, psf->norm_float) ; + writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2226,18 +2276,19 @@ f2bei_clip_array (const float *src, int *dest, int count, int normalize) static sf_count_t pcm_write_f2bei (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ void (*convert) (const float *, int *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, int *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? f2bei_clip_array : f2bei_array ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.ibuf, bufferlen, psf->norm_float) ; - writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ; + convert (ptr + total, ubuf.ibuf, bufferlen, psf->norm_float) ; + writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2306,18 +2357,19 @@ f2lei_clip_array (const float *src, int *dest, int count, int normalize) static sf_count_t pcm_write_f2lei (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ void (*convert) (const float *, int *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const float *, int *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? f2lei_clip_array : f2lei_array ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.ibuf, bufferlen, psf->norm_float) ; - writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ; + convert (ptr + total, ubuf.ibuf, bufferlen, psf->norm_float) ; + writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2364,18 +2416,19 @@ d2sc_clip_array (const double *src, signed char *dest, int count, int normalize) static sf_count_t pcm_write_d2sc (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ void (*convert) (const double *, signed char *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, signed char *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? d2sc_clip_array : d2sc_array ; - bufferlen = ARRAY_LEN (psf->u.scbuf) ; + bufferlen = ARRAY_LEN (ubuf.scbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.scbuf, bufferlen, psf->norm_double) ; - writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; + convert (ptr + total, ubuf.scbuf, bufferlen, psf->norm_double) ; + writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2422,18 +2475,19 @@ d2uc_clip_array (const double *src, unsigned char *dest, int count, int normaliz static sf_count_t pcm_write_d2uc (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ void (*convert) (const double *, unsigned char *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, unsigned char *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? d2uc_clip_array : d2uc_array ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.ucbuf, bufferlen, psf->norm_double) ; - writecount = psf_fwrite (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ; + convert (ptr + total, ubuf.ucbuf, bufferlen, psf->norm_double) ; + writecount = psf_fwrite (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2494,18 +2548,19 @@ d2bes_clip_array (const double *src, short *dest, int count, int normalize) static sf_count_t pcm_write_d2bes (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ void (*convert) (const double *, short *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, short *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? d2bes_clip_array : d2bes_array ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.sbuf, bufferlen, psf->norm_double) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + convert (ptr + total, ubuf.sbuf, bufferlen, psf->norm_double) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2566,18 +2621,19 @@ d2les_clip_array (const double *src, short *dest, int count, int normalize) static sf_count_t pcm_write_d2les (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ void (*convert) (const double *, short *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, short *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? d2les_clip_array : d2les_array ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.sbuf, bufferlen, psf->norm_double) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + convert (ptr + total, ubuf.sbuf, bufferlen, psf->norm_double) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2642,18 +2698,19 @@ d2let_clip_array (const double *src, tribyte *dest, int count, int normalize) static sf_count_t pcm_write_d2let (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ void (*convert) (const double *, tribyte *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, tribyte *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? d2let_clip_array : d2let_array ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen, psf->norm_double) ; - writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + convert (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen, psf->norm_double) ; + writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2718,18 +2775,19 @@ d2bet_clip_array (const double *src, tribyte *dest, int count, int normalize) static sf_count_t pcm_write_d2bet (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ void (*convert) (const double *, tribyte *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, tribyte *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? d2bet_clip_array : d2bet_array ; - bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ; + bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen, psf->norm_double) ; - writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; + convert (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen, psf->norm_double) ; + writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2798,18 +2856,19 @@ d2bei_clip_array (const double *src, int *dest, int count, int normalize) static sf_count_t pcm_write_d2bei (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ void (*convert) (const double *, int *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, int *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? d2bei_clip_array : d2bei_array ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.ibuf, bufferlen, psf->norm_double) ; - writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ; + convert (ptr + total, ubuf.ibuf, bufferlen, psf->norm_double) ; + writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -2878,18 +2937,19 @@ d2lei_clip_array (const double *src, int *dest, int count, int normalize) static sf_count_t pcm_write_d2lei (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ void (*convert) (const double *, int *, int, int) ; +{ BUF_UNION ubuf ; + void (*convert) (const double *, int *, int, int) ; int bufferlen, writecount ; sf_count_t total = 0 ; convert = (psf->add_clipping) ? d2lei_clip_array : d2lei_array ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - convert (ptr + total, psf->u.ibuf, bufferlen, psf->norm_double) ; - writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ; + convert (ptr + total, ubuf.ibuf, bufferlen, psf->norm_double) ; + writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; diff --git a/lib-src/libsndfile/src/pvf.c b/lib-src/libsndfile/src/pvf.c index 4ea24b6b6..714f5b380 100644 --- a/lib-src/libsndfile/src/pvf.c +++ b/lib-src/libsndfile/src/pvf.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -106,24 +106,24 @@ pvf_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) current = psf_ftell (psf) ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; if (psf->is_pipe == SF_FALSE) psf_fseek (psf, 0, SEEK_SET) ; - snprintf ((char*) psf->header, sizeof (psf->header), "PVF1\n%d %d %d\n", + snprintf ((char*) psf->header.ptr, psf->header.len, "PVF1\n%d %d %d\n", psf->sf.channels, psf->sf.samplerate, psf->bytewidth * 8) ; - psf->headindex = strlen ((char*) psf->header) ; + psf->header.indx = strlen ((char*) psf->header.ptr) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; diff --git a/lib-src/libsndfile/src/raw.c b/lib-src/libsndfile/src/raw.c index e5dc49e2f..c8fcbfde2 100644 --- a/lib-src/libsndfile/src/raw.c +++ b/lib-src/libsndfile/src/raw.c @@ -72,6 +72,13 @@ raw_open (SF_PRIVATE *psf) break ; /* Lite remove start */ + + case SF_FORMAT_NMS_ADPCM_16 : + case SF_FORMAT_NMS_ADPCM_24 : + case SF_FORMAT_NMS_ADPCM_32 : + error = nms_adpcm_init (psf) ; + break ; + case SF_FORMAT_FLOAT : error = float32_init (psf) ; break ; diff --git a/lib-src/libsndfile/src/rf64.c b/lib-src/libsndfile/src/rf64.c index d40bfab84..876cd4512 100644 --- a/lib-src/libsndfile/src/rf64.c +++ b/lib-src/libsndfile/src/rf64.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2018 Erik de Castro Lopo ** Copyright (C) 2009 Uli Franke ** ** This program is free software; you can redistribute it and/or modify @@ -35,12 +35,14 @@ #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "wav_w64.h" +#include "wavlike.h" /*------------------------------------------------------------------------------ ** Macros to handle big/little endian issues. */ #define RF64_MARKER MAKE_MARKER ('R', 'F', '6', '4') +#define RIFF_MARKER MAKE_MARKER ('R', 'I', 'F', 'F') +#define JUNK_MARKER MAKE_MARKER ('J', 'U', 'N', 'K') #define FFFF_MARKER MAKE_MARKER (0xff, 0xff, 0xff, 0xff) #define WAVE_MARKER MAKE_MARKER ('W', 'A', 'V', 'E') #define ds64_MARKER MAKE_MARKER ('d', 's', '6', '4') @@ -49,33 +51,44 @@ #define data_MARKER MAKE_MARKER ('d', 'a', 't', 'a') #define bext_MARKER MAKE_MARKER ('b', 'e', 'x', 't') +#define cart_MARKER MAKE_MARKER ('c', 'a', 'r', 't') #define OggS_MARKER MAKE_MARKER ('O', 'g', 'g', 'S') -#define wvpk_MARKER MAKE_MARKER ('w', 'v', 'p', 'k') +#define wvpk_MARKER MAKE_MARKER ('w', 'v', 'p', 'k') +#define LIST_MARKER MAKE_MARKER ('L', 'I', 'S', 'T') -/*------------------------------------------------------------------------------ -** Typedefs. +/* +** The file size limit in bytes below which we can, if requested, write this +** file as a RIFF/WAVE file. */ +#define RIFF_DOWNGRADE_BYTES ((sf_count_t) 0xffffffff) + /*------------------------------------------------------------------------------ ** Private static functions. */ static int rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) ; static int rf64_write_header (SF_PRIVATE *psf, int calc_length) ; +static int rf64_write_tailer (SF_PRIVATE *psf) ; static int rf64_close (SF_PRIVATE *psf) ; static int rf64_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize) ; +static int rf64_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) ; +static SF_CHUNK_ITERATOR * rf64_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) ; +static int rf64_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; +static int rf64_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; + /*------------------------------------------------------------------------------ ** Public function. */ int rf64_open (SF_PRIVATE *psf) -{ WAV_PRIVATE *wpriv ; +{ WAVLIKE_PRIVATE *wpriv ; int subformat, error = 0 ; int blockalign, framesperblock ; - if ((wpriv = calloc (1, sizeof (WAV_PRIVATE))) == NULL) + if ((wpriv = calloc (1, sizeof (WAVLIKE_PRIVATE))) == NULL) return SFE_MALLOC_FAILED ; psf->container_data = wpriv ; wpriv->wavex_ambisonic = SF_AMBISONIC_NONE ; @@ -83,10 +96,15 @@ rf64_open (SF_PRIVATE *psf) /* All RF64 files are little endian. */ psf->endian = SF_ENDIAN_LITTLE ; + psf->strings.flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ; if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0)) { if ((error = rf64_read_header (psf, &blockalign, &framesperblock)) != 0) return error ; + + psf->next_chunk_iterator = rf64_next_chunk_iterator ; + psf->get_chunk_size = rf64_get_chunk_size ; + psf->get_chunk_data = rf64_get_chunk_data ; } ; if ((psf->sf.format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RF64) @@ -104,6 +122,7 @@ rf64_open (SF_PRIVATE *psf) return error ; psf->write_header = rf64_write_header ; + psf->set_chunk = rf64_set_chunk ; } ; psf->container_close = rf64_close ; @@ -148,18 +167,21 @@ enum { HAVE_ds64 = 0x01, HAVE_fmt = 0x02, HAVE_bext = 0x04, - HAVE_data = 0x08 + HAVE_data = 0x08, + HAVE_cart = 0x10, + HAVE_PEAK = 0x20, + HAVE_other = 0x40 } ; #define HAVE_CHUNK(CHUNK) ((parsestage & CHUNK) != 0) static int rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) -{ WAV_PRIVATE *wpriv ; +{ WAVLIKE_PRIVATE *wpriv ; WAV_FMT *wav_fmt ; sf_count_t riff_size = 0, frame_count = 0, ds64_datalength = 0 ; - unsigned int size32, parsestage = 0 ; - int marker, marks [2], error, done = 0, format = 0 ; + uint32_t marks [2], marker, chunk_size, parsestage = 0 ; + int error, done = 0, format = 0 ; if ((wpriv = psf->container_data) == NULL) return SFE_INTERNAL ; @@ -176,10 +198,25 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) psf_log_printf (psf, "%M : 0x%x (should be 0xFFFFFFFF)\n %M\n", RF64_MARKER, WAVE_MARKER) ; while (NOT (done)) - { psf_binheader_readf (psf, "em4", &marker, &size32) ; + { + marker = chunk_size = 0 ; + psf_binheader_readf (psf, "em4", &marker, &chunk_size) ; + + if (marker == 0) + { sf_count_t pos = psf_ftell (psf) ; + psf_log_printf (psf, "Have 0 marker at position %D (0x%x).\n", pos, pos) ; + break ; + } ; + + psf_store_read_chunk_u32 (&psf->rchunks, marker, psf_ftell (psf), chunk_size) ; switch (marker) { case ds64_MARKER : + if (parsestage & HAVE_ds64) + { psf_log_printf (psf, "*** Second 'ds64' chunk?\n") ; + break ; + } ; + { unsigned int table_len, bytesread ; /* Read ds64 sizes (3 8-byte words). */ @@ -190,18 +227,18 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) /* Skip table for now. (this was "table_len + 4", why?) */ bytesread += psf_binheader_readf (psf, "j", table_len) ; - if (size32 == bytesread) - psf_log_printf (psf, "%M : %u\n", marker, size32) ; - else if (size32 >= bytesread + 4) + if (chunk_size == bytesread) + psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; + else if (chunk_size >= bytesread + 4) { unsigned int next ; psf_binheader_readf (psf, "m", &next) ; if (next == fmt_MARKER) - { psf_log_printf (psf, "%M : %u (should be %u)\n", marker, size32, bytesread) ; + { psf_log_printf (psf, "%M : %u (should be %u)\n", marker, chunk_size, bytesread) ; psf_binheader_readf (psf, "j", -4) ; } else - { psf_log_printf (psf, "%M : %u\n", marker, size32) ; - psf_binheader_readf (psf, "j", size32 - bytesread - 4) ; + { psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size - bytesread - 4) ; } ; } ; @@ -220,44 +257,69 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) break ; case fmt_MARKER: - psf_log_printf (psf, "%M : %u\n", marker, size32) ; - if ((error = wav_w64_read_fmt_chunk (psf, size32)) != 0) + psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; + if ((error = wavlike_read_fmt_chunk (psf, chunk_size)) != 0) return error ; format = wav_fmt->format ; parsestage |= HAVE_fmt ; break ; case bext_MARKER : - if ((error = wav_read_bext_chunk (psf, size32)) != 0) + if ((error = wavlike_read_bext_chunk (psf, chunk_size)) != 0) return error ; parsestage |= HAVE_bext ; break ; + case cart_MARKER : + if ((error = wavlike_read_cart_chunk (psf, chunk_size)) != 0) + return error ; + parsestage |= HAVE_cart ; + break ; + + case INFO_MARKER : + case LIST_MARKER : + if ((error = wavlike_subchunk_parse (psf, marker, chunk_size)) != 0) + return error ; + parsestage |= HAVE_other ; + break ; + + case PEAK_MARKER : + if ((parsestage & (HAVE_ds64 | HAVE_fmt)) != (HAVE_ds64 | HAVE_fmt)) + return SFE_RF64_PEAK_B4_FMT ; + + parsestage |= HAVE_PEAK ; + + psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; + if ((error = wavlike_read_peak_chunk (psf, chunk_size)) != 0) + return error ; + psf->peak_info->peak_loc = ((parsestage & HAVE_data) == 0) ? SF_PEAK_START : SF_PEAK_END ; + break ; + case data_MARKER : /* see wav for more sophisticated parsing -> implement state machine with parsestage */ if (HAVE_CHUNK (HAVE_ds64)) - { if (size32 == 0xffffffff) - psf_log_printf (psf, "%M : 0x%x\n", marker, size32) ; + { if (chunk_size == 0xffffffff) + psf_log_printf (psf, "%M : 0x%x\n", marker, chunk_size) ; else - psf_log_printf (psf, "%M : 0x%x (should be 0xffffffff\n", marker, size32) ; + psf_log_printf (psf, "%M : 0x%x (should be 0xffffffff\n", marker, chunk_size) ; psf->datalength = ds64_datalength ; } else - { if (size32 == 0xffffffff) - { psf_log_printf (psf, "%M : 0x%x\n", marker, size32) ; + { if (chunk_size == 0xffffffff) + { psf_log_printf (psf, "%M : 0x%x\n", marker, chunk_size) ; psf_log_printf (psf, " *** Data length not specified no 'ds64' chunk.\n") ; } else - { psf_log_printf (psf, "%M : 0x%x\n**** Weird, RF64 file without a 'ds64' chunk and no valid 'data' size.\n", marker, size32) ; - psf->datalength = size32 ; + { psf_log_printf (psf, "%M : 0x%x\n**** Weird, RF64 file without a 'ds64' chunk and no valid 'data' size.\n", marker, chunk_size) ; + psf->datalength = chunk_size ; } ; } ; psf->dataoffset = psf_ftell (psf) ; if (psf->dataoffset > 0) - { if (size32 == 0 && riff_size == 8 && psf->filelength > 44) + { if (chunk_size == 0 && riff_size == 8 && psf->filelength > 44) { psf_log_printf (psf, " *** Looks like a WAV file which wasn't closed properly. Fixing it.\n") ; psf->datalength = psf->filelength - psf->dataoffset ; } ; @@ -274,29 +336,46 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) if (psf_ftell (psf) != psf->datalength + psf->dataoffset) psf_log_printf (psf, " *** psf_fseek past end error ***\n") ; - break ; } ; break ; + case JUNK_MARKER : + case PAD_MARKER : + psf_log_printf (psf, "%M : %d\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size) ; + break ; + default : + if (chunk_size >= 0xffff0000) + { psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D with length %u. Exiting parser.\n", marker, psf_ftell (psf) - 8, chunk_size) ; + done = SF_TRUE ; + break ; + } ; + if (isprint ((marker >> 24) & 0xFF) && isprint ((marker >> 16) & 0xFF) && isprint ((marker >> 8) & 0xFF) && isprint (marker & 0xFF)) - { psf_log_printf (psf, "*** %M : %d (unknown marker)\n", marker, size32) ; - if (size32 < 8) - done = SF_TRUE ; - psf_binheader_readf (psf, "j", size32) ; + { psf_log_printf (psf, "*** %M : %d (unknown marker)\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; } ; if (psf_ftell (psf) & 0x03) - { psf_log_printf (psf, " Unknown chunk marker at position 0x%x. Resynching.\n", size32 - 4) ; + { psf_log_printf (psf, " Unknown chunk marker at position 0x%x. Resynching.\n", chunk_size - 4) ; psf_binheader_readf (psf, "j", -3) ; break ; } ; psf_log_printf (psf, "*** Unknown chunk marker (0x%X) at position 0x%X. Exiting parser.\n", marker, psf_ftell (psf) - 4) ; done = SF_TRUE ; - break ; + break ; } ; /* switch (marker) */ + /* The 'data' chunk, a chunk size of 0xffffffff means that the 'data' chunk size + ** is actually given by the ds64_datalength field. + */ + if (marker != data_MARKER && chunk_size >= psf->filelength) + { psf_log_printf (psf, "*** Chunk size %u > file length %D. Exiting parser.\n", chunk_size, psf->filelength) ; + break ; + } ; + if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (marker)) { psf_log_printf (psf, "End\n") ; break ; @@ -304,7 +383,13 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) } ; if (psf->dataoffset <= 0) - return SFE_WAV_NO_DATA ; + return SFE_RF64_NO_DATA ; + + if (psf->sf.channels < 1) + return SFE_CHANNEL_COUNT_ZERO ; + + if (psf->sf.channels > SF_MAX_CHANNELS) + return SFE_CHANNEL_COUNT ; /* WAVs can be little or big endian */ psf->endian = psf->rwf_endian ; @@ -339,7 +424,7 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) case WAVE_FORMAT_EXTENSIBLE : /* with WAVE_FORMAT_EXTENSIBLE the psf->sf.format field is already set. We just have to set the major to rf64 */ - psf->sf.format = (psf->sf.format & ~SF_FORMAT_TYPEMASK ) | SF_FORMAT_RF64 ; + psf->sf.format = (psf->sf.format & ~SF_FORMAT_TYPEMASK) | SF_FORMAT_RF64 ; if (psf->sf.format == (SF_FORMAT_WAVEX | SF_FORMAT_MS_ADPCM)) { *blockalign = wav_fmt->msadpcm.blockalign ; @@ -390,7 +475,7 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) } ; if (wpriv->fmt_is_broken) - wav_w64_analyze (psf) ; + wavlike_analyze (psf) ; /* Only set the format endian-ness if its non-standard big-endian. */ if (psf->endian == SF_ENDIAN_BIG) @@ -404,9 +489,11 @@ static const EXT_SUBFORMAT MSGUID_SUBTYPE_PCM = { 0x00000001, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } } ; +#if 0 static const EXT_SUBFORMAT MSGUID_SUBTYPE_MS_ADPCM = { 0x00000002, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } } ; +#endif static const EXT_SUBFORMAT MSGUID_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } @@ -435,7 +522,7 @@ static const EXT_SUBFORMAT MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_IEEE_FLOAT = static int rf64_write_fmt_chunk (SF_PRIVATE *psf) -{ WAV_PRIVATE *wpriv ; +{ WAVLIKE_PRIVATE *wpriv ; int subformat, fmt_size ; if ((wpriv = psf->container_data) == NULL) @@ -456,25 +543,25 @@ rf64_write_fmt_chunk (SF_PRIVATE *psf) fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 + 4 + 4 + 2 + 2 + 8 ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "4224", fmt_size, WAVE_FORMAT_EXTENSIBLE, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "4224", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_EXTENSIBLE), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth */ - psf_binheader_writef (psf, "22", psf->bytewidth * psf->sf.channels, psf->bytewidth * 8) ; + psf_binheader_writef (psf, "22", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (psf->bytewidth * 8)) ; /* cbSize 22 is sizeof (WAVEFORMATEXTENSIBLE) - sizeof (WAVEFORMATEX) */ - psf_binheader_writef (psf, "2", 22) ; + psf_binheader_writef (psf, "2", BHW2 (22)) ; /* wValidBitsPerSample, for our use same as bitwidth as we use it fully */ - psf_binheader_writef (psf, "2", psf->bytewidth * 8) ; + psf_binheader_writef (psf, "2", BHW2 (psf->bytewidth * 8)) ; /* For an Ambisonic file set the channel mask to zero. ** Otherwise use a default based on the channel count. */ if (wpriv->wavex_ambisonic != SF_AMBISONIC_NONE) - psf_binheader_writef (psf, "4", 0) ; + psf_binheader_writef (psf, "4", BHW4 (0)) ; else if (wpriv->wavex_channelmask != 0) - psf_binheader_writef (psf, "4", wpriv->wavex_channelmask) ; + psf_binheader_writef (psf, "4", BHW4 (wpriv->wavex_channelmask)) ; else { /* ** Ok some liberty is taken here to use the most commonly used channel masks @@ -483,27 +570,27 @@ rf64_write_fmt_chunk (SF_PRIVATE *psf) */ switch (psf->sf.channels) { case 1 : /* center channel mono */ - psf_binheader_writef (psf, "4", 0x4) ; + psf_binheader_writef (psf, "4", BHW4 (0x4)) ; break ; case 2 : /* front left and right */ - psf_binheader_writef (psf, "4", 0x1 | 0x2) ; + psf_binheader_writef (psf, "4", BHW4 (0x1 | 0x2)) ; break ; case 4 : /* Quad */ - psf_binheader_writef (psf, "4", 0x1 | 0x2 | 0x10 | 0x20) ; + psf_binheader_writef (psf, "4", BHW4 (0x1 | 0x2 | 0x10 | 0x20)) ; break ; case 6 : /* 5.1 */ - psf_binheader_writef (psf, "4", 0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20) ; + psf_binheader_writef (psf, "4", BHW4 (0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20)) ; break ; case 8 : /* 7.1 */ - psf_binheader_writef (psf, "4", 0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20 | 0x40 | 0x80) ; + psf_binheader_writef (psf, "4", BHW4 (0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20 | 0x40 | 0x80)) ; break ; default : /* 0 when in doubt , use direct out, ie NO mapping*/ - psf_binheader_writef (psf, "4", 0x0) ; + psf_binheader_writef (psf, "4", BHW4 (0x0)) ; break ; } ; } ; @@ -521,22 +608,22 @@ rf64_write_fmt_chunk (SF_PRIVATE *psf) case SF_FORMAT_PCM_16 : case SF_FORMAT_PCM_24 : case SF_FORMAT_PCM_32 : - wavex_write_guid (psf, wpriv->wavex_ambisonic == SF_AMBISONIC_NONE ? + wavlike_write_guid (psf, wpriv->wavex_ambisonic == SF_AMBISONIC_NONE ? &MSGUID_SUBTYPE_PCM : &MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_PCM) ; break ; case SF_FORMAT_FLOAT : case SF_FORMAT_DOUBLE : - wavex_write_guid (psf, wpriv->wavex_ambisonic == SF_AMBISONIC_NONE ? + wavlike_write_guid (psf, wpriv->wavex_ambisonic == SF_AMBISONIC_NONE ? &MSGUID_SUBTYPE_IEEE_FLOAT : &MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_IEEE_FLOAT) ; break ; case SF_FORMAT_ULAW : - wavex_write_guid (psf, &MSGUID_SUBTYPE_MULAW) ; + wavlike_write_guid (psf, &MSGUID_SUBTYPE_MULAW) ; break ; case SF_FORMAT_ALAW : - wavex_write_guid (psf, &MSGUID_SUBTYPE_ALAW) ; + wavlike_write_guid (psf, &MSGUID_SUBTYPE_ALAW) ; break ; default : return SFE_UNIMPLEMENTED ; @@ -548,8 +635,12 @@ rf64_write_fmt_chunk (SF_PRIVATE *psf) static int rf64_write_header (SF_PRIVATE *psf, int calc_length) -{ sf_count_t current ; - int error = 0, has_data = SF_FALSE ; +{ sf_count_t current, pad_size ; + int error = 0, has_data = SF_FALSE, add_fact_chunk = 0 ; + WAVLIKE_PRIVATE *wpriv ; + + if ((wpriv = psf->container_data) == NULL) + return SFE_INTERNAL ; current = psf_ftell (psf) ; @@ -568,17 +659,23 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; - psf_binheader_writef (psf, "em4m", RF64_MARKER, 0xffffffff, WAVE_MARKER) ; - - /* Currently no table. */ - psf_binheader_writef (psf, "m48884", ds64_MARKER, 28, psf->filelength - 8, psf->datalength, psf->sf.frames, 0) ; + if (wpriv->rf64_downgrade && psf->filelength < RIFF_DOWNGRADE_BYTES) + { psf_binheader_writef (psf, "etm8m", BHWm (RIFF_MARKER), BHW8 ((psf->filelength < 8) ? 8 : psf->filelength - 8), BHWm (WAVE_MARKER)) ; + psf_binheader_writef (psf, "m4z", BHWm (JUNK_MARKER), BHW4 (24), BHWz (24)) ; + add_fact_chunk = 1 ; + } + else + { psf_binheader_writef (psf, "em4m", BHWm (RF64_MARKER), BHW4 (0xffffffff), BHWm (WAVE_MARKER)) ; + /* Currently no table. */ + psf_binheader_writef (psf, "m48884", BHWm (ds64_MARKER), BHW4 (28), BHW8 (psf->filelength - 8), BHW8 (psf->datalength), BHW8 (psf->sf.frames), BHW4 (0)) ; + } ; /* WAVE and 'fmt ' markers. */ - psf_binheader_writef (psf, "m", fmt_MARKER) ; + psf_binheader_writef (psf, "m", BHWm (fmt_MARKER)) ; /* Write the 'fmt ' chunk. */ switch (psf->sf.format & SF_FORMAT_TYPEMASK) @@ -591,6 +688,8 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length) case SF_FORMAT_RF64 : if ((error = rf64_write_fmt_chunk (psf)) != 0) return error ; + if (add_fact_chunk) + psf_binheader_writef (psf, "tm48", BHWm (fact_MARKER), BHW4 (4), BHW8 (psf->sf.frames)) ; break ; default : @@ -598,68 +697,70 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length) } ; if (psf->broadcast_16k != NULL) - wav_write_bext_chunk (psf) ; + wavlike_write_bext_chunk (psf) ; + + if (psf->cart_16k != NULL) + wavlike_write_cart_chunk (psf) ; -#if 0 /* The LIST/INFO chunk. */ - if (psf->str_flags & SF_STR_LOCATE_START) - wav_write_strings (psf, SF_STR_LOCATE_START) ; + if (psf->strings.flags & SF_STR_LOCATE_START) + wavlike_write_strings (psf, SF_STR_LOCATE_START) ; if (psf->peak_info != NULL && psf->peak_info->peak_loc == SF_PEAK_START) - { psf_binheader_writef (psf, "m4", PEAK_MARKER, WAV_PEAK_CHUNK_SIZE (psf->sf.channels)) ; - psf_binheader_writef (psf, "44", 1, time (NULL)) ; - for (k = 0 ; k < psf->sf.channels ; k++) - psf_binheader_writef (psf, "ft8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ; - } ; + wavlike_write_peak_chunk (psf) ; -// if (psf->broadcast_info != NULL) -// wav_write_bext_chunk (psf) ; + /* Write custom headers. */ + if (psf->wchunks.used > 0) + wavlike_write_custom_chunks (psf) ; +#if 0 if (psf->instrument != NULL) { int tmp ; double dtune = (double) (0x40000000) / 25.0 ; - psf_binheader_writef (psf, "m4", smpl_MARKER, 9 * 4 + psf->instrument->loop_count * 6 * 4) ; - psf_binheader_writef (psf, "44", 0, 0) ; /* Manufacturer zero is everyone */ + psf_binheader_writef (psf, "m4", BHWm (smpl_MARKER), BHW4 (9 * 4 + psf->instrument->loop_count * 6 * 4)) ; + psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (0)) ; /* Manufacturer zero is everyone */ tmp = (int) (1.0e9 / psf->sf.samplerate) ; /* Sample period in nano seconds */ - psf_binheader_writef (psf, "44", tmp, psf->instrument->basenote) ; + psf_binheader_writef (psf, "44", BHW4 (tmp), BHW4 (psf->instrument->basenote)) ; tmp = (unsigned int) (psf->instrument->detune * dtune + 0.5) ; - psf_binheader_writef (psf, "4", tmp) ; - psf_binheader_writef (psf, "44", 0, 0) ; /* SMTPE format */ - psf_binheader_writef (psf, "44", psf->instrument->loop_count, 0) ; + psf_binheader_writef (psf, "4", BHW4 (tmp)) ; + psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (0)) ; /* SMTPE format */ + psf_binheader_writef (psf, "44", BHW4 (psf->instrument->loop_count), BHW4 (0)) ; for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++) { int type ; type = psf->instrument->loops [tmp].mode ; - type = (type == SF_LOOP_FORWARD ? 0 : type==SF_LOOP_BACKWARD ? 2 : type == SF_LOOP_ALTERNATING ? 1 : 32) ; + type = (type == SF_LOOP_FORWARD ? 0 : type == SF_LOOP_BACKWARD ? 2 : type == SF_LOOP_ALTERNATING ? 1 : 32) ; - psf_binheader_writef (psf, "44", tmp, type) ; - psf_binheader_writef (psf, "44", psf->instrument->loops [tmp].start, psf->instrument->loops [tmp].end) ; - psf_binheader_writef (psf, "44", 0, psf->instrument->loops [tmp].count) ; + psf_binheader_writef (psf, "44", BHW4 (tmp), BHW4 (type)) ; + psf_binheader_writef (psf, "44", BHW4 (psf->instrument->loops [tmp].start), BHW4 (psf->instrument->loops [tmp].end)) ; + psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (psf->instrument->loops [tmp].count)) ; } ; } ; - if (psf->headindex + 8 < psf->dataoffset) - { /* Add PAD data if necessary. */ - k = psf->dataoffset - 16 - psf->headindex ; - psf_binheader_writef (psf, "m4z", PAD_MARKER, k, make_size_t (k)) ; - } ; - #endif - psf_binheader_writef (psf, "m4", data_MARKER, 0xffffffff) ; + /* Padding may be needed if string data sizes change. */ + pad_size = psf->dataoffset - 16 - psf->header.indx ; + if (pad_size >= 0) + psf_binheader_writef (psf, "m4z", BHWm (PAD_MARKER), BHW4 ((unsigned int) pad_size), BHWz (pad_size)) ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + if (wpriv->rf64_downgrade && (psf->filelength < RIFF_DOWNGRADE_BYTES)) + psf_binheader_writef (psf, "tm8", BHWm (data_MARKER), BHW8 (psf->datalength)) ; + else + psf_binheader_writef (psf, "m4", BHWm (data_MARKER), BHW4 (0xffffffff)) ; + + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - if (has_data && psf->dataoffset != psf->headindex) - { printf ("Oooops : has_data && psf->dataoffset != psf->headindex\n") ; + if (has_data && psf->dataoffset != psf->header.indx) + { psf_log_printf (psf, "Oooops : has_data && psf->dataoffset != psf->header.indx\n") ; return psf->error = SFE_INTERNAL ; } ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (NOT (has_data)) psf_fseek (psf, psf->dataoffset, SEEK_SET) ; @@ -669,13 +770,42 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length) return psf->error ; } /* rf64_write_header */ +static int +rf64_write_tailer (SF_PRIVATE *psf) +{ + /* Reset the current header buffer length to zero. */ + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; + + if (psf->bytewidth > 0 && psf->sf.seekable == SF_TRUE) + { psf->datalength = psf->sf.frames * psf->bytewidth * psf->sf.channels ; + psf->dataend = psf->dataoffset + psf->datalength ; + } ; + + if (psf->dataend > 0) + psf_fseek (psf, psf->dataend, SEEK_SET) ; + else + psf->dataend = psf_fseek (psf, 0, SEEK_END) ; + + if (psf->dataend & 1) + psf_binheader_writef (psf, "z", BHWz (1)) ; + + if (psf->strings.flags & SF_STR_LOCATE_END) + wavlike_write_strings (psf, SF_STR_LOCATE_END) ; + + /* Write the tailer. */ + if (psf->header.indx > 0) + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; + + return 0 ; +} /* rf64_write_tailer */ + static int rf64_close (SF_PRIVATE *psf) { if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) - { // rf64_write_tailer (psf) ; - - psf->write_header (psf, SF_TRUE) ; + { rf64_write_tailer (psf) ; + rf64_write_header (psf, SF_TRUE) ; } ; return 0 ; @@ -683,7 +813,7 @@ rf64_close (SF_PRIVATE *psf) static int rf64_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize) -{ WAV_PRIVATE *wpriv ; +{ WAVLIKE_PRIVATE *wpriv ; if ((wpriv = psf->container_data) == NULL) return SFE_INTERNAL ; @@ -704,9 +834,14 @@ rf64_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize) return wpriv->wavex_ambisonic ; case SFC_SET_CHANNEL_MAP_INFO : - wpriv->wavex_channelmask = wavex_gen_channel_mask (psf->channel_map, psf->sf.channels) ; + wpriv->wavex_channelmask = wavlike_gen_channel_mask (psf->channel_map, psf->sf.channels) ; return (wpriv->wavex_channelmask != 0) ; + case SFC_RF64_AUTO_DOWNGRADE : + if (psf->have_written == 0) + wpriv->rf64_downgrade = datasize ? SF_TRUE : SF_FALSE ; + return wpriv->rf64_downgrade ; + default : break ; } ; @@ -714,3 +849,46 @@ rf64_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize) return 0 ; } /* rf64_command */ +static int +rf64_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) +{ return psf_save_write_chunk (&psf->wchunks, chunk_info) ; +} /* rf64_set_chunk */ + +static SF_CHUNK_ITERATOR * +rf64_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) +{ return psf_next_chunk_iterator (&psf->rchunks, iterator) ; +} /* rf64_next_chunk_iterator */ + +static int +rf64_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ int indx ; + + if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0) + return SFE_UNKNOWN_CHUNK ; + + chunk_info->datalen = psf->rchunks.chunks [indx].len ; + + return SFE_NO_ERROR ; +} /* rf64_get_chunk_size */ + +static int +rf64_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ int indx ; + sf_count_t pos ; + + if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0) + return SFE_UNKNOWN_CHUNK ; + + if (chunk_info->data == NULL) + return SFE_BAD_CHUNK_DATA_PTR ; + + chunk_info->id_size = psf->rchunks.chunks [indx].id_size ; + memcpy (chunk_info->id, psf->rchunks.chunks [indx].id, sizeof (chunk_info->id) / sizeof (*chunk_info->id)) ; + + pos = psf_ftell (psf) ; + psf_fseek (psf, psf->rchunks.chunks [indx].offset, SEEK_SET) ; + psf_fread (chunk_info->data, SF_MIN (chunk_info->datalen, psf->rchunks.chunks [indx].len), 1, psf) ; + psf_fseek (psf, pos, SEEK_SET) ; + + return SFE_NO_ERROR ; +} /* rf64_get_chunk_data */ diff --git a/lib-src/libsndfile/src/rx2.c b/lib-src/libsndfile/src/rx2.c index 0aa1bcf22..0a730480e 100644 --- a/lib-src/libsndfile/src/rx2.c +++ b/lib-src/libsndfile/src/rx2.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2012 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -80,10 +80,9 @@ rx2_open (SF_PRIVATE *psf) "Additional/PencilTool", "Disabled" } ; + BUF_UNION ubuf ; int error, marker, length, glob_offset, slce_count, frames ; - int sdat_length = 0, slce_total = 0 ; - int n_channels ; @@ -119,14 +118,14 @@ rx2_open (SF_PRIVATE *psf) /* Get name length */ length = 0 ; psf_binheader_readf (psf, "1", &length) ; - if (length >= SIGNED_SIZEOF (psf->u.cbuf)) + if (length >= SIGNED_SIZEOF (ubuf.cbuf)) { psf_log_printf (psf, " Text : %d *** Error : Too sf_count_t!\n") ; return -1001 ; } - memset (psf->u.cbuf, 0, sizeof (psf->u.cbuf)) ; - psf_binheader_readf (psf, "b", psf->u.cbuf, length) ; - psf_log_printf (psf, " Text : \"%s\"\n", psf->u.cbuf) ; + memset (ubuf.cbuf, 0, sizeof (ubuf.cbuf)) ; + psf_binheader_readf (psf, "b", ubuf.cbuf, length) ; + psf_log_printf (psf, " Text : \"%s\"\n", ubuf.cbuf) ; /* Jump to GLOB offset position. */ if (glob_offset & 1) @@ -253,7 +252,7 @@ rx2_open (SF_PRIVATE *psf) break ; } ; - puts (psf->logbuffer) ; + puts (psf->parselog.buf) ; puts ("-----------------------------------") ; printf ("SDAT length : %d\n", sdat_length) ; @@ -270,7 +269,7 @@ rx2_open (SF_PRIVATE *psf) puts (" ") ; - psf->logbuffer [0] = 0 ; + psf->parselog.buf [0] = 0 ; /* OK, have the header although not too sure what it all means. */ diff --git a/lib-src/libsndfile/src/sd2.c b/lib-src/libsndfile/src/sd2.c index 9ef10a91c..4846c58b4 100644 --- a/lib-src/libsndfile/src/sd2.c +++ b/lib-src/libsndfile/src/sd2.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2017 Erik de Castro Lopo ** Copyright (C) 2004 Paavo Jumppanen ** ** This program is free software; you can redistribute it and/or modify @@ -149,6 +149,7 @@ sd2_open (SF_PRIVATE *psf) { case SF_FORMAT_PCM_S8 : /* 8-bit linear PCM. */ case SF_FORMAT_PCM_16 : /* 16-bit linear PCM. */ case SF_FORMAT_PCM_24 : /* 24-bit linear PCM */ + case SF_FORMAT_PCM_32 : /* 32-bit linear PCM */ error = pcm_init (psf) ; break ; @@ -186,47 +187,6 @@ sd2_close (SF_PRIVATE *psf) /*------------------------------------------------------------------------------ */ -static inline void -write_char (unsigned char * data, int offset, char value) -{ data [offset] = value ; -} /* write_char */ - -static inline void -write_short (unsigned char * data, int offset, short value) -{ data [offset] = value >> 8 ; - data [offset + 1] = value ; -} /* write_char */ - -static inline void -write_int (unsigned char * data, int offset, int value) -{ data [offset] = value >> 24 ; - data [offset + 1] = value >> 16 ; - data [offset + 2] = value >> 8 ; - data [offset + 3] = value ; -} /* write_int */ - -static inline void -write_marker (unsigned char * data, int offset, int value) -{ - if (CPU_IS_BIG_ENDIAN) - { data [offset] = value >> 24 ; - data [offset + 1] = value >> 16 ; - data [offset + 2] = value >> 8 ; - data [offset + 3] = value ; - } - else - { data [offset] = value ; - data [offset + 1] = value >> 8 ; - data [offset + 2] = value >> 16 ; - data [offset + 3] = value >> 24 ; - } ; -} /* write_marker */ - -static void -write_str (unsigned char * data, int offset, const char * buffer, int buffer_len) -{ memcpy (data + offset, buffer, buffer_len) ; -} /* write_str */ - static int sd2_write_rsrc_fork (SF_PRIVATE *psf, int UNUSED (calc_length)) { SD2_RSRC rsrc ; @@ -247,8 +207,8 @@ sd2_write_rsrc_fork (SF_PRIVATE *psf, int UNUSED (calc_length)) rsrc.sample_size = psf->bytewidth ; rsrc.channels = psf->sf.channels ; - rsrc.rsrc_data = psf->header ; - rsrc.rsrc_len = sizeof (psf->header) ; + rsrc.rsrc_data = psf->header.ptr ; + rsrc.rsrc_len = psf->header.len ; memset (rsrc.rsrc_data, 0xea, rsrc.rsrc_len) ; snprintf (str_rsrc [0].value, sizeof (str_rsrc [0].value), "_%d", rsrc.sample_size) ; @@ -278,85 +238,65 @@ sd2_write_rsrc_fork (SF_PRIVATE *psf, int UNUSED (calc_length)) rsrc.map_offset = rsrc.data_offset + rsrc.data_length ; /* Very start of resource fork. */ - write_int (rsrc.rsrc_data, 0, rsrc.data_offset) ; - write_int (rsrc.rsrc_data, 4, rsrc.map_offset) ; - write_int (rsrc.rsrc_data, 8, rsrc.data_length) ; + psf_binheader_writef (psf, "E444", BHW4 (rsrc.data_offset), BHW4 (rsrc.map_offset), BHW4 (rsrc.data_length)) ; - write_char (rsrc.rsrc_data, 0x30, strlen (psf->file.name.c)) ; - write_str (rsrc.rsrc_data, 0x31, psf->file.name.c, strlen (psf->file.name.c)) ; - - write_short (rsrc.rsrc_data, 0x50, 0) ; - write_marker (rsrc.rsrc_data, 0x52, Sd2f_MARKER) ; - write_marker (rsrc.rsrc_data, 0x56, lsf1_MARKER) ; + psf_binheader_writef (psf, "Eop", BHWo (0x30), BHWp (psf->file.name.c)) ; + psf_binheader_writef (psf, "Eo2mm", BHWo (0x50), BHW2 (0), BHWm (Sd2f_MARKER), BHWm (lsf1_MARKER)) ; /* Very start of resource map. */ - write_int (rsrc.rsrc_data, rsrc.map_offset + 0, rsrc.data_offset) ; - write_int (rsrc.rsrc_data, rsrc.map_offset + 4, rsrc.map_offset) ; - write_int (rsrc.rsrc_data, rsrc.map_offset + 8, rsrc.data_length) ; + psf_binheader_writef (psf, "E4444", BHW4 (rsrc.map_offset), BHW4 (rsrc.data_offset), BHW4 (rsrc.map_offset), BHW4 (rsrc.data_length)) ; /* These I don't currently understand. */ if (1) - { write_char (rsrc.rsrc_data, rsrc.map_offset+ 16, 1) ; - /* Next resource map. */ - write_int (rsrc.rsrc_data, rsrc.map_offset + 17, 0x12345678) ; - /* File ref number. */ - write_short (rsrc.rsrc_data, rsrc.map_offset + 21, 0xabcd) ; - /* Fork attributes. */ - write_short (rsrc.rsrc_data, rsrc.map_offset + 23, 0) ; + { psf_binheader_writef (psf, "Eo1422", BHWo (rsrc.map_offset + 16), BHW1 (1), BHW4 (0x12345678), BHW2 (0xabcd), BHW2 (0)) ; } ; /* Resource type offset. */ rsrc.type_offset = rsrc.map_offset + 30 ; - write_short (rsrc.rsrc_data, rsrc.map_offset + 24, rsrc.type_offset - rsrc.map_offset - 2) ; + psf_binheader_writef (psf, "Eo2", BHWo (rsrc.map_offset + 24), BHW2 (rsrc.type_offset - rsrc.map_offset - 2)) ; /* Type index max. */ rsrc.type_count = 2 ; - write_short (rsrc.rsrc_data, rsrc.map_offset + 28, rsrc.type_count - 1) ; + psf_binheader_writef (psf, "Eo2", BHWo (rsrc.map_offset + 28), BHW2 (rsrc.type_count - 1)) ; rsrc.item_offset = rsrc.type_offset + rsrc.type_count * 8 ; rsrc.str_count = ARRAY_LEN (str_rsrc) ; rsrc.string_offset = rsrc.item_offset + (rsrc.str_count + 1) * 12 - rsrc.map_offset ; - write_short (rsrc.rsrc_data, rsrc.map_offset + 26, rsrc.string_offset) ; + psf_binheader_writef (psf, "Eo2", BHWo (rsrc.map_offset + 26), BHW2 (rsrc.string_offset)) ; /* Write 'STR ' resource type. */ rsrc.str_count = 3 ; - write_marker (rsrc.rsrc_data, rsrc.type_offset, STR_MARKER) ; - write_short (rsrc.rsrc_data, rsrc.type_offset + 4, rsrc.str_count - 1) ; - write_short (rsrc.rsrc_data, rsrc.type_offset + 6, 0x12) ; + psf_binheader_writef (psf, "Eom22", BHWo (rsrc.type_offset), BHWm (STR_MARKER), BHW2 (rsrc.str_count - 1), BHW2 (0x12)) ; /* Write 'sdML' resource type. */ - write_marker (rsrc.rsrc_data, rsrc.type_offset + 8, sdML_MARKER) ; - write_short (rsrc.rsrc_data, rsrc.type_offset + 12, 0) ; - write_short (rsrc.rsrc_data, rsrc.type_offset + 14, 0x36) ; + psf_binheader_writef (psf, "Em22", BHWm (sdML_MARKER), BHW2 (0), BHW2 (0x36)) ; str_offset = rsrc.map_offset + rsrc.string_offset ; next_str = 0 ; data_offset = rsrc.data_offset ; for (k = 0 ; k < ARRAY_LEN (str_rsrc) ; k++) - { write_str (rsrc.rsrc_data, str_offset, str_rsrc [k].name, strlen (str_rsrc [k].name)) ; - - write_short (rsrc.rsrc_data, rsrc.item_offset + k * 12, str_rsrc [k].id) ; - write_short (rsrc.rsrc_data, rsrc.item_offset + k * 12 + 2, next_str) ; + { psf_binheader_writef (psf, "Eop", BHWo (str_offset), BHWp (str_rsrc [k].name)) ; + psf_binheader_writef (psf, "Eo22", BHWo (rsrc.item_offset + k * 12), BHW2 (str_rsrc [k].id), BHW2 (next_str)) ; str_offset += strlen (str_rsrc [k].name) ; next_str += strlen (str_rsrc [k].name) ; - write_int (rsrc.rsrc_data, rsrc.item_offset + k * 12 + 4, data_offset - rsrc.data_offset) ; + psf_binheader_writef (psf, "Eo4", BHWo (rsrc.item_offset + k * 12 + 4), BHW4 (data_offset - rsrc.data_offset)) ; + psf_binheader_writef (psf, "Eo4", BHWo (data_offset), BHW4 (str_rsrc [k].value_len)) ; - write_int (rsrc.rsrc_data, data_offset, str_rsrc [k].value_len) ; - write_str (rsrc.rsrc_data, data_offset + 4, str_rsrc [k].value, str_rsrc [k].value_len) ; + psf_binheader_writef (psf, "Eob", BHWo (data_offset + 4), BHWv (str_rsrc [k].value), BHWz (str_rsrc [k].value_len)) ; data_offset += 4 + str_rsrc [k].value_len ; } ; /* Finally, calculate and set map length. */ rsrc.map_length = str_offset - rsrc.map_offset ; - write_int (rsrc.rsrc_data, 12, rsrc.map_length) ; - write_int (rsrc.rsrc_data, rsrc.map_offset + 12, rsrc.map_length) ; + psf_binheader_writef (psf, "Eo4o4", BHWo (12), BHW4 (rsrc.map_length), + BHWo (rsrc.map_offset + 12), BHW4 (rsrc.map_length)) ; - rsrc.rsrc_len = rsrc.map_offset + rsrc.map_length ; + psf->header.indx = rsrc.map_offset + rsrc.map_length ; - psf_fwrite (rsrc.rsrc_data, rsrc.rsrc_len, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; psf_use_rsrc (psf, SF_FALSE) ; @@ -370,44 +310,61 @@ sd2_write_rsrc_fork (SF_PRIVATE *psf, int UNUSED (calc_length)) */ static inline int -read_char (const unsigned char * data, int offset) -{ return data [offset] ; -} /* read_char */ +read_rsrc_char (const SD2_RSRC *prsrc, int offset) +{ const unsigned char * data = prsrc->rsrc_data ; + if (offset < 0 || offset >= prsrc->rsrc_len) + return 0 ; + return data [offset] ; +} /* read_rsrc_char */ static inline int -read_short (const unsigned char * data, int offset) -{ return (data [offset] << 8) + data [offset + 1] ; -} /* read_short */ +read_rsrc_short (const SD2_RSRC *prsrc, int offset) +{ const unsigned char * data = prsrc->rsrc_data ; + if (offset < 0 || offset + 1 >= prsrc->rsrc_len) + return 0 ; + return (data [offset] << 8) + data [offset + 1] ; +} /* read_rsrc_short */ static inline int -read_int (const unsigned char * data, int offset) -{ return (data [offset] << 24) + (data [offset + 1] << 16) + (data [offset + 2] << 8) + data [offset + 3] ; -} /* read_int */ +read_rsrc_int (const SD2_RSRC *prsrc, int offset) +{ const unsigned char * data = prsrc->rsrc_data ; + if (offset < 0 || offset + 3 >= prsrc->rsrc_len) + return 0 ; + return (((uint32_t) data [offset]) << 24) + (data [offset + 1] << 16) + (data [offset + 2] << 8) + data [offset + 3] ; +} /* read_rsrc_int */ static inline int -read_marker (const unsigned char * data, int offset) -{ +read_rsrc_marker (const SD2_RSRC *prsrc, int offset) +{ const unsigned char * data = prsrc->rsrc_data ; + + if (offset < 0 || offset + 3 >= prsrc->rsrc_len) + return 0 ; + if (CPU_IS_BIG_ENDIAN) - return (data [offset] << 24) + (data [offset + 1] << 16) + (data [offset + 2] << 8) + data [offset + 3] ; - else if (CPU_IS_LITTLE_ENDIAN) - return data [offset] + (data [offset + 1] << 8) + (data [offset + 2] << 16) + (data [offset + 3] << 24) ; - else - return 0x666 ; -} /* read_marker */ + return (((uint32_t) data [offset]) << 24) + (data [offset + 1] << 16) + (data [offset + 2] << 8) + data [offset + 3] ; + if (CPU_IS_LITTLE_ENDIAN) + return data [offset] + (data [offset + 1] << 8) + (data [offset + 2] << 16) + (((uint32_t) data [offset + 3]) << 24) ; + + return 0 ; +} /* read_rsrc_marker */ static void -read_str (const unsigned char * data, int offset, char * buffer, int buffer_len) -{ int k ; +read_rsrc_str (const SD2_RSRC *prsrc, int offset, char * buffer, int buffer_len) +{ const unsigned char * data = prsrc->rsrc_data ; + int k ; memset (buffer, 0, buffer_len) ; + if (offset < 0 || offset + buffer_len >= prsrc->rsrc_len) + return ; + for (k = 0 ; k < buffer_len - 1 ; k++) { if (psf_isprint (data [offset + k]) == 0) return ; buffer [k] = data [offset + k] ; } ; return ; -} /* read_str */ +} /* read_rsrc_str */ static int sd2_parse_rsrc_fork (SF_PRIVATE *psf) @@ -421,30 +378,34 @@ sd2_parse_rsrc_fork (SF_PRIVATE *psf) rsrc.rsrc_len = psf_get_filelen (psf) ; psf_log_printf (psf, "Resource length : %d (0x%04X)\n", rsrc.rsrc_len, rsrc.rsrc_len) ; - if (rsrc.rsrc_len > SIGNED_SIZEOF (psf->header)) + if (rsrc.rsrc_len > psf->header.len) { rsrc.rsrc_data = calloc (1, rsrc.rsrc_len) ; rsrc.need_to_free_rsrc_data = SF_TRUE ; } else - rsrc.rsrc_data = psf->header ; + { + rsrc.rsrc_data = psf->header.ptr ; + // rsrc.rsrc_len > psf->header.len ; + rsrc.need_to_free_rsrc_data = SF_FALSE ; + } ; /* Read in the whole lot. */ psf_fread (rsrc.rsrc_data, rsrc.rsrc_len, 1, psf) ; /* Reset the header storage because we have changed to the rsrcdes. */ - psf->headindex = psf->headend = rsrc.rsrc_len ; + psf->header.indx = psf->header.end = rsrc.rsrc_len ; - rsrc.data_offset = read_int (rsrc.rsrc_data, 0) ; - rsrc.map_offset = read_int (rsrc.rsrc_data, 4) ; - rsrc.data_length = read_int (rsrc.rsrc_data, 8) ; - rsrc.map_length = read_int (rsrc.rsrc_data, 12) ; + rsrc.data_offset = read_rsrc_int (&rsrc, 0) ; + rsrc.map_offset = read_rsrc_int (&rsrc, 4) ; + rsrc.data_length = read_rsrc_int (&rsrc, 8) ; + rsrc.map_length = read_rsrc_int (&rsrc, 12) ; if (rsrc.data_offset == 0x51607 && rsrc.map_offset == 0x20000) { psf_log_printf (psf, "Trying offset of 0x52 bytes.\n") ; - rsrc.data_offset = read_int (rsrc.rsrc_data, 0x52 + 0) + 0x52 ; - rsrc.map_offset = read_int (rsrc.rsrc_data, 0x52 + 4) + 0x52 ; - rsrc.data_length = read_int (rsrc.rsrc_data, 0x52 + 8) ; - rsrc.map_length = read_int (rsrc.rsrc_data, 0x52 + 12) ; + rsrc.data_offset = read_rsrc_int (&rsrc, 0x52 + 0) + 0x52 ; + rsrc.map_offset = read_rsrc_int (&rsrc, 0x52 + 4) + 0x52 ; + rsrc.data_length = read_rsrc_int (&rsrc, 0x52 + 8) ; + rsrc.map_length = read_rsrc_int (&rsrc, 0x52 + 12) ; } ; psf_log_printf (psf, " data offset : 0x%04X\n map offset : 0x%04X\n" @@ -487,7 +448,7 @@ sd2_parse_rsrc_fork (SF_PRIVATE *psf) goto parse_rsrc_fork_cleanup ; } ; - rsrc.string_offset = rsrc.map_offset + read_short (rsrc.rsrc_data, rsrc.map_offset + 26) ; + rsrc.string_offset = rsrc.map_offset + read_rsrc_short (&rsrc, rsrc.map_offset + 26) ; if (rsrc.string_offset > rsrc.rsrc_len) { psf_log_printf (psf, "Bad string offset (%d).\n", rsrc.string_offset) ; error = SFE_SD2_BAD_RSRC ; @@ -496,7 +457,12 @@ sd2_parse_rsrc_fork (SF_PRIVATE *psf) rsrc.type_offset = rsrc.map_offset + 30 ; - rsrc.type_count = read_short (rsrc.rsrc_data, rsrc.map_offset + 28) + 1 ; + if (rsrc.map_offset + 28 > rsrc.rsrc_len) + { psf_log_printf (psf, "Bad map offset.\n") ; + goto parse_rsrc_fork_cleanup ; + } ; + + rsrc.type_count = read_rsrc_short (&rsrc, rsrc.map_offset + 28) + 1 ; if (rsrc.type_count < 1) { psf_log_printf (psf, "Bad type count.\n") ; error = SFE_SD2_BAD_RSRC ; @@ -512,11 +478,16 @@ sd2_parse_rsrc_fork (SF_PRIVATE *psf) rsrc.str_index = -1 ; for (k = 0 ; k < rsrc.type_count ; k ++) - { marker = read_marker (rsrc.rsrc_data, rsrc.type_offset + k * 8) ; + { if (rsrc.type_offset + k * 8 > rsrc.rsrc_len) + { psf_log_printf (psf, "Bad rsrc marker.\n") ; + goto parse_rsrc_fork_cleanup ; + } ; + + marker = read_rsrc_marker (&rsrc, rsrc.type_offset + k * 8) ; if (marker == STR_MARKER) { rsrc.str_index = k ; - rsrc.str_count = read_short (rsrc.rsrc_data, rsrc.type_offset + k * 8 + 4) + 1 ; + rsrc.str_count = read_rsrc_short (&rsrc, rsrc.type_offset + k * 8 + 4) + 1 ; error = parse_str_rsrc (psf, &rsrc) ; goto parse_rsrc_fork_cleanup ; } ; @@ -548,26 +519,26 @@ parse_str_rsrc (SF_PRIVATE *psf, SD2_RSRC * rsrc) for (k = 0 ; data_offset + data_len < rsrc->rsrc_len ; k++) { int slen ; - slen = read_char (rsrc->rsrc_data, str_offset) ; - read_str (rsrc->rsrc_data, str_offset + 1, name, SF_MIN (SIGNED_SIZEOF (name), slen + 1)) ; + slen = read_rsrc_char (rsrc, str_offset) ; + read_rsrc_str (rsrc, str_offset + 1, name, SF_MIN (SIGNED_SIZEOF (name), slen + 1)) ; str_offset += slen + 1 ; - rsrc_id = read_short (rsrc->rsrc_data, rsrc->item_offset + k * 12) ; + rsrc_id = read_rsrc_short (rsrc, rsrc->item_offset + k * 12) ; - data_offset = rsrc->data_offset + read_int (rsrc->rsrc_data, rsrc->item_offset + k * 12 + 4) ; + data_offset = rsrc->data_offset + read_rsrc_int (rsrc, rsrc->item_offset + k * 12 + 4) ; if (data_offset < 0 || data_offset > rsrc->rsrc_len) { psf_log_printf (psf, "Exiting parser on data offset of %d.\n", data_offset) ; break ; } ; - data_len = read_int (rsrc->rsrc_data, data_offset) ; + data_len = read_rsrc_int (rsrc, data_offset) ; if (data_len < 0 || data_len > rsrc->rsrc_len) { psf_log_printf (psf, "Exiting parser on data length of %d.\n", data_len) ; break ; } ; - slen = read_char (rsrc->rsrc_data, data_offset + 4) ; - read_str (rsrc->rsrc_data, data_offset + 5, value, SF_MIN (SIGNED_SIZEOF (value), slen + 1)) ; + slen = read_rsrc_char (rsrc, data_offset + 4) ; + read_rsrc_str (rsrc, data_offset + 5, value, SF_MIN (SIGNED_SIZEOF (value), slen + 1)) ; psf_log_printf (psf, " 0x%04x %4d %4d %3d '%s'\n", data_offset, rsrc_id, data_len, slen, value) ; @@ -620,6 +591,10 @@ parse_str_rsrc (SF_PRIVATE *psf, SD2_RSRC * rsrc) psf->sf.format = SF_FORMAT_SD2 | SF_FORMAT_PCM_24 ; break ; + case 4 : + psf->sf.format = SF_FORMAT_SD2 | SF_FORMAT_PCM_32 ; + break ; + default : psf_log_printf (psf, "Bad sample size (%d)\n", rsrc->sample_size) ; return SFE_SD2_BAD_SAMPLE_SIZE ; diff --git a/lib-src/libsndfile/src/sds.c b/lib-src/libsndfile/src/sds.c index 17c7036b2..85c8c11fe 100644 --- a/lib-src/libsndfile/src/sds.c +++ b/lib-src/libsndfile/src/sds.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -83,6 +83,7 @@ static sf_count_t sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len static sf_count_t sds_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; static sf_count_t sds_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; +static int sds_byterate (SF_PRIVATE * psf) ; static int sds_2byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) ; static int sds_3byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) ; @@ -132,8 +133,9 @@ sds_open (SF_PRIVATE *psf) if ((error = sds_init (psf, psds)) != 0) return error ; - psf->seek = sds_seek ; psf->container_close = sds_close ; + psf->seek = sds_seek ; + psf->byterate = sds_byterate ; psf->blockwidth = 0 ; @@ -364,13 +366,13 @@ sds_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; if (psf->is_pipe == SF_FALSE) psf_fseek (psf, 0, SEEK_SET) ; - psf_binheader_writef (psf, "E211", 0xF07E, 0, 1) ; + psf_binheader_writef (psf, "E211", BHW2 (0xF07E), BHW1 (0), BHW1 (1)) ; switch (SF_CODEC (psf->sf.format)) { case SF_FORMAT_PCM_S8 : @@ -388,21 +390,21 @@ sds_write_header (SF_PRIVATE *psf, int calc_length) samp_period = SDS_INT_TO_3BYTE_ENCODE (1000000000 / psf->sf.samplerate) ; - psf_binheader_writef (psf, "e213", 0, psds->bitwidth, samp_period) ; + psf_binheader_writef (psf, "e213", BHW2 (0), BHW1 (psds->bitwidth), BHW3 (samp_period)) ; data_length = SDS_INT_TO_3BYTE_ENCODE (psds->total_written) ; sustain_loop_start = SDS_INT_TO_3BYTE_ENCODE (0) ; sustain_loop_end = SDS_INT_TO_3BYTE_ENCODE (0) ; - psf_binheader_writef (psf, "e33311", data_length, sustain_loop_start, sustain_loop_end, loop_type, 0xF7) ; + psf_binheader_writef (psf, "e33311", BHW3 (data_length), BHW3 (sustain_loop_start), BHW3 (sustain_loop_end), BHW1 (loop_type), BHW1 (0xF7)) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; psf->datalength = psds->write_block * SDS_BLOCK_SIZE ; if (current > 0) @@ -452,7 +454,7 @@ sds_2byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) ucptr = psds->read_data + 5 ; for (k = 0 ; k < 120 ; k += 2) - { sample = (ucptr [k] << 25) + (ucptr [k + 1] << 18) ; + { sample = arith_shift_left (ucptr [k], 25) + arith_shift_left (ucptr [k + 1], 18) ; psds->read_samples [k / 2] = (int) (sample - 0x80000000) ; } ; @@ -496,7 +498,7 @@ sds_3byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) ucptr = psds->read_data + 5 ; for (k = 0 ; k < 120 ; k += 3) - { sample = (ucptr [k] << 25) + (ucptr [k + 1] << 18) + (ucptr [k + 2] << 11) ; + { sample = (((uint32_t) ucptr [k]) << 25) + (ucptr [k + 1] << 18) + (ucptr [k + 2] << 11) ; psds->read_samples [k / 3] = (int) (sample - 0x80000000) ; } ; @@ -506,7 +508,7 @@ sds_3byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) static int sds_4byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) { unsigned char *ucptr, checksum ; - unsigned int sample ; + uint32_t sample ; int k ; psds->read_block ++ ; @@ -540,7 +542,7 @@ sds_4byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) ucptr = psds->read_data + 5 ; for (k = 0 ; k < 120 ; k += 4) - { sample = (ucptr [k] << 25) + (ucptr [k + 1] << 18) + (ucptr [k + 2] << 11) + (ucptr [k + 3] << 4) ; + { sample = (((uint32_t) ucptr [k]) << 25) + (ucptr [k + 1] << 18) + (ucptr [k + 2] << 11) + (ucptr [k + 3] << 4) ; psds->read_samples [k / 4] = (int) (sample - 0x80000000) ; } ; @@ -550,7 +552,8 @@ sds_4byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) static sf_count_t sds_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ SDS_PRIVATE *psds ; +{ BUF_UNION ubuf ; + SDS_PRIVATE *psds ; int *iptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -559,8 +562,8 @@ sds_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) return 0 ; psds = (SDS_PRIVATE*) psf->codec_data ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = sds_read (psf, psds, iptr, readcount) ; @@ -589,7 +592,8 @@ sds_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t sds_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ SDS_PRIVATE *psds ; +{ BUF_UNION ubuf ; + SDS_PRIVATE *psds ; int *iptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -604,8 +608,8 @@ sds_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) else normfact = 1.0 / (1 << psds->bitwidth) ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = sds_read (psf, psds, iptr, readcount) ; @@ -620,7 +624,8 @@ sds_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t sds_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ SDS_PRIVATE *psds ; +{ BUF_UNION ubuf ; + SDS_PRIVATE *psds ; int *iptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -635,8 +640,8 @@ sds_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) else normfact = 1.0 / (1 << psds->bitwidth) ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; count = sds_read (psf, psds, iptr, readcount) ; @@ -749,6 +754,15 @@ sds_seek (SF_PRIVATE *psf, int mode, sf_count_t seek_from_start) return seek_from_start ; } /* sds_seek */ +static int +sds_byterate (SF_PRIVATE * psf) +{ + if (psf->file.mode == SFM_READ) + return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ; + + return -1 ; +} /* sds_byterate */ + /*============================================================================== */ @@ -880,7 +894,8 @@ sds_4byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds) static sf_count_t sds_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ SDS_PRIVATE *psds ; +{ BUF_UNION ubuf ; + SDS_PRIVATE *psds ; int *iptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -890,12 +905,12 @@ sds_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) psds = (SDS_PRIVATE*) psf->codec_data ; psds->total_written += len ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) - iptr [k] = ptr [total + k] << 16 ; + iptr [k] = arith_shift_left (ptr [total + k], 16) ; count = sds_write (psf, psds, iptr, writecount) ; total += count ; len -= writecount ; @@ -921,7 +936,8 @@ sds_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ SDS_PRIVATE *psds ; +{ BUF_UNION ubuf ; + SDS_PRIVATE *psds ; int *iptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -937,8 +953,8 @@ sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) else normfact = 1.0 * (1 << psds->bitwidth) ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) @@ -953,7 +969,8 @@ sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t sds_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ SDS_PRIVATE *psds ; +{ BUF_UNION ubuf ; + SDS_PRIVATE *psds ; int *iptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -969,8 +986,8 @@ sds_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) else normfact = 1.0 * (1 << psds->bitwidth) ; - iptr = psf->u.ibuf ; - bufferlen = ARRAY_LEN (psf->u.ibuf) ; + iptr = ubuf.ibuf ; + bufferlen = ARRAY_LEN (ubuf.ibuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : len ; for (k = 0 ; k < writecount ; k++) diff --git a/lib-src/libsndfile/src/sf_unistd.h b/lib-src/libsndfile/src/sf_unistd.h index 9fca68eff..b217891fb 100644 --- a/lib-src/libsndfile/src/sf_unistd.h +++ b/lib-src/libsndfile/src/sf_unistd.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -16,8 +16,34 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* Microsoft declares some 'unistd.h' functions in 'io.h'. */ + +#ifdef HAVE_IO_H +#include +#endif + /* Some defines that microsoft 'forgot' to implement. */ +#ifndef R_OK +#define R_OK 4 /* Test for read permission. */ +#endif + +#ifndef W_OK +#define W_OK 2 /* Test for write permission. */ +#endif + +#ifndef X_OK +#ifdef WIN32 +#define X_OK 0 +#else +#define X_OK 1 /* execute permission - unsupported in windows*/ +#endif +#endif + +#ifndef F_OK +#define F_OK 0 /* Test for existence. */ +#endif + #ifndef S_IRWXU #define S_IRWXU 0000700 /* rwx, owner */ #endif diff --git a/lib-src/libsndfile/src/sfconfig.h b/lib-src/libsndfile/src/sfconfig.h index 1ed1f2739..f4461c148 100644 --- a/lib-src/libsndfile/src/sfconfig.h +++ b/lib-src/libsndfile/src/sfconfig.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 2005-2011 Erik de Castro Lopo +** Copyright (C) 2005-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -53,6 +53,10 @@ #define HAVE_ENDIAN_H 0 #endif +#ifndef HAVE_FSTAT64 +#define HAVE_FSTAT64 0 +#endif + #ifndef HAVE_FSYNC #define HAVE_FSYNC 0 #endif @@ -73,14 +77,6 @@ #define HAVE_MMAP 0 #endif -#ifndef HAVE_PREAD -#define HAVE_PREAD 0 -#endif - -#ifndef HAVE_PWRITE -#define HAVE_PWRITE 0 -#endif - #ifndef HAVE_SETLOCALE #define HAVE_SETLOCALE 0 #endif @@ -93,6 +89,14 @@ #define HAVE_STDINT_H 0 #endif +#ifndef HAVE_SYS_WAIT_H +#define HAVE_SYS_WAIT_H 0 +#endif + +#ifndef HAVE_SYS_TIME_H +#define HAVE_SYS_TIME_H 0 +#endif + #ifndef HAVE_UNISTD_H #define HAVE_UNISTD_H 0 #endif @@ -105,5 +109,27 @@ #define HAVE_WAITPID 0 #endif +#ifndef HAVE_X86INTRIN_H +#define HAVE_X86INTRIN_H 0 #endif +#if (defined __x86_64__) || (defined _M_X64) +#define CPU_IS_X86_64 1 /* Define both for x86_64 */ +#define CPU_IS_X86 1 +#elif defined (__i486__) || defined (__i586__) || defined (__i686__) || defined (_M_IX86) +#define CPU_IS_X86 1 +#define CPU_IS_X86_64 0 +#else +#define CPU_IS_X86 0 +#define CPU_IS_X86_64 0 +#endif + +#ifndef HAVE_SSIZE_T +#define HAVE_SSIZE_T 0 +#endif + +#if (HAVE_SSIZE_T == 0) +#define ssize_t intptr_t +#endif + +#endif diff --git a/lib-src/libsndfile/src/sfendian.h b/lib-src/libsndfile/src/sfendian.h index 386361c64..8a720e9de 100644 --- a/lib-src/libsndfile/src/sfendian.h +++ b/lib-src/libsndfile/src/sfendian.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2018 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -21,36 +21,85 @@ #include "sfconfig.h" -#if HAVE_STDINT_H #include -#elif HAVE_INTTYPES_H #include -#endif -#if (defined (SIZEOF_INT64_T) && (SIZEOF_INT64_T == 8)) -/* Good, we have int64_t. */ -#elif (defined (SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == 8)) -typedef long long int64_t ; -#elif (defined (SIZEOF_LONG) && (SIZEOF_LONG == 8)) -typedef long int64_t ; -#elif (defined (WIN32) || defined (_WIN32)) -typedef __int64 int64_t ; -#else -#error "No 64 bit integer type." -#endif - -#if HAVE_BYTESWAP_H +#if HAVE_BYTESWAP_H /* Linux, any CPU */ #include -#define ENDSWAP_SHORT(x) ((short) bswap_16 (x)) -#define ENDSWAP_INT(x) ((int) bswap_32 (x)) +#define ENDSWAP_16(x) (bswap_16 (x)) +#define ENDSWAP_32(x) (bswap_32 (x)) +#define ENDSWAP_64(x) (bswap_64 (x)) +#endif -#else -#define ENDSWAP_SHORT(x) ((((x) >> 8) & 0xFF) + (((x) & 0xFF) << 8)) -#define ENDSWAP_INT(x) ((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24)) +#if (HAVE_BYTESWAP_H == 0) && COMPILER_IS_GCC +#if CPU_IS_X86 + +static inline int16_t +ENDSWAP_16 (int16_t x) +{ int16_t y ; + __asm__ ("rorw $8, %w0" : "=r" (y) : "0" (x) : "cc") ; + return y ; +} /* ENDSWAP_16 */ + +static inline int32_t +ENDSWAP_32 (int32_t x) +{ int32_t y ; + __asm__ ("bswap %0" : "=r" (y) : "0" (x)) ; + return y ; +} /* ENDSWAP_32 */ + +#endif + +#if CPU_IS_X86_64 + +static inline int64_t +ENDSWAP_64X (int64_t x) +{ int64_t y ; + __asm__ ("bswap %q0" : "=r" (y) : "0" (x)) ; + return y ; +} /* ENDSWAP_64X */ + +#define ENDSWAP_64 ENDSWAP_64X + +#endif +#endif + +#ifdef _MSC_VER +#include + +#define ENDSWAP_16(x) (_byteswap_ushort (x)) +#define ENDSWAP_32(x) (_byteswap_ulong (x)) +#define ENDSWAP_64(x) (_byteswap_uint64 (x)) + +#endif + +#ifndef ENDSWAP_16 +#define ENDSWAP_16(x) ((((x) >> 8) & 0xFF) + (((x) & 0xFF) << 8)) +#endif + +#ifndef ENDSWAP_32 +#define ENDSWAP_32(x) ((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24)) +#endif + +#ifndef ENDSWAP_64 +static inline uint64_t +ENDSWAP_64 (uint64_t x) +{ union + { uint32_t parts [2] ; + uint64_t whole ; + } u ; + uint32_t temp ; + + u.whole = x ; + temp = u.parts [0] ; + u.parts [0] = ENDSWAP_32 (u.parts [1]) ; + u.parts [1] = ENDSWAP_32 (temp) ; + return u.whole ; +} #endif /* @@ -61,9 +110,9 @@ typedef __int64 int64_t ; */ #if (CPU_IS_LITTLE_ENDIAN == 1) - #define MAKE_MARKER(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) + #define MAKE_MARKER(a, b, c, d) ((uint32_t) ((a) | ((b) << 8) | ((c) << 16) | (((uint32_t) (d)) << 24))) #elif (CPU_IS_BIG_ENDIAN == 1) - #define MAKE_MARKER(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) + #define MAKE_MARKER(a, b, c, d) ((uint32_t) ((((uint32_t) (a)) << 24) | ((b) << 16) | ((c) << 8) | (d))) #else #error "Target CPU endian-ness unknown. May need to hand edit src/sfconfig.h" #endif @@ -76,34 +125,156 @@ typedef __int64 int64_t ; */ #if (CPU_IS_LITTLE_ENDIAN == 1) - #define LES2H_SHORT(x) (x) - #define LEI2H_INT(x) (x) + #define LE2H_16(x) (x) + #define LE2H_32(x) (x) - #define BES2H_SHORT(x) ENDSWAP_SHORT (x) - #define BEI2H_INT(x) ENDSWAP_INT (x) + #define BE2H_16(x) ENDSWAP_16 (x) + #define BE2H_32(x) ENDSWAP_32 (x) + #define BE2H_64(x) ENDSWAP_64 (x) - #define H2BE_SHORT(x) ENDSWAP_SHORT (x) - #define H2BE_INT(x) ENDSWAP_INT (x) + #define H2BE_16(x) ENDSWAP_16 (x) + #define H2BE_32(x) ENDSWAP_32 (x) + + #define H2LE_16(x) (x) + #define H2LE_32(x) (x) #elif (CPU_IS_BIG_ENDIAN == 1) - #define LES2H_SHORT(x) ENDSWAP_SHORT (x) - #define LEI2H_INT(x) ENDSWAP_INT (x) + #define LE2H_16(x) ENDSWAP_16 (x) + #define LE2H_32(x) ENDSWAP_32 (x) - #define BES2H_SHORT(x) (x) - #define BEI2H_INT(x) (x) + #define BE2H_16(x) (x) + #define BE2H_32(x) (x) + #define BE2H_64(x) (x) - #define H2LE_SHORT(x) ENDSWAP_SHORT (x) - #define H2LE_INT(x) ENDSWAP_INT (x) + #define H2BE_16(x) (x) + #define H2BE_32(x) (x) + + #define H2LE_16(x) ENDSWAP_16 (x) + #define H2LE_32(x) ENDSWAP_32 (x) #else #error "Target CPU endian-ness unknown. May need to hand edit src/sfconfig.h" #endif -#define LET2H_SHORT_PTR(x) ((x) [1] + ((x) [2] << 8)) -#define LET2H_INT_PTR(x) (((x) [0] << 8) + ((x) [1] << 16) + ((x) [2] << 24)) +#define LE2H_32_PTR(x) (((x) [0]) + ((x) [1] << 8) + ((x) [2] << 16) + ((x) [3] << 24)) -#define BET2H_SHORT_PTR(x) (((x) [0] << 8) + (x) [1]) -#define BET2H_INT_PTR(x) (((x) [0] << 24) + ((x) [1] << 16) + ((x) [2] << 8)) +#define LET2H_16_PTR(x) ((x) [1] + ((x) [2] << 8)) +#define LET2H_32_PTR(x) (((x) [0] << 8) + ((x) [1] << 16) + ((x) [2] << 24)) + +#define BET2H_16_PTR(x) (((x) [0] << 8) + (x) [1]) +#define BET2H_32_PTR(x) (((x) [0] << 24) + ((x) [1] << 16) + ((x) [2] << 8)) + +static inline void +psf_put_be64 (uint8_t *ptr, int offset, int64_t value) +{ + ptr [offset] = value >> 56 ; + ptr [offset + 1] = value >> 48 ; + ptr [offset + 2] = value >> 40 ; + ptr [offset + 3] = value >> 32 ; + ptr [offset + 4] = value >> 24 ; + ptr [offset + 5] = value >> 16 ; + ptr [offset + 6] = value >> 8 ; + ptr [offset + 7] = value ; +} /* psf_put_be64 */ + +static inline void +psf_put_be32 (uint8_t *ptr, int offset, int32_t value) +{ + ptr [offset] = value >> 24 ; + ptr [offset + 1] = value >> 16 ; + ptr [offset + 2] = value >> 8 ; + ptr [offset + 3] = value ; +} /* psf_put_be32 */ + +static inline void +psf_put_be16 (uint8_t *ptr, int offset, int16_t value) +{ + ptr [offset] = value >> 8 ; + ptr [offset + 1] = value ; +} /* psf_put_be16 */ + +static inline int64_t +psf_get_be64 (uint8_t *ptr, int offset) +{ int64_t value ; + + value = ((uint32_t) ptr [offset]) << 24 ; + value += ptr [offset + 1] << 16 ; + value += ptr [offset + 2] << 8 ; + value += ptr [offset + 3] ; + + value = ((uint64_t) value) << 32 ; + + value += ((uint32_t) ptr [offset + 4]) << 24 ; + value += ptr [offset + 5] << 16 ; + value += ptr [offset + 6] << 8 ; + value += ptr [offset + 7] ; + return value ; +} /* psf_get_be64 */ + +static inline int64_t +psf_get_le64 (uint8_t *ptr, int offset) +{ int64_t value ; + + value = ((uint32_t) ptr [offset + 7]) << 24 ; + value += ptr [offset + 6] << 16 ; + value += ptr [offset + 5] << 8 ; + value += ptr [offset + 4] ; + + value = ((uint64_t) value) << 32 ; + + value += ((uint32_t) ptr [offset + 3]) << 24 ; + value += ptr [offset + 2] << 16 ; + value += ptr [offset + 1] << 8 ; + value += ptr [offset] ; + return value ; +} /* psf_get_le64 */ + +static inline int32_t +psf_get_be32 (uint8_t *ptr, int offset) +{ int32_t value ; + + value = ((uint32_t) ptr [offset]) << 24 ; + value += ptr [offset + 1] << 16 ; + value += ptr [offset + 2] << 8 ; + value += ptr [offset + 3] ; + return value ; +} /* psf_get_be32 */ + +static inline int32_t +psf_get_le32 (uint8_t *ptr, int offset) +{ int32_t value ; + + value = ((uint32_t) ptr [offset + 3]) << 24 ; + value += ptr [offset + 2] << 16 ; + value += ptr [offset + 1] << 8 ; + value += ptr [offset] ; + return value ; +} /* psf_get_le32 */ + +static inline int32_t +psf_get_be24 (uint8_t *ptr, int offset) +{ int32_t value ; + + value = ((uint32_t) ptr [offset]) << 24 ; + value += ptr [offset + 1] << 16 ; + value += ptr [offset + 2] << 8 ; + return value ; +} /* psf_get_be24 */ + +static inline int32_t +psf_get_le24 (uint8_t *ptr, int offset) +{ int32_t value ; + + value = ((uint32_t) ptr [offset + 2]) << 24 ; + value += ptr [offset + 1] << 16 ; + value += ptr [offset] << 8 ; + return value ; +} /* psf_get_le24 */ + +static inline int16_t +psf_get_be16 (uint8_t *ptr, int offset) +{ return (ptr [offset] << 8) + ptr [offset + 1] ; +} /* psf_get_be16 */ /*----------------------------------------------------------------------------------------------- ** Generic functions for performing endian swapping on integer arrays. @@ -115,7 +286,7 @@ endswap_short_array (short *ptr, int len) while (--len >= 0) { temp = ptr [len] ; - ptr [len] = ENDSWAP_SHORT (temp) ; + ptr [len] = ENDSWAP_16 (temp) ; } ; } /* endswap_short_array */ @@ -123,7 +294,7 @@ static inline void endswap_short_copy (short *dest, const short *src, int len) { while (--len >= 0) - { dest [len] = ENDSWAP_SHORT (src [len]) ; + { dest [len] = ENDSWAP_16 (src [len]) ; } ; } /* endswap_short_copy */ @@ -133,7 +304,7 @@ endswap_int_array (int *ptr, int len) while (--len >= 0) { temp = ptr [len] ; - ptr [len] = ENDSWAP_INT (temp) ; + ptr [len] = ENDSWAP_32 (temp) ; } ; } /* endswap_int_array */ @@ -141,22 +312,20 @@ static inline void endswap_int_copy (int *dest, const int *src, int len) { while (--len >= 0) - { dest [len] = ENDSWAP_INT (src [len]) ; + { dest [len] = ENDSWAP_32 (src [len]) ; } ; } /* endswap_int_copy */ /*======================================================================================== */ -#if (HAVE_BYTESWAP_H && defined (SIZEOF_INT64_T) && (SIZEOF_INT64_T == 8)) - static inline void endswap_int64_t_array (int64_t *ptr, int len) { int64_t value ; while (--len >= 0) { value = ptr [len] ; - ptr [len] = bswap_64 (value) ; + ptr [len] = ENDSWAP_64 (value) ; } ; } /* endswap_int64_t_array */ @@ -166,78 +335,20 @@ endswap_int64_t_copy (int64_t *dest, const int64_t *src, int len) while (--len >= 0) { value = src [len] ; - dest [len] = bswap_64 (value) ; + dest [len] = ENDSWAP_64 (value) ; } ; } /* endswap_int64_t_copy */ -#else - -static inline void -endswap_int64_t_array (int64_t *ptr, int len) -{ unsigned char *ucptr, temp ; - - ucptr = (unsigned char *) ptr ; - ucptr += 8 * len ; - while (--len >= 0) - { ucptr -= 8 ; - - temp = ucptr [0] ; - ucptr [0] = ucptr [7] ; - ucptr [7] = temp ; - - temp = ucptr [1] ; - ucptr [1] = ucptr [6] ; - ucptr [6] = temp ; - - temp = ucptr [2] ; - ucptr [2] = ucptr [5] ; - ucptr [5] = temp ; - - temp = ucptr [3] ; - ucptr [3] = ucptr [4] ; - ucptr [4] = temp ; - } ; -} /* endswap_int64_t_array */ - -static inline void -endswap_int64_t_copy (int64_t *dest, const int64_t *src, int len) -{ const unsigned char *psrc ; - unsigned char *pdest ; - - if (dest == src) - { endswap_int64_t_array (dest, len) ; - return ; - } ; - - psrc = ((const unsigned char *) src) + 8 * len ; - pdest = ((unsigned char *) dest) + 8 * len ; - while (--len >= 0) - { psrc -= 8 ; - pdest -= 8 ; - - pdest [0] = psrc [7] ; - pdest [2] = psrc [5] ; - pdest [4] = psrc [3] ; - pdest [6] = psrc [1] ; - pdest [7] = psrc [0] ; - pdest [1] = psrc [6] ; - pdest [3] = psrc [4] ; - pdest [5] = psrc [2] ; - } ; -} /* endswap_int64_t_copy */ - -#endif - /* A couple of wrapper functions. */ static inline void endswap_float_array (float *ptr, int len) -{ endswap_int_array ((void *) ptr, len) ; +{ endswap_int_array ((int *) ptr, len) ; } /* endswap_float_array */ static inline void endswap_double_array (double *ptr, int len) -{ endswap_int64_t_array ((void *) ptr, len) ; +{ endswap_int64_t_array ((int64_t *) ptr, len) ; } /* endswap_double_array */ static inline void diff --git a/lib-src/libsndfile/src/sndfile.c b/lib-src/libsndfile/src/sndfile.c index bdb93c0ec..85317294b 100644 --- a/lib-src/libsndfile/src/sndfile.c +++ b/lib-src/libsndfile/src/sndfile.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2018 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -21,6 +21,7 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" @@ -64,7 +65,7 @@ ErrorStruct SndfileErrors [] = /* Private error values and their associated strings. */ { SFE_ZERO_MAJOR_FORMAT , "Error : major format is 0." }, - { SFE_ZERO_MINOR_FORMAT , "Error : major format is 0." }, + { SFE_ZERO_MINOR_FORMAT , "Error : minor format is 0." }, { SFE_BAD_FILE , "File does not exist or is not a regular file (possibly a pipe?)." }, { SFE_BAD_FILE_READ , "File exists but no data could be read." }, { SFE_OPEN_FAILED , "Could not open file." }, @@ -74,12 +75,12 @@ ErrorStruct SndfileErrors [] = { SFE_BAD_FILE_PTR , "Bad FILE pointer." }, { SFE_BAD_INT_PTR , "Internal error, Bad pointer." }, { SFE_BAD_STAT_SIZE , "Error : software was misconfigured at compile time (sizeof statbuf.st_size)." }, + { SFE_NO_TEMP_DIR , "Error : Could not file temp dir." }, { SFE_MALLOC_FAILED , "Internal malloc () failed." }, { SFE_UNIMPLEMENTED , "File contains data in an unimplemented format." }, { SFE_BAD_READ_ALIGN , "Attempt to read a non-integer number of channels." }, { SFE_BAD_WRITE_ALIGN , "Attempt to write a non-integer number of channels." }, - { SFE_UNKNOWN_FORMAT , "File contains data in an unknown format." }, { SFE_NOT_READMODE , "Read attempted on file currently open for write." }, { SFE_NOT_WRITEMODE , "Write attempted on file currently open for read." }, { SFE_BAD_MODE_RW , "Error : This file format does not support read/write mode." }, @@ -90,10 +91,11 @@ ErrorStruct SndfileErrors [] = { SFE_NO_PIPE_WRITE , "Error : this file format does not support pipe write." }, { SFE_BAD_VIRTUAL_IO , "Error : bad pointer on SF_VIRTUAL_IO struct." }, { SFE_BAD_BROADCAST_INFO_SIZE - , "Error : bad size in SF_BROADCAST_INFO struct." }, + , "Error : bad coding_history_size in SF_BROADCAST_INFO struct." }, { SFE_BAD_BROADCAST_INFO_TOO_BIG , "Error : SF_BROADCAST_INFO struct too large." }, - + { SFE_BAD_CART_INFO_SIZE , "Error: SF_CART_INFO struct too large." }, + { SFE_BAD_CART_INFO_TOO_BIG , "Error: bad tag_text_size in SF_CART_INFO struct." }, { SFE_INTERLEAVE_MODE , "Attempt to write to file with non-interleaved data." }, { SFE_INTERLEAVE_SEEK , "Bad karma in seek during interleave read operation." }, { SFE_INTERLEAVE_READ , "Bad karma in read during interleave read operation." }, @@ -103,6 +105,7 @@ ErrorStruct SndfileErrors [] = { SFE_BAD_ENDIAN , "Bad endian-ness. Try default endian-ness" }, { SFE_CHANNEL_COUNT_ZERO , "Channel count is zero." }, { SFE_CHANNEL_COUNT , "Too many channels specified." }, + { SFE_CHANNEL_COUNT_BAD , "Bad channel count." }, { SFE_BAD_SEEK , "Internal psf_fseek() failed." }, { SFE_NOT_SEEKABLE , "Seek attempted on unseekable file type." }, @@ -144,7 +147,9 @@ ErrorStruct SndfileErrors [] = { SFE_WAV_ADPCM_NOT4BIT , "Error in ADPCM WAV file. Invalid bit width." }, { SFE_WAV_ADPCM_CHANNELS , "Error in ADPCM WAV file. Invalid number of channels." }, + { SFE_WAV_ADPCM_SAMPLES , "Error in ADPCM WAV file. Invalid number of samples per block." }, { SFE_WAV_GSM610_FORMAT , "Error in GSM610 WAV file. Invalid format chunk." }, + { SFE_WAV_NMS_FORMAT , "Error in NMS ADPCM WAV file. Invalid format chunk." }, { SFE_AIFF_NO_FORM , "Error in AIFF file, bad 'FORM' marker." }, { SFE_AIFF_AIFF_NO_FORM , "Error in AIFF file, 'AIFF' marker without 'FORM'." }, @@ -164,15 +169,15 @@ ErrorStruct SndfileErrors [] = { SFE_AU_EMBED_BAD_LEN , "Embedded AU file with unknown length." }, { SFE_RAW_READ_BAD_SPEC , "Error while opening RAW file for read. Must specify format and channels.\n" - "Possibly trying to open unsupported format." - }, + "Possibly trying to open unsupported format." }, { SFE_RAW_BAD_BITWIDTH , "Error. RAW file bitwidth must be a multiple of 8." }, - { SFE_RAW_BAD_FORMAT , "Error. Bad format field in SF_INFO struct when openning a RAW file for read." }, + { SFE_RAW_BAD_FORMAT , "Error. Bad format field in SF_INFO struct when opening a RAW file for read." }, { SFE_PAF_NO_MARKER , "Error in PAF file, no marker." }, { SFE_PAF_VERSION , "Error in PAF file, bad version." }, { SFE_PAF_UNKNOWN_FORMAT , "Error in PAF file, unknown format." }, { SFE_PAF_SHORT_HEADER , "Error in PAF file. File shorter than minimal header." }, + { SFE_PAF_BAD_CHANNELS , "Error in PAF file. Bad channel count." }, { SFE_SVX_NO_FORM , "Error in 8SVX / 16SV file, no 'FORM' marker." }, { SFE_SVX_NO_BODY , "Error in 8SVX / 16SV file, no 'BODY' marker." }, @@ -197,7 +202,7 @@ ErrorStruct SndfileErrors [] = { SFE_IRCAM_NO_MARKER , "Error in IRCAM file, bad IRCAM marker." }, { SFE_IRCAM_BAD_CHANNELS , "Error in IRCAM file, bad channel count." }, - { SFE_IRCAM_UNKNOWN_FORMAT, "Error in IRCAM file, unknow encoding format." }, + { SFE_IRCAM_UNKNOWN_FORMAT, "Error in IRCAM file, unknown encoding format." }, { SFE_W64_64_BIT , "Error in W64 file, file contains 64 bit offset." }, { SFE_W64_NO_RIFF , "Error in W64 file. No 'riff' chunk marker." }, @@ -237,9 +242,10 @@ ErrorStruct SndfileErrors [] = { SFE_FLAC_BAD_HEADER , "Error : bad flac header." }, { SFE_FLAC_NEW_DECODER , "Error : problem while creating flac decoder." }, - { SFE_FLAC_INIT_DECODER , "Error : problem while initialization of the flac decoder." }, + { SFE_FLAC_INIT_DECODER , "Error : problem with initialization of the flac decoder." }, { SFE_FLAC_LOST_SYNC , "Error : flac decoder lost sync." }, { SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." }, + { SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." }, { SFE_FLAC_UNKOWN_ERROR , "Error : unknown error in flac decoder." }, { SFE_WVE_NOT_WVE , "Error : not a WVE file." }, @@ -247,10 +253,25 @@ ErrorStruct SndfileErrors [] = { SFE_DWVW_BAD_BITWIDTH , "Error : Bad bit width for DWVW encoding. Must be 12, 16 or 24." }, { SFE_G72X_NOT_MONO , "Error : G72x encoding does not support more than 1 channel." }, + { SFE_NMS_ADPCM_NOT_MONO , "Error : NMS ADPCM encoding does not support more than 1 channel." }, { SFE_VORBIS_ENCODER_BUG , "Error : Sample rate chosen is known to trigger a Vorbis encoder bug on this CPU." }, { SFE_RF64_NOT_RF64 , "Error : Not an RF64 file." }, + { SFE_RF64_PEAK_B4_FMT , "Error in RF64 file. 'PEAK' chunk found before 'fmt ' chunk." }, + { SFE_RF64_NO_DATA , "Error in RF64 file. No 'data' chunk marker." }, + + { SFE_ALAC_FAIL_TMPFILE , "Error : Failed to open tmp file for ALAC encoding." }, + + { SFE_BAD_CHUNK_PTR , "Error : Bad SF_CHUNK_INFO pointer." }, + { SFE_UNKNOWN_CHUNK , "Error : Unknown chunk marker." }, + { SFE_BAD_CHUNK_FORMAT , "Error : Reading/writing chunks from this file format is not supported." }, + { SFE_BAD_CHUNK_MARKER , "Error : Bad chunk marker." }, + { SFE_BAD_CHUNK_DATA_PTR , "Error : Bad data pointer in SF_CHUNK_INFO struct." }, + { SFE_FILENAME_TOO_LONG , "Error : Supplied filename too long." }, + { SFE_NEGATIVE_RW_LEN , "Error : Length parameter passed to read/write is negative." }, + + { SFE_OPUS_BAD_SAMPLERATE , "Error : Opus only supports sample rates of 8000, 12000, 16000, 24000 and 48000." }, { SFE_MAX_ERROR , "Maximum error number." }, { SFE_MAX_ERROR + 1 , NULL } @@ -264,7 +285,7 @@ static int guess_file_type (SF_PRIVATE *psf) ; static int validate_sfinfo (SF_INFO *sfinfo) ; static int validate_psf (SF_PRIVATE *psf) ; static void save_header_info (SF_PRIVATE *psf) ; -static void copy_filename (SF_PRIVATE *psf, const char *path) ; +static int copy_filename (SF_PRIVATE *psf, const char *path) ; static int psf_close (SF_PRIVATE *psf) ; static int try_resource_fork (SF_PRIVATE * psf) ; @@ -274,13 +295,13 @@ static int try_resource_fork (SF_PRIVATE * psf) ; */ int sf_errno = 0 ; -static char sf_logbuffer [SF_BUFFER_LEN] = { 0 } ; +static char sf_parselog [SF_BUFFER_LEN] = { 0 } ; static char sf_syserr [SF_SYSERR_LEN] = { 0 } ; /*------------------------------------------------------------------------------ */ -#define VALIDATE_SNDFILE_AND_ASSIGN_PSF(a,b,c) \ +#define VALIDATE_SNDFILE_AND_ASSIGN_PSF(a, b, c) \ { if ((a) == NULL) \ { sf_errno = SFE_BAD_SNDFILE_PTR ; \ return 0 ; \ @@ -307,19 +328,21 @@ sf_open (const char *path, int mode, SF_INFO *sfinfo) { SF_PRIVATE *psf ; /* Ultimate sanity check. */ - SF_ASSERT (sizeof (sf_count_t) == 8) ; + assert (sizeof (sf_count_t) == 8) ; - if ((psf = calloc (1, sizeof (SF_PRIVATE))) == NULL) + if ((psf = psf_allocate ()) == NULL) { sf_errno = SFE_MALLOC_FAILED ; return NULL ; } ; - memset (psf, 0, sizeof (SF_PRIVATE)) ; psf_init_files (psf) ; psf_log_printf (psf, "File : %s\n", path) ; - copy_filename (psf, path) ; + if (copy_filename (psf, path) != 0) + { sf_errno = psf->error ; + return NULL ; + } ; psf->file.mode = mode ; if (strcmp (path, "-") == 0) @@ -339,7 +362,7 @@ sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc) return NULL ; } ; - if ((psf = calloc (1, sizeof (SF_PRIVATE))) == NULL) + if ((psf = psf_allocate ()) == NULL) { sf_errno = SFE_MALLOC_FAILED ; return NULL ; } ; @@ -363,25 +386,31 @@ sf_open_virtual (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user { SF_PRIVATE *psf ; /* Make sure we have a valid set ot virtual pointers. */ - if (sfvirtual->get_filelen == NULL || sfvirtual->seek == NULL || sfvirtual->tell == NULL) + if (sfvirtual->get_filelen == NULL) { sf_errno = SFE_BAD_VIRTUAL_IO ; - snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_get_filelen / vio_seek / vio_tell in SF_VIRTUAL_IO struct.\n") ; + snprintf (sf_parselog, sizeof (sf_parselog), "Bad vio_get_filelen in SF_VIRTUAL_IO struct.\n") ; + return NULL ; + } ; + + if ((sfvirtual->seek == NULL || sfvirtual->tell == NULL) && sfinfo->seekable) + { sf_errno = SFE_BAD_VIRTUAL_IO ; + snprintf (sf_parselog, sizeof (sf_parselog), "Bad vio_seek / vio_tell in SF_VIRTUAL_IO struct.\n") ; return NULL ; } ; if ((mode == SFM_READ || mode == SFM_RDWR) && sfvirtual->read == NULL) { sf_errno = SFE_BAD_VIRTUAL_IO ; - snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_read in SF_VIRTUAL_IO struct.\n") ; + snprintf (sf_parselog, sizeof (sf_parselog), "Bad vio_read in SF_VIRTUAL_IO struct.\n") ; return NULL ; } ; if ((mode == SFM_WRITE || mode == SFM_RDWR) && sfvirtual->write == NULL) { sf_errno = SFE_BAD_VIRTUAL_IO ; - snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_write in SF_VIRTUAL_IO struct.\n") ; + snprintf (sf_parselog, sizeof (sf_parselog), "Bad vio_write in SF_VIRTUAL_IO struct.\n") ; return NULL ; } ; - if ((psf = calloc (1, sizeof (SF_PRIVATE))) == NULL) + if ((psf = psf_allocate ()) == NULL) { sf_errno = SFE_MALLOC_FAILED ; return NULL ; } ; @@ -553,7 +582,6 @@ sf_format_check (const SF_INFO *info) switch (SF_CONTAINER (info->format)) { case SF_FORMAT_WAV : - case SF_FORMAT_WAVEX : /* WAV now allows both endian, RIFF or RIFX (little or big respectively) */ if (subformat == SF_FORMAT_PCM_U8 || subformat == SF_FORMAT_PCM_16) return 1 ; @@ -569,14 +597,30 @@ sf_format_check (const SF_INFO *info) return 1 ; if (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE) return 1 ; + if ((subformat == SF_FORMAT_NMS_ADPCM_16 || subformat == SF_FORMAT_NMS_ADPCM_24 || + subformat == SF_FORMAT_NMS_ADPCM_32) && info->channels == 1) + return 1 ; + break ; + + case SF_FORMAT_WAVEX : + if (endian == SF_ENDIAN_BIG || endian == SF_ENDIAN_CPU) + return 0 ; + if (subformat == SF_FORMAT_PCM_U8 || subformat == SF_FORMAT_PCM_16) + return 1 ; + if (subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32) + return 1 ; + if (subformat == SF_FORMAT_ULAW || subformat == SF_FORMAT_ALAW) + return 1 ; + if (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE) + return 1 ; break ; case SF_FORMAT_AIFF : /* AIFF does allow both endian-nesses for PCM data.*/ if (subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32) return 1 ; - /* Other encodings. Check for endian-ness. */ - if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU) + /* For other encodings reject any endian-ness setting. */ + if (endian != 0) return 0 ; if (subformat == SF_FORMAT_PCM_U8 || subformat == SF_FORMAT_PCM_S8) return 1 ; @@ -617,6 +661,10 @@ sf_format_check (const SF_INFO *info) return 1 ; if (subformat == SF_FORMAT_ULAW || subformat == SF_FORMAT_ALAW) return 1 ; + if (subformat == SF_FORMAT_ALAC_16 || subformat == SF_FORMAT_ALAC_20) + return 1 ; + if (subformat == SF_FORMAT_ALAC_24 || subformat == SF_FORMAT_ALAC_32) + return 1 ; if (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE) return 1 ; break ; @@ -637,12 +685,13 @@ sf_format_check (const SF_INFO *info) return 1 ; if (subformat == SF_FORMAT_VOX_ADPCM && info->channels == 1) return 1 ; + if ((subformat == SF_FORMAT_NMS_ADPCM_16 || subformat == SF_FORMAT_NMS_ADPCM_24 || + subformat == SF_FORMAT_NMS_ADPCM_32) && info->channels == 1) + return 1 ; break ; case SF_FORMAT_PAF : - if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16) - return 1 ; - if (subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32) + if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24) return 1 ; break ; @@ -668,13 +717,17 @@ sf_format_check (const SF_INFO *info) break ; case SF_FORMAT_IRCAM : - if (subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32) + if (info->channels > 256) + return 0 ; + if (subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_32) return 1 ; if (subformat == SF_FORMAT_ULAW || subformat == SF_FORMAT_ALAW || subformat == SF_FORMAT_FLOAT) return 1 ; break ; case SF_FORMAT_VOC : + if (info->channels > 2) + return 0 ; /* VOC is strictly little endian. */ if (endian == SF_ENDIAN_BIG || endian == SF_ENDIAN_CPU) return 0 ; @@ -729,31 +782,31 @@ sf_format_check (const SF_INFO *info) break ; case SF_FORMAT_HTK : + if (info->channels != 1) + return 0 ; /* HTK is strictly big endian. */ if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU) return 0 ; - if (info->channels != 1) - return 0 ; if (subformat == SF_FORMAT_PCM_16) return 1 ; break ; case SF_FORMAT_SDS : + if (info->channels != 1) + return 0 ; /* SDS is strictly big endian. */ if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU) return 0 ; - if (info->channels != 1) - return 0 ; if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24) return 1 ; break ; case SF_FORMAT_AVR : + if (info->channels > 2) + return 0 ; /* SDS is strictly big endian. */ if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU) return 0 ; - if (info->channels > 2) - return 0 ; if (subformat == SF_FORMAT_PCM_U8 || subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16) return 1 ; break ; @@ -762,6 +815,8 @@ sf_format_check (const SF_INFO *info) /* FLAC can't do more than 8 channels. */ if (info->channels > 8) return 0 ; + if (endian != SF_ENDIAN_FILE) + return 0 ; if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24) return 1 ; break ; @@ -770,31 +825,35 @@ sf_format_check (const SF_INFO *info) /* SD2 is strictly big endian. */ if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU) return 0 ; - if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24) + if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32) return 1 ; break ; case SF_FORMAT_WVE : + if (info->channels > 1) + return 0 ; /* WVE is strictly big endian. */ if (endian == SF_ENDIAN_BIG || endian == SF_ENDIAN_CPU) return 0 ; - if (info->channels > 1) - return 0 ; if (subformat == SF_FORMAT_ALAW) return 1 ; break ; case SF_FORMAT_OGG : + if (endian != SF_ENDIAN_FILE) + return 0 ; if (subformat == SF_FORMAT_VORBIS) return 1 ; + if (subformat == SF_FORMAT_OPUS) + return 1 ; break ; case SF_FORMAT_MPC2K : + if (info->channels > 2) + return 0 ; /* MPC2000 is strictly little endian. */ if (endian == SF_ENDIAN_BIG || endian == SF_ENDIAN_CPU) return 0 ; - if (info->channels > 2) - return 0 ; if (subformat == SF_FORMAT_PCM_16) return 1 ; break ; @@ -837,6 +896,7 @@ sf_version_string (void) int sf_command (SNDFILE *sndfile, int command, void *data, int datasize) { SF_PRIVATE *psf = (SF_PRIVATE *) sndfile ; + double quality ; int old_value ; /* This set of commands do not need the sndfile parameter. */ @@ -845,7 +905,7 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) if (data == NULL) { if (psf) psf->error = SFE_BAD_COMMAND_PARAM ; - return SFE_BAD_COMMAND_PARAM ; + return 0 ; } ; snprintf (data, datasize, "%s", sf_version_string ()) ; return strlen (data) ; @@ -892,7 +952,7 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) if (sndfile == NULL && command == SFC_GET_LOG_INFO) { if (data == NULL) return (sf_errno = SFE_BAD_COMMAND_PARAM) ; - snprintf (data, datasize, "%s", sf_logbuffer) ; + snprintf (data, datasize, "%s", sf_parselog) ; return strlen (data) ; } ; @@ -926,7 +986,8 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) psf->float_int_mult = (datasize != 0) ? SF_TRUE : SF_FALSE ; if (psf->float_int_mult && psf->float_max < 0.0) - psf->float_max = psf_calc_signal_max (psf, SF_FALSE) ; + /* Scale to prevent wrap-around distortion. */ + psf->float_max = (32768.0 / 32767.0) * psf_calc_signal_max (psf, SF_FALSE) ; return old_value ; case SFC_SET_SCALE_INT_FLOAT_WRITE : @@ -943,6 +1004,7 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) case SF_FORMAT_CAF : case SF_FORMAT_WAV : case SF_FORMAT_WAVEX : + case SF_FORMAT_RF64 : break ; default : @@ -985,8 +1047,8 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) case SFC_GET_LOG_INFO : if (data == NULL) return SFE_BAD_COMMAND_PARAM ; - snprintf (data, datasize, "%s", psf->logbuffer) ; - break ; + snprintf (data, datasize, "%s", psf->parselog.buf) ; + return strlen (data) ; case SFC_CALC_SIGNAL_MAX : if (data == NULL || datasize != sizeof (double)) @@ -1149,15 +1211,8 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) return SF_FALSE ; } ; -#if 0 - if (psf->broadcast_info == NULL) - psf->broadcast_info = broadcast_info_alloc () ; - - broadcast_info_copy (psf->broadcast_info, data) ; - broadcast_add_coding_history (psf->broadcast_info, psf->sf.channels, psf->sf.samplerate, psf->sf.format) ; -#else - broadcast_var_set (psf, data, datasize) ; -#endif + if (NOT (broadcast_var_set (psf, data, datasize))) + return SF_FALSE ; if (psf->write_header) psf->write_header (psf, SF_TRUE) ; @@ -1168,13 +1223,71 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) { psf->error = SFE_BAD_COMMAND_PARAM ; return SF_FALSE ; } ; -#if 0 - if (psf->broadcast_info == NULL) - return SF_FALSE ; - return broadcast_info_copy (data, psf->broadcast_info) ; -#else return broadcast_var_get (psf, data, datasize) ; -#endif + + case SFC_SET_CART_INFO : + { int format = SF_CONTAINER (psf->sf.format) ; + /* Only WAV and RF64 support cart chunk format */ + if (format != SF_FORMAT_WAV && format != SF_FORMAT_RF64) + return SF_FALSE ; + } ; + + /* Only makes sense in SFM_WRITE or SFM_RDWR mode */ + if ((psf->file.mode != SFM_WRITE) && (psf->file.mode != SFM_RDWR)) + return SF_FALSE ; + /* If data has already been written this must fail. */ + if (psf->cart_16k == NULL && psf->have_written) + { psf->error = SFE_CMD_HAS_DATA ; + return SF_FALSE ; + } ; + if (NOT (cart_var_set (psf, data, datasize))) + return SF_FALSE ; + if (psf->write_header) + psf->write_header (psf, SF_TRUE) ; + return SF_TRUE ; + + case SFC_GET_CART_INFO : + if (data == NULL) + { psf->error = SFE_BAD_COMMAND_PARAM ; + return SF_FALSE ; + } ; + return cart_var_get (psf, data, datasize) ; + + case SFC_GET_CUE_COUNT : + if (datasize != sizeof (uint32_t) || data == NULL) + { psf->error = SFE_BAD_COMMAND_PARAM ; + return SF_FALSE ; + } ; + if (psf->cues != NULL) + { *((uint32_t *) data) = psf->cues->cue_count ; + return SF_TRUE ; + } ; + return SF_FALSE ; + + case SFC_GET_CUE : + if (datasize < (int) sizeof (uint32_t) || data == NULL) + { psf->error = SFE_BAD_COMMAND_PARAM ; + return SF_FALSE ; + } ; + if (psf->cues == NULL) + return SF_FALSE ; + psf_get_cues (psf, data, datasize) ; + return SF_TRUE ; + + case SFC_SET_CUE : + if (psf->have_written) + { psf->error = SFE_CMD_HAS_DATA ; + return SF_FALSE ; + } ; + if (datasize < (int) sizeof (uint32_t) || data == NULL) + { psf->error = SFE_BAD_COMMAND_PARAM ; + return SF_FALSE ; + } ; + if (psf->cues == NULL && (psf->cues = psf_cues_dup (data, datasize)) == NULL) + { psf->error = SFE_MALLOC_FAILED ; + return SF_FALSE ; + } ; + return SF_TRUE ; case SFC_GET_INSTRUMENT : if (datasize != sizeof (SF_INSTRUMENT) || data == NULL) @@ -1255,6 +1368,15 @@ sf_command (SNDFILE *sndfile, int command, void *data, int datasize) return psf->command (psf, command, NULL, 0) ; return SF_FALSE ; + case SFC_SET_VBR_ENCODING_QUALITY : + if (data == NULL || datasize != sizeof (double)) + return SF_FALSE ; + + quality = *((double *) data) ; + quality = 1.0 - SF_MAX (0.0, SF_MIN (1.0, quality)) ; + return sf_command (sndfile, SFC_SET_COMPRESSION_LEVEL, &quality, sizeof (quality)) ; + + default : /* Must be a file specific command. Pass it on. */ if (psf->command) @@ -1409,6 +1531,59 @@ sf_set_string (SNDFILE *sndfile, int str_type, const char* str) return psf_set_string (psf, str_type, str) ; } /* sf_get_string */ +/*------------------------------------------------------------------------------ +*/ + +int +sf_current_byterate (SNDFILE *sndfile) +{ SF_PRIVATE *psf ; + + if ((psf = (SF_PRIVATE*) sndfile) == NULL) + return -1 ; + if (psf->Magick != SNDFILE_MAGICK) + return -1 ; + + /* This should cover all PCM and floating point formats. */ + if (psf->bytewidth) + return psf->sf.samplerate * psf->sf.channels * psf->bytewidth ; + + if (psf->byterate) + return psf->byterate (psf) ; + + switch (SF_CODEC (psf->sf.format)) + { case SF_FORMAT_IMA_ADPCM : + case SF_FORMAT_MS_ADPCM : + case SF_FORMAT_VOX_ADPCM : + return (psf->sf.samplerate * psf->sf.channels) / 2 ; + + case SF_FORMAT_GSM610 : + return (psf->sf.samplerate * psf->sf.channels * 13000) / 8000 ; + + case SF_FORMAT_NMS_ADPCM_16: + return psf->sf.samplerate / 4 + 10 ; + + case SF_FORMAT_NMS_ADPCM_24: + return psf->sf.samplerate * 3 / 8 + 10 ; + + case SF_FORMAT_NMS_ADPCM_32: + return psf->sf.samplerate / 2 + 10 ; + + case SF_FORMAT_G721_32 : /* 32kbs G721 ADPCM encoding. */ + return (psf->sf.samplerate * psf->sf.channels) / 2 ; + + case SF_FORMAT_G723_24 : /* 24kbs G723 ADPCM encoding. */ + return (psf->sf.samplerate * psf->sf.channels * 3) / 8 ; + + case SF_FORMAT_G723_40 : /* 40kbs G723 ADPCM encoding. */ + return (psf->sf.samplerate * psf->sf.channels * 5) / 8 ; + + default : + break ; + } ; + + return -1 ; +} /* sf_current_byterate */ + /*============================================================================== */ @@ -1418,6 +1593,9 @@ sf_read_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes) sf_count_t count, extra ; int bytewidth, blockwidth ; + if (bytes == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; bytewidth = (psf->bytewidth > 0) ? psf->bytewidth : 1 ; @@ -1466,8 +1644,16 @@ sf_read_short (SNDFILE *sndfile, short *ptr, sf_count_t len) { SF_PRIVATE *psf ; sf_count_t count, extra ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_WRITE) { psf->error = SFE_NOT_READMODE ; return 0 ; @@ -1478,7 +1664,7 @@ sf_read_short (SNDFILE *sndfile, short *ptr, sf_count_t len) return 0 ; } ; - if (len <= 0 || psf->read_current >= psf->sf.frames) + if (psf->read_current >= psf->sf.frames) { psf_memset (ptr, 0, len * sizeof (short)) ; return 0 ; /* End of file. */ } ; @@ -1513,14 +1699,22 @@ sf_readf_short (SNDFILE *sndfile, short *ptr, sf_count_t frames) { SF_PRIVATE *psf ; sf_count_t count, extra ; + if (frames == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (frames <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_WRITE) { psf->error = SFE_NOT_READMODE ; return 0 ; } ; - if (frames <= 0 || psf->read_current >= psf->sf.frames) + if (psf->read_current >= psf->sf.frames) { psf_memset (ptr, 0, frames * psf->sf.channels * sizeof (short)) ; return 0 ; /* End of file. */ } ; @@ -1558,8 +1752,16 @@ sf_read_int (SNDFILE *sndfile, int *ptr, sf_count_t len) { SF_PRIVATE *psf ; sf_count_t count, extra ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_WRITE) { psf->error = SFE_NOT_READMODE ; return 0 ; @@ -1570,7 +1772,7 @@ sf_read_int (SNDFILE *sndfile, int *ptr, sf_count_t len) return 0 ; } ; - if (len <= 0 || psf->read_current >= psf->sf.frames) + if (psf->read_current >= psf->sf.frames) { psf_memset (ptr, 0, len * sizeof (int)) ; return 0 ; } ; @@ -1605,14 +1807,22 @@ sf_readf_int (SNDFILE *sndfile, int *ptr, sf_count_t frames) { SF_PRIVATE *psf ; sf_count_t count, extra ; + if (frames == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (frames <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_WRITE) { psf->error = SFE_NOT_READMODE ; return 0 ; } ; - if (frames <= 0 || psf->read_current >= psf->sf.frames) + if (psf->read_current >= psf->sf.frames) { psf_memset (ptr, 0, frames * psf->sf.channels * sizeof (int)) ; return 0 ; } ; @@ -1650,8 +1860,16 @@ sf_read_float (SNDFILE *sndfile, float *ptr, sf_count_t len) { SF_PRIVATE *psf ; sf_count_t count, extra ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_WRITE) { psf->error = SFE_NOT_READMODE ; return 0 ; @@ -1662,7 +1880,7 @@ sf_read_float (SNDFILE *sndfile, float *ptr, sf_count_t len) return 0 ; } ; - if (len <= 0 || psf->read_current >= psf->sf.frames) + if (psf->read_current >= psf->sf.frames) { psf_memset (ptr, 0, len * sizeof (float)) ; return 0 ; } ; @@ -1697,14 +1915,22 @@ sf_readf_float (SNDFILE *sndfile, float *ptr, sf_count_t frames) { SF_PRIVATE *psf ; sf_count_t count, extra ; + if (frames == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (frames <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_WRITE) { psf->error = SFE_NOT_READMODE ; return 0 ; } ; - if (frames <= 0 || psf->read_current >= psf->sf.frames) + if (psf->read_current >= psf->sf.frames) { psf_memset (ptr, 0, frames * psf->sf.channels * sizeof (float)) ; return 0 ; } ; @@ -1742,8 +1968,16 @@ sf_read_double (SNDFILE *sndfile, double *ptr, sf_count_t len) { SF_PRIVATE *psf ; sf_count_t count, extra ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_WRITE) { psf->error = SFE_NOT_READMODE ; return 0 ; @@ -1754,7 +1988,7 @@ sf_read_double (SNDFILE *sndfile, double *ptr, sf_count_t len) return 0 ; } ; - if (len <= 0 || psf->read_current >= psf->sf.frames) + if (psf->read_current >= psf->sf.frames) { psf_memset (ptr, 0, len * sizeof (double)) ; return 0 ; } ; @@ -1789,14 +2023,22 @@ sf_readf_double (SNDFILE *sndfile, double *ptr, sf_count_t frames) { SF_PRIVATE *psf ; sf_count_t count, extra ; + if (frames == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (frames <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_WRITE) { psf->error = SFE_NOT_READMODE ; return 0 ; } ; - if (frames <= 0 || psf->read_current >= psf->sf.frames) + if (psf->read_current >= psf->sf.frames) { psf_memset (ptr, 0, frames * psf->sf.channels * sizeof (double)) ; return 0 ; } ; @@ -1835,8 +2077,16 @@ sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t len) sf_count_t count ; int bytewidth, blockwidth ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + bytewidth = (psf->bytewidth > 0) ? psf->bytewidth : 1 ; blockwidth = (psf->blockwidth > 0) ? psf->blockwidth : 1 ; @@ -1855,7 +2105,9 @@ sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t len) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf_fwrite (ptr, 1, len, psf) ; @@ -1864,12 +2116,14 @@ sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t len) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count ; } /* sf_write_raw */ @@ -1881,8 +2135,16 @@ sf_write_short (SNDFILE *sndfile, const short *ptr, sf_count_t len) { SF_PRIVATE *psf ; sf_count_t count ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_READ) { psf->error = SFE_NOT_WRITEMODE ; return 0 ; @@ -1903,7 +2165,9 @@ sf_write_short (SNDFILE *sndfile, const short *ptr, sf_count_t len) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf->write_short (psf, ptr, len) ; @@ -1912,12 +2176,14 @@ sf_write_short (SNDFILE *sndfile, const short *ptr, sf_count_t len) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count ; } /* sf_write_short */ @@ -1926,8 +2192,16 @@ sf_writef_short (SNDFILE *sndfile, const short *ptr, sf_count_t frames) { SF_PRIVATE *psf ; sf_count_t count ; + if (frames == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (frames <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_READ) { psf->error = SFE_NOT_WRITEMODE ; return 0 ; @@ -1943,7 +2217,9 @@ sf_writef_short (SNDFILE *sndfile, const short *ptr, sf_count_t frames) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf->write_short (psf, ptr, frames * psf->sf.channels) ; @@ -1952,12 +2228,14 @@ sf_writef_short (SNDFILE *sndfile, const short *ptr, sf_count_t frames) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count / psf->sf.channels ; } /* sf_writef_short */ @@ -1969,8 +2247,16 @@ sf_write_int (SNDFILE *sndfile, const int *ptr, sf_count_t len) { SF_PRIVATE *psf ; sf_count_t count ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_READ) { psf->error = SFE_NOT_WRITEMODE ; return 0 ; @@ -1991,7 +2277,9 @@ sf_write_int (SNDFILE *sndfile, const int *ptr, sf_count_t len) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf->write_int (psf, ptr, len) ; @@ -2000,12 +2288,14 @@ sf_write_int (SNDFILE *sndfile, const int *ptr, sf_count_t len) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count ; } /* sf_write_int */ @@ -2014,8 +2304,16 @@ sf_writef_int (SNDFILE *sndfile, const int *ptr, sf_count_t frames) { SF_PRIVATE *psf ; sf_count_t count ; + if (frames == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (frames <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_READ) { psf->error = SFE_NOT_WRITEMODE ; return 0 ; @@ -2031,7 +2329,9 @@ sf_writef_int (SNDFILE *sndfile, const int *ptr, sf_count_t frames) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf->write_int (psf, ptr, frames * psf->sf.channels) ; @@ -2040,12 +2340,14 @@ sf_writef_int (SNDFILE *sndfile, const int *ptr, sf_count_t frames) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count / psf->sf.channels ; } /* sf_writef_int */ @@ -2057,8 +2359,16 @@ sf_write_float (SNDFILE *sndfile, const float *ptr, sf_count_t len) { SF_PRIVATE *psf ; sf_count_t count ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_READ) { psf->error = SFE_NOT_WRITEMODE ; return 0 ; @@ -2079,7 +2389,9 @@ sf_write_float (SNDFILE *sndfile, const float *ptr, sf_count_t len) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf->write_float (psf, ptr, len) ; @@ -2088,12 +2400,14 @@ sf_write_float (SNDFILE *sndfile, const float *ptr, sf_count_t len) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count ; } /* sf_write_float */ @@ -2102,8 +2416,16 @@ sf_writef_float (SNDFILE *sndfile, const float *ptr, sf_count_t frames) { SF_PRIVATE *psf ; sf_count_t count ; + if (frames == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (frames <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_READ) { psf->error = SFE_NOT_WRITEMODE ; return 0 ; @@ -2119,7 +2441,9 @@ sf_writef_float (SNDFILE *sndfile, const float *ptr, sf_count_t frames) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf->write_float (psf, ptr, frames * psf->sf.channels) ; @@ -2128,12 +2452,14 @@ sf_writef_float (SNDFILE *sndfile, const float *ptr, sf_count_t frames) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count / psf->sf.channels ; } /* sf_writef_float */ @@ -2145,8 +2471,16 @@ sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t len) { SF_PRIVATE *psf ; sf_count_t count ; + if (len == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (len <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_READ) { psf->error = SFE_NOT_WRITEMODE ; return 0 ; @@ -2167,7 +2501,9 @@ sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t len) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf->write_double (psf, ptr, len) ; @@ -2176,12 +2512,14 @@ sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t len) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count ; } /* sf_write_double */ @@ -2190,8 +2528,16 @@ sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames) { SF_PRIVATE *psf ; sf_count_t count ; + if (frames == 0) + return 0 ; + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + if (frames <= 0) + { psf->error = SFE_NEGATIVE_RW_LEN ; + return 0 ; + } ; + if (psf->file.mode == SFM_READ) { psf->error = SFE_NOT_WRITEMODE ; return 0 ; @@ -2207,7 +2553,9 @@ sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames) return 0 ; if (psf->have_written == SF_FALSE && psf->write_header != NULL) - psf->write_header (psf, SF_FALSE) ; + { if ((psf->error = psf->write_header (psf, SF_FALSE))) + return 0 ; + } ; psf->have_written = SF_TRUE ; count = psf->write_double (psf, ptr, frames * psf->sf.channels) ; @@ -2216,12 +2564,14 @@ sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames) psf->last_op = SFM_WRITE ; + if (psf->write_current > psf->sf.frames) + { psf->sf.frames = psf->write_current ; + psf->dataend = 0 ; + } ; + if (psf->auto_header && psf->write_header != NULL) psf->write_header (psf, SF_TRUE) ; - if (psf->write_current > psf->sf.frames) - psf->sf.frames = psf->write_current ; - return count / psf->sf.channels ; } /* sf_writef_double */ @@ -2307,7 +2657,7 @@ format_from_extension (SF_PRIVATE *psf) static int guess_file_type (SF_PRIVATE *psf) -{ int buffer [3], format ; +{ uint32_t buffer [3], format ; if (psf_binheader_readf (psf, "b", &buffer, SIGNED_SIZEOF (buffer)) != SIGNED_SIZEOF (buffer)) { psf->error = SFE_BAD_FILE_READ ; @@ -2393,7 +2743,7 @@ guess_file_type (SF_PRIVATE *psf) return 0 /*-SF_FORMAT_WMA-*/ ; /* HMM (Hidden Markov Model) Tool Kit. */ - if (2 * BEI2H_INT (buffer [0]) + 12 == psf->filelength && buffer [2] == MAKE_MARKER (0, 2, 0, 0)) + if (buffer [2] == MAKE_MARKER (0, 2, 0, 0) && 2 * ((int64_t) BE2H_32 (buffer [0])) + 12 == psf->filelength) return SF_FORMAT_HTK ; if (buffer [0] == MAKE_MARKER ('f', 'L', 'a', 'C')) @@ -2469,14 +2819,19 @@ validate_psf (SF_PRIVATE *psf) static void save_header_info (SF_PRIVATE *psf) -{ snprintf (sf_logbuffer, sizeof (sf_logbuffer), "%s", psf->logbuffer) ; +{ snprintf (sf_parselog, sizeof (sf_parselog), "%s", psf->parselog.buf) ; } /* save_header_info */ -static void +static int copy_filename (SF_PRIVATE *psf, const char *path) { const char *ccptr ; char *cptr ; + if (strlen (path) > 1 && strlen (path) - 1 >= sizeof (psf->file.path.c)) + { psf->error = SFE_FILENAME_TOO_LONG ; + return psf->error ; + } ; + snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", path) ; if ((ccptr = strrchr (path, '/')) || (ccptr = strrchr (path, '\\'))) ccptr ++ ; @@ -2492,7 +2847,7 @@ copy_filename (SF_PRIVATE *psf, const char *path) else psf->file.dir.c [0] = 0 ; - return ; + return 0 ; } /* copy_filename */ /*============================================================================== @@ -2500,49 +2855,44 @@ copy_filename (SF_PRIVATE *psf, const char *path) static int psf_close (SF_PRIVATE *psf) -{ int error = 0 ; +{ uint32_t k ; + int error = 0 ; if (psf->codec_close) - error = psf->codec_close (psf) ; + { error = psf->codec_close (psf) ; + /* To prevent it being called in psf->container_close(). */ + psf->codec_close = NULL ; + } ; + if (psf->container_close) error = psf->container_close (psf) ; error = psf_fclose (psf) ; psf_close_rsrc (psf) ; - if (psf->container_data) - free (psf->container_data) ; + /* For an ISO C compliant implementation it is ok to free a NULL pointer. */ + free (psf->header.ptr) ; + free (psf->container_data) ; + free (psf->codec_data) ; + free (psf->interleave) ; + free (psf->dither) ; + free (psf->peak_info) ; + free (psf->broadcast_16k) ; + free (psf->loop_info) ; + free (psf->instrument) ; + free (psf->cues) ; + free (psf->channel_map) ; + free (psf->format_desc) ; + free (psf->strings.storage) ; - if (psf->codec_data) - free (psf->codec_data) ; + if (psf->wchunks.chunks) + for (k = 0 ; k < psf->wchunks.used ; k++) + free (psf->wchunks.chunks [k].data) ; + free (psf->rchunks.chunks) ; + free (psf->wchunks.chunks) ; + free (psf->iterator) ; + free (psf->cart_16k) ; - if (psf->interleave) - free (psf->interleave) ; - - if (psf->dither) - free (psf->dither) ; - - if (psf->peak_info) - free (psf->peak_info) ; - - if (psf->broadcast_16k) - free (psf->broadcast_16k) ; - - if (psf->loop_info) - free (psf->loop_info) ; - - if (psf->instrument) - free (psf->instrument) ; - - if (psf->channel_map) - free (psf->channel_map) ; - - if (psf->format_desc) - { psf->format_desc [0] = 0 ; - free (psf->format_desc) ; - } ; - - memset (psf, 0, sizeof (SF_PRIVATE)) ; free (psf) ; return error ; @@ -2553,7 +2903,7 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo) { int error, format ; sf_errno = error = 0 ; - sf_logbuffer [0] = 0 ; + sf_parselog [0] = 0 ; if (psf->error) { error = psf->error ; @@ -2570,11 +2920,6 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo) goto error_exit ; } ; - /* Zero out these fields. */ - sfinfo->frames = 0 ; - sfinfo->sections = 0 ; - sfinfo->seekable = 0 ; - if (psf->file.mode == SFM_READ) { if ((SF_CONTAINER (sfinfo->format)) == SF_FORMAT_RAW) { if (sf_format_check (sfinfo) == 0) @@ -2586,7 +2931,7 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo) memset (sfinfo, 0, sizeof (SF_INFO)) ; } ; - memcpy (&(psf->sf), sfinfo, sizeof (SF_INFO)) ; + memcpy (&psf->sf, sfinfo, sizeof (SF_INFO)) ; psf->Magick = SNDFILE_MAGICK ; psf->norm_float = SF_TRUE ; @@ -2661,7 +3006,7 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo) goto error_exit ; } ; - if (sf_format_check (&(psf->sf)) == 0) + if (sf_format_check (&psf->sf) == 0) { error = SFE_BAD_OPEN_FORMAT ; goto error_exit ; } ; @@ -2821,7 +3166,7 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo) /* Lite remove end */ default : - error = SFE_UNKNOWN_FORMAT ; + error = SF_ERR_UNRECOGNISED_FORMAT ; } ; if (error) @@ -2851,12 +3196,12 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo) if (psf->fileoffset > 0) psf_log_printf (psf, "Embedded file length : %D\n", psf->filelength) ; - if (psf->file.mode == SFM_RDWR && sf_format_check (&(psf->sf)) == 0) + if (psf->file.mode == SFM_RDWR && sf_format_check (&psf->sf) == 0) { error = SFE_BAD_MODE_RW ; goto error_exit ; } ; - if (validate_sfinfo (&(psf->sf)) == 0) + if (validate_sfinfo (&psf->sf) == 0) { psf_log_SF_INFO (psf) ; save_header_info (psf) ; error = SFE_BAD_SF_INFO ; @@ -2876,9 +3221,14 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo) psf->have_written = psf->sf.frames > 0 ? SF_TRUE : SF_FALSE ; } ; - memcpy (sfinfo, &(psf->sf), sizeof (SF_INFO)) ; + memcpy (sfinfo, &psf->sf, sizeof (SF_INFO)) ; - memcpy (sfinfo, &(psf->sf), sizeof (SF_INFO)) ; + if (psf->file.mode == SFM_WRITE) + { /* Zero out these fields. */ + sfinfo->frames = 0 ; + sfinfo->sections = 0 ; + sfinfo->seekable = 0 ; + } ; return (SNDFILE *) psf ; @@ -2887,7 +3237,7 @@ error_exit : if (error == SFE_SYSTEM) snprintf (sf_syserr, sizeof (sf_syserr), "%s", psf->syserr) ; - snprintf (sf_logbuffer, sizeof (sf_logbuffer), "%s", psf->logbuffer) ; + snprintf (sf_parselog, sizeof (sf_parselog), "%s", psf->parselog.buf) ; switch (error) { case SF_ERR_SYSTEM : @@ -2909,3 +3259,80 @@ error_exit : return NULL ; } /* psf_open_file */ +/*============================================================================== +** Chunk getting and setting. +** This works for AIFF, CAF, RF64 and WAV. +** It doesn't work for W64 because W64 uses weird GUID style chunk markers. +*/ + +int +sf_set_chunk (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) +{ SF_PRIVATE *psf ; + + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + + if (chunk_info == NULL || chunk_info->data == NULL) + return SFE_BAD_CHUNK_PTR ; + + if (psf->set_chunk) + return psf->set_chunk (psf, chunk_info) ; + + return SFE_BAD_CHUNK_FORMAT ; +} /* sf_set_chunk */ + +SF_CHUNK_ITERATOR * +sf_get_chunk_iterator (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) +{ SF_PRIVATE *psf ; + + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + + if (chunk_info) + return psf_get_chunk_iterator (psf, chunk_info->id) ; + + return psf_get_chunk_iterator (psf, NULL) ; +} /* sf_get_chunk_iterator */ + +SF_CHUNK_ITERATOR * +sf_next_chunk_iterator (SF_CHUNK_ITERATOR * iterator) +{ SF_PRIVATE *psf ; + SNDFILE *sndfile = iterator ? iterator->sndfile : NULL ; + + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + + if (psf->next_chunk_iterator) + return psf->next_chunk_iterator (psf, iterator) ; + + return NULL ; +} /* sf_get_chunk_iterator_next */ + +int +sf_get_chunk_size (const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ SF_PRIVATE *psf ; + SNDFILE *sndfile = iterator ? iterator->sndfile : NULL ; + + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + + if (chunk_info == NULL) + return SFE_BAD_CHUNK_PTR ; + + if (psf->get_chunk_size) + return psf->get_chunk_size (psf, iterator, chunk_info) ; + + return SFE_BAD_CHUNK_FORMAT ; +} /* sf_get_chunk_size */ + +int +sf_get_chunk_data (const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ SF_PRIVATE *psf ; + SNDFILE *sndfile = iterator ? iterator->sndfile : NULL ; + + VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ; + + if (chunk_info == NULL || chunk_info->data == NULL) + return SFE_BAD_CHUNK_PTR ; + + if (psf->get_chunk_data) + return psf->get_chunk_data (psf, iterator, chunk_info) ; + + return SFE_BAD_CHUNK_FORMAT ; +} /* sf_get_chunk_data */ diff --git a/lib-src/libsndfile/src/sndfile.h.in b/lib-src/libsndfile/src/sndfile.h.in index 3777e5f59..ccc648538 100644 --- a/lib-src/libsndfile/src/sndfile.h.in +++ b/lib-src/libsndfile/src/sndfile.h.in @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011Erik de Castro Lopo +** Copyright (C) 1999-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -30,6 +30,7 @@ #define SNDFILE_1 #include +#include #include #ifdef __cplusplus @@ -91,6 +92,10 @@ enum SF_FORMAT_GSM610 = 0x0020, /* GSM 6.10 encoding. */ SF_FORMAT_VOX_ADPCM = 0x0021, /* OKI / Dialogix ADPCM */ + SF_FORMAT_NMS_ADPCM_16 = 0x0022, /* 16kbs NMS G721-variant encoding. */ + SF_FORMAT_NMS_ADPCM_24 = 0x0023, /* 24kbs NMS G721-variant encoding. */ + SF_FORMAT_NMS_ADPCM_32 = 0x0024, /* 32kbs NMS G721-variant encoding. */ + SF_FORMAT_G721_32 = 0x0030, /* 32kbs G721 ADPCM encoding. */ SF_FORMAT_G723_24 = 0x0031, /* 24kbs G723 ADPCM encoding. */ SF_FORMAT_G723_40 = 0x0032, /* 40kbs G723 ADPCM encoding. */ @@ -104,6 +109,12 @@ enum SF_FORMAT_DPCM_16 = 0x0051, /* 16 bit differential PCM (XI only) */ SF_FORMAT_VORBIS = 0x0060, /* Xiph Vorbis encoding. */ + SF_FORMAT_OPUS = 0x0064, /* Xiph/Skype Opus encoding. */ + + SF_FORMAT_ALAC_16 = 0x0070, /* Apple Lossless Audio Codec (16 bit). */ + SF_FORMAT_ALAC_20 = 0x0071, /* Apple Lossless Audio Codec (20 bit). */ + SF_FORMAT_ALAC_24 = 0x0072, /* Apple Lossless Audio Codec (24 bit). */ + SF_FORMAT_ALAC_32 = 0x0073, /* Apple Lossless Audio Codec (32 bit). */ /* Endian-ness options. */ @@ -154,7 +165,6 @@ enum SFC_GET_MAX_ALL_CHANNELS = 0x1045, SFC_SET_ADD_PEAK_CHUNK = 0x1050, - SFC_SET_ADD_HEADER_PAD_CHUNK = 0x1051, SFC_UPDATE_HEADER_NOW = 0x1060, SFC_SET_UPDATE_HEADER_AUTO = 0x1061, @@ -174,6 +184,10 @@ enum SFC_SET_CLIPPING = 0x10C0, SFC_GET_CLIPPING = 0x10C1, + SFC_GET_CUE_COUNT = 0x10CD, + SFC_GET_CUE = 0x10CE, + SFC_SET_CUE = 0x10CF, + SFC_GET_INSTRUMENT = 0x10D0, SFC_SET_INSTRUMENT = 0x10D1, @@ -191,17 +205,35 @@ enum SFC_WAVEX_SET_AMBISONIC = 0x1200, SFC_WAVEX_GET_AMBISONIC = 0x1201, + /* + ** RF64 files can be set so that on-close, writable files that have less + ** than 4GB of data in them are converted to RIFF/WAV, as per EBU + ** recommendations. + */ + SFC_RF64_AUTO_DOWNGRADE = 0x1210, + SFC_SET_VBR_ENCODING_QUALITY = 0x1300, + SFC_SET_COMPRESSION_LEVEL = 0x1301, + + /* Cart Chunk support */ + SFC_SET_CART_INFO = 0x1400, + SFC_GET_CART_INFO = 0x1401, + + /* Opus files original samplerate metadata */ + SFC_SET_ORIGINAL_SAMPLERATE = 0x1500, + SFC_GET_ORIGINAL_SAMPLERATE = 0x1501, /* Following commands for testing only. */ SFC_TEST_IEEE_FLOAT_REPLACE = 0x6001, /* - ** SFC_SET_ADD_* values are deprecated and will disappear at some + ** These SFC_SET_ADD_* values are deprecated and will disappear at some ** time in the future. They are guaranteed to be here up to and - ** including version 1.0.8 to avoid breakage of existng software. + ** including version 1.0.8 to avoid breakage of existing software. ** They currently do nothing and will continue to do nothing. */ + SFC_SET_ADD_HEADER_PAD_CHUNK = 0x1051, + SFC_SET_ADD_DITHER_ON_WRITE = 0x1070, SFC_SET_ADD_DITHER_ON_READ = 0x1071 } ; @@ -232,7 +264,7 @@ enum */ #define SF_STR_FIRST SF_STR_TITLE -#define SF_STR_LAST SF_STR_LICENSE +#define SF_STR_LAST SF_STR_GENRE enum { /* True and false */ @@ -311,7 +343,7 @@ typedef struct SNDFILE_tag SNDFILE ; ** and the Microsoft compiler. */ -#if (defined (_MSCVER) || defined (_MSC_VER)) +#if (defined (_MSCVER) || defined (_MSC_VER) && (_MSC_VER < 1310)) typedef __int64 sf_count_t ; #define SF_COUNT_MAX 0x7fffffffffffffffi64 #else @@ -383,6 +415,28 @@ typedef struct sf_count_t length ; } SF_EMBED_FILE_INFO ; +/* +** Struct used to retrieve cue marker information from a file +*/ + +typedef struct +{ int32_t indx ; + uint32_t position ; + int32_t fcc_chunk ; + int32_t chunk_start ; + int32_t block_start ; + uint32_t sample_offset ; + char name [256] ; +} SF_CUE_POINT ; + +#define SF_CUES_VAR(count) \ + struct \ + { uint32_t cue_count ; \ + SF_CUE_POINT cue_points [count] ; \ + } + +typedef SF_CUES_VAR (100) SF_CUES ; + /* ** Structs used to retrieve music sample information from a file. */ @@ -406,9 +460,9 @@ typedef struct struct { int mode ; - unsigned int start ; - unsigned int end ; - unsigned int count ; + uint32_t start ; + uint32_t end ; + uint32_t count ; } loops [16] ; /* make variable in a sensible way */ } SF_INSTRUMENT ; @@ -426,7 +480,7 @@ typedef struct /* a full bar of 7/8 is 7 beats */ float bpm ; /* suggestion, as it can be calculated using other fields:*/ - /* file's lenght, file's sampleRate and our time_sig_den*/ + /* file's length, file's sampleRate and our time_sig_den*/ /* -> bpms are always the amount of _quarter notes_ per minute */ int root_key ; /* MIDI note, or -1 for None */ @@ -439,23 +493,61 @@ typedef struct */ #define SF_BROADCAST_INFO_VAR(coding_hist_size) \ struct \ - { char description [256] ; \ - char originator [32] ; \ - char originator_reference [32] ; \ - char origination_date [10] ; \ - char origination_time [8] ; \ - unsigned int time_reference_low ; \ - unsigned int time_reference_high ; \ - short version ; \ - char umid [64] ; \ - char reserved [190] ; \ - unsigned int coding_history_size ; \ - char coding_history [coding_hist_size] ; \ + { char description [256] ; \ + char originator [32] ; \ + char originator_reference [32] ; \ + char origination_date [10] ; \ + char origination_time [8] ; \ + uint32_t time_reference_low ; \ + uint32_t time_reference_high ; \ + short version ; \ + char umid [64] ; \ + int16_t loudness_value ; \ + int16_t loudness_range ; \ + int16_t max_true_peak_level ; \ + int16_t max_momentary_loudness ; \ + int16_t max_shortterm_loudness ; \ + char reserved [180] ; \ + uint32_t coding_history_size ; \ + char coding_history [coding_hist_size] ; \ } /* SF_BROADCAST_INFO is the above struct with coding_history field of 256 bytes. */ typedef SF_BROADCAST_INFO_VAR (256) SF_BROADCAST_INFO ; +struct SF_CART_TIMER +{ char usage [4] ; + int32_t value ; +} ; + +typedef struct SF_CART_TIMER SF_CART_TIMER ; + +#define SF_CART_INFO_VAR(p_tag_text_size) \ + struct \ + { char version [4] ; \ + char title [64] ; \ + char artist [64] ; \ + char cut_id [64] ; \ + char client_id [64] ; \ + char category [64] ; \ + char classification [64] ; \ + char out_cue [64] ; \ + char start_date [10] ; \ + char start_time [8] ; \ + char end_date [10] ; \ + char end_time [8] ; \ + char producer_app_id [64] ; \ + char producer_app_version [64] ; \ + char user_def [64] ; \ + int32_t level_reference ; \ + SF_CART_TIMER post_timers [8] ; \ + char reserved [276] ; \ + char url [1024] ; \ + uint32_t tag_text_size ; \ + char tag_text [p_tag_text_size] ; \ + } + +typedef SF_CART_INFO_VAR (256) SF_CART_INFO ; /* Virtual I/O functionality. */ @@ -487,7 +579,7 @@ SNDFILE* sf_open (const char *path, int mode, SF_INFO *sfinfo) ; /* Use the existing file descriptor to create a SNDFILE object. If close_desc ** is TRUE, the file descriptor will be closed when sf_close() is called. If -** it is FALSE, the descritor will not be closed. +** it is FALSE, the descriptor will not be closed. ** When passed a descriptor like this, the library will assume that the start ** of file header is at the current file offset. This allows sound files within ** larger container files to be read and/or written. @@ -525,7 +617,7 @@ const char* sf_error_number (int errnum) ; /* The following two error functions are deprecated but they will remain in the -** library for the forseeable future. The function sf_strerror() should be used +** library for the foreseeable future. The function sf_strerror() should be used ** in their place. */ @@ -555,6 +647,12 @@ int sf_format_check (const SF_INFO *info) ; ** On error all of these functions return -1. */ +enum +{ SF_SEEK_SET = SEEK_SET, + SF_SEEK_CUR = SEEK_CUR, + SF_SEEK_END = SEEK_END +} ; + sf_count_t sf_seek (SNDFILE *sndfile, sf_count_t frames, int whence) ; @@ -575,6 +673,18 @@ const char* sf_get_string (SNDFILE *sndfile, int str_type) ; const char * sf_version_string (void) ; +/* Return the current byterate at this point in the file. The byte rate in this +** case is the number of bytes per second of audio data. For instance, for a +** stereo, 18 bit PCM encoded file with an 16kHz sample rate, the byte rate +** would be 2 (stereo) * 2 (two bytes per sample) * 16000 => 64000 bytes/sec. +** For some file formats the returned value will be accurate and exact, for some +** it will be a close approximation, for some it will be the average bitrate for +** the whole file and for some it will be a time varying value that was accurate +** when the file was most recently read or written. +** To get the bitrate, multiple this value by 8. +** Returns -1 for unknown. +*/ +int sf_current_byterate (SNDFILE *sndfile) ; /* Functions for reading/writing the waveform data of a sound file. */ @@ -652,15 +762,110 @@ void sf_write_sync (SNDFILE *sndfile) ; ** #including */ -#if ENABLE_SNDFILE_WINDOWS_PROTOTYPES +#if (defined (ENABLE_SNDFILE_WINDOWS_PROTOTYPES) && ENABLE_SNDFILE_WINDOWS_PROTOTYPES) SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ; #endif + +/* Getting and setting of chunks from within a sound file. +** +** These functions allow the getting and setting of chunks within a sound file +** (for those formats which allow it). +** +** These functions fail safely. Specifically, they will not allow you to overwrite +** existing chunks or add extra versions of format specific reserved chunks but +** should allow you to retrieve any and all chunks (may not be implemented for +** all chunks or all file formats). +*/ + +struct SF_CHUNK_INFO +{ char id [64] ; /* The chunk identifier. */ + unsigned id_size ; /* The size of the chunk identifier. */ + unsigned datalen ; /* The size of that data. */ + void *data ; /* Pointer to the data. */ +} ; + +typedef struct SF_CHUNK_INFO SF_CHUNK_INFO ; + +/* Set the specified chunk info (must be done before any audio data is written +** to the file). This will fail for format specific reserved chunks. +** The chunk_info->data pointer must be valid until the file is closed. +** Returns SF_ERR_NO_ERROR on success or non-zero on failure. +*/ +int sf_set_chunk (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) ; + +/* +** An opaque structure to an iterator over the all chunks of a given id +*/ +typedef struct SF_CHUNK_ITERATOR SF_CHUNK_ITERATOR ; + +/* Get an iterator for all chunks matching chunk_info. +** The iterator will point to the first chunk matching chunk_info. +** Chunks are matching, if (chunk_info->id) matches the first +** (chunk_info->id_size) bytes of a chunk found in the SNDFILE* handle. +** If chunk_info is NULL, an iterator to all chunks in the SNDFILE* handle +** is returned. +** The values of chunk_info->datalen and chunk_info->data are ignored. +** If no matching chunks are found in the sndfile, NULL is returned. +** The returned iterator will stay valid until one of the following occurs: +** a) The sndfile is closed. +** b) A new chunk is added using sf_set_chunk(). +** c) Another chunk iterator function is called on the same SNDFILE* handle +** that causes the iterator to be modified. +** The memory for the iterator belongs to the SNDFILE* handle and is freed when +** sf_close() is called. +*/ +SF_CHUNK_ITERATOR * +sf_get_chunk_iterator (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) ; + +/* Iterate through chunks by incrementing the iterator. +** Increments the iterator and returns a handle to the new one. +** After this call, iterator will no longer be valid, and you must use the +** newly returned handle from now on. +** The returned handle can be used to access the next chunk matching +** the criteria as defined in sf_get_chunk_iterator(). +** If iterator points to the last chunk, this will free all resources +** associated with iterator and return NULL. +** The returned iterator will stay valid until sf_get_chunk_iterator_next +** is called again, the sndfile is closed or a new chunk us added. +*/ +SF_CHUNK_ITERATOR * +sf_next_chunk_iterator (SF_CHUNK_ITERATOR * iterator) ; + + +/* Get the size of the specified chunk. +** If the specified chunk exists, the size will be returned in the +** datalen field of the SF_CHUNK_INFO struct. +** Additionally, the id of the chunk will be copied to the id +** field of the SF_CHUNK_INFO struct and it's id_size field will +** be updated accordingly. +** If the chunk doesn't exist chunk_info->datalen will be zero, and the +** id and id_size fields will be undefined. +** The function will return SF_ERR_NO_ERROR on success or non-zero on +** failure. +*/ +int +sf_get_chunk_size (const SF_CHUNK_ITERATOR * it, SF_CHUNK_INFO * chunk_info) ; + +/* Get the specified chunk data. +** If the specified chunk exists, up to chunk_info->datalen bytes of +** the chunk data will be copied into the chunk_info->data buffer +** (allocated by the caller) and the chunk_info->datalen field +** updated to reflect the size of the data. The id and id_size +** field will be updated according to the retrieved chunk +** If the chunk doesn't exist chunk_info->datalen will be zero, and the +** id and id_size fields will be undefined. +** The function will return SF_ERR_NO_ERROR on success or non-zero on +** failure. +*/ +int +sf_get_chunk_data (const SF_CHUNK_ITERATOR * it, SF_CHUNK_INFO * chunk_info) ; + + #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ #endif /* SNDFILE_H */ - diff --git a/lib-src/libsndfile/src/sndfile.hh b/lib-src/libsndfile/src/sndfile.hh index d80ec4c30..d94e8643a 100644 --- a/lib-src/libsndfile/src/sndfile.hh +++ b/lib-src/libsndfile/src/sndfile.hh @@ -1,5 +1,5 @@ /* -** Copyright (C) 2005-2011 Erik de Castro Lopo +** Copyright (C) 2005-2017 Erik de Castro Lopo ** ** All rights reserved. ** @@ -57,6 +57,12 @@ #include #include // for std::nothrow +#if __cplusplus < 201100 +#ifndef nullptr +#define nullptr NULL +#endif +#endif + class SndfileHandle { private : struct SNDFILE_ref @@ -72,13 +78,15 @@ class SndfileHandle public : /* Default constructor */ - SndfileHandle (void) : p (NULL) {} ; + SndfileHandle (void) : p (nullptr) {} ; SndfileHandle (const char *path, int mode = SFM_READ, int format = 0, int channels = 0, int samplerate = 0) ; SndfileHandle (std::string const & path, int mode = SFM_READ, int format = 0, int channels = 0, int samplerate = 0) ; SndfileHandle (int fd, bool close_desc, int mode = SFM_READ, int format = 0, int channels = 0, int samplerate = 0) ; + SndfileHandle (SF_VIRTUAL_IO &sfvirtual, void *user_data, int mode = SFM_READ, + int format = 0, int channels = 0, int samplerate = 0) ; #ifdef ENABLE_SNDFILE_WINDOWS_PROTOTYPES SndfileHandle (LPCWSTR wpath, int mode = SFM_READ, @@ -91,9 +99,9 @@ class SndfileHandle SndfileHandle & operator = (const SndfileHandle &rhs) ; /* Mainly for debugging/testing. */ - int refCount (void) const { return (p == NULL) ? 0 : p->ref ; } + int refCount (void) const { return (p == nullptr) ? 0 : p->ref ; } - operator bool () const { return (p != NULL) ; } + operator bool () const { return (p != nullptr) ; } bool operator == (const SndfileHandle &rhs) const { return (p == rhs.p) ; } @@ -143,7 +151,7 @@ class SndfileHandle /**< Raw access to the handle. SndfileHandle keeps ownership. */ SNDFILE * rawHandle (void) ; - /**< Take ownership of handle, iff reference count is 1. */ + /**< Take ownership of handle, if reference count is 1. */ SNDFILE * takeOwnership (void) ; } ; @@ -153,20 +161,20 @@ class SndfileHandle inline SndfileHandle::SNDFILE_ref::SNDFILE_ref (void) -: ref (1) +: sf (nullptr), sfinfo (), ref (1) {} inline SndfileHandle::SNDFILE_ref::~SNDFILE_ref (void) -{ if (sf != NULL) sf_close (sf) ; } +{ if (sf != nullptr) sf_close (sf) ; } inline SndfileHandle::SndfileHandle (const char *path, int mode, int fmt, int chans, int srate) -: p (NULL) +: p (nullptr) { p = new (std::nothrow) SNDFILE_ref () ; - if (p != NULL) + if (p != nullptr) { p->ref = 1 ; p->sfinfo.frames = 0 ; @@ -184,11 +192,11 @@ SndfileHandle::SndfileHandle (const char *path, int mode, int fmt, int chans, in inline SndfileHandle::SndfileHandle (std::string const & path, int mode, int fmt, int chans, int srate) -: p (NULL) +: p (nullptr) { p = new (std::nothrow) SNDFILE_ref () ; - if (p != NULL) + if (p != nullptr) { p->ref = 1 ; p->sfinfo.frames = 0 ; @@ -206,14 +214,14 @@ SndfileHandle::SndfileHandle (std::string const & path, int mode, int fmt, int c inline SndfileHandle::SndfileHandle (int fd, bool close_desc, int mode, int fmt, int chans, int srate) -: p (NULL) +: p (nullptr) { if (fd < 0) return ; p = new (std::nothrow) SNDFILE_ref () ; - if (p != NULL) + if (p != nullptr) { p->ref = 1 ; p->sfinfo.frames = 0 ; @@ -229,9 +237,31 @@ SndfileHandle::SndfileHandle (int fd, bool close_desc, int mode, int fmt, int ch return ; } /* SndfileHandle fd constructor */ +inline +SndfileHandle::SndfileHandle (SF_VIRTUAL_IO &sfvirtual, void *user_data, int mode, int fmt, int chans, int srate) +: p (nullptr) +{ + p = new (std::nothrow) SNDFILE_ref () ; + + if (p != nullptr) + { p->ref = 1 ; + + p->sfinfo.frames = 0 ; + p->sfinfo.channels = chans ; + p->sfinfo.format = fmt ; + p->sfinfo.samplerate = srate ; + p->sfinfo.sections = 0 ; + p->sfinfo.seekable = 0 ; + + p->sf = sf_open_virtual (&sfvirtual, mode, &p->sfinfo, user_data) ; + } ; + + return ; +} /* SndfileHandle std::string constructor */ + inline SndfileHandle::~SndfileHandle (void) -{ if (p != NULL && --p->ref == 0) +{ if (p != nullptr && --p->ref == 0) delete p ; } /* SndfileHandle destructor */ @@ -239,7 +269,7 @@ SndfileHandle::~SndfileHandle (void) inline SndfileHandle::SndfileHandle (const SndfileHandle &orig) : p (orig.p) -{ if (p != NULL) +{ if (p != nullptr) ++p->ref ; } /* SndfileHandle copy constructor */ @@ -248,11 +278,11 @@ SndfileHandle::operator = (const SndfileHandle &rhs) { if (&rhs == this) return *this ; - if (p != NULL && --p->ref == 0) + if (p != nullptr && --p->ref == 0) delete p ; p = rhs.p ; - if (p != NULL) + if (p != nullptr) ++p->ref ; return *this ; @@ -377,18 +407,18 @@ SndfileHandle::writeRaw (const void *ptr, sf_count_t bytes) inline SNDFILE * SndfileHandle::rawHandle (void) -{ return (p ? p->sf : NULL) ; } +{ return (p ? p->sf : nullptr) ; } inline SNDFILE * SndfileHandle::takeOwnership (void) { - if (p == NULL || (p->ref != 1)) - return NULL ; + if (p == nullptr || (p->ref != 1)) + return nullptr ; SNDFILE * sf = p->sf ; - p->sf = NULL ; + p->sf = nullptr ; delete p ; - p = NULL ; + p = nullptr ; return sf ; } @@ -396,11 +426,11 @@ SndfileHandle::takeOwnership (void) inline SndfileHandle::SndfileHandle (LPCWSTR wpath, int mode, int fmt, int chans, int srate) -: p (NULL) +: p (nullptr) { p = new (std::nothrow) SNDFILE_ref () ; - if (p != NULL) + if (p != nullptr) { p->ref = 1 ; p->sfinfo.frames = 0 ; diff --git a/lib-src/libsndfile/src/strings.c b/lib-src/libsndfile/src/strings.c index 6135d63b2..7aadff6a6 100644 --- a/lib-src/libsndfile/src/strings.c +++ b/lib-src/libsndfile/src/strings.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -26,13 +26,11 @@ #include "common.h" #define STRINGS_DEBUG 0 -#if STRINGS_DEBUG -static void hexdump (void *data, int len) ; -#endif int psf_store_string (SF_PRIVATE *psf, int str_type, const char *str) -{ size_t len_remaining, str_len ; +{ char new_str [128] ; + size_t str_len ; int k, str_flags ; if (str == NULL) @@ -42,9 +40,9 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str) /* A few extra checks for write mode. */ if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) - { if ((psf->str_flags & SF_STR_ALLOW_START) == 0) + { if ((psf->strings.flags & SF_STR_ALLOW_START) == 0) return SFE_STR_NO_SUPPORT ; - if (psf->have_written && (psf->str_flags & SF_STR_ALLOW_END) == 0) + if (psf->have_written && (psf->strings.flags & SF_STR_ALLOW_END) == 0) return SFE_STR_NO_SUPPORT ; /* Only allow zero length strings for software. */ if (str_type != SF_STR_SOFTWARE && str_len == 0) @@ -54,17 +52,17 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str) /* Find the next free slot in table. */ for (k = 0 ; k < SF_MAX_STRINGS ; k++) { /* If we find a matching entry clear it. */ - if (psf->strings [k].type == str_type) - psf->strings [k].type = -1 ; + if (psf->strings.data [k].type == str_type) + psf->strings.data [k].type = -1 ; - if (psf->strings [k].type == 0) + if (psf->strings.data [k].type == 0) break ; } ; /* Determine flags */ str_flags = SF_STR_LOCATE_START ; if (psf->file.mode == SFM_RDWR || psf->have_written) - { if ((psf->str_flags & SF_STR_ALLOW_END) == 0) + { if ((psf->strings.flags & SF_STR_ALLOW_END) == 0) return SFE_STR_NO_ADD_END ; str_flags = SF_STR_LOCATE_END ; } ; @@ -73,58 +71,40 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str) if (k >= SF_MAX_STRINGS) return SFE_STR_MAX_COUNT ; - if (k == 0 && psf->str_end != NULL) - { psf_log_printf (psf, "SFE_STR_WEIRD : k == 0 && psf->str_end != NULL\n") ; + if (k == 0 && psf->strings.storage_used != 0) + { psf_log_printf (psf, "SFE_STR_WEIRD : k == 0 && psf->strings.storage_used != 0\n") ; return SFE_STR_WEIRD ; } ; - if (k != 0 && psf->str_end == NULL) - { psf_log_printf (psf, "SFE_STR_WEIRD : k != 0 && psf->str_end == NULL\n") ; + if (k != 0 && psf->strings.storage_used == 0) + { psf_log_printf (psf, "SFE_STR_WEIRD : k != 0 && psf->strings.storage_used == 0\n") ; return SFE_STR_WEIRD ; } ; /* Special case for the first string. */ if (k == 0) - psf->str_end = psf->str_storage ; - - len_remaining = SIGNED_SIZEOF (psf->str_storage) - (psf->str_end - psf->str_storage) ; - - if (len_remaining < str_len + 2) - return SFE_STR_MAX_DATA ; + psf->strings.storage_used = 0 ; switch (str_type) { case SF_STR_SOFTWARE : /* In write mode, want to append libsndfile-version to string. */ if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR) - { char new_str [128] ; - - if (strstr (str, PACKAGE) == NULL) + { if (strstr (str, PACKAGE_NAME) == NULL) { /* ** If the supplied string does not already contain a ** libsndfile-X.Y.Z component, then add it. */ if (strlen (str) == 0) - snprintf (new_str, sizeof (new_str), "%s-%s", PACKAGE, VERSION) ; + snprintf (new_str, sizeof (new_str), "%s-%s", PACKAGE_NAME, PACKAGE_VERSION) ; else - snprintf (new_str, sizeof (new_str), "%s (%s-%s)", str, PACKAGE, VERSION) ; + snprintf (new_str, sizeof (new_str), "%s (%s-%s)", str, PACKAGE_NAME, PACKAGE_VERSION) ; } else snprintf (new_str, sizeof (new_str), "%s", str) ; str = new_str ; - str_len = strlen (str) ; - - psf->strings [k].type = str_type ; - psf->strings [k].str = psf->str_end ; - psf->strings [k].flags = str_flags ; - - memcpy (psf->str_end, str, str_len + 1) ; - /* Plus one to catch string terminator. */ - psf->str_end += str_len + 1 ; - break ; } ; - - /* Fall though if not write mode. */ + break ; case SF_STR_TITLE : case SF_STR_COPYRIGHT : @@ -135,13 +115,6 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str) case SF_STR_LICENSE : case SF_STR_TRACKNUMBER : case SF_STR_GENRE : - psf->strings [k].type = str_type ; - psf->strings [k].str = psf->str_end ; - psf->strings [k].flags = str_flags ; - - /* Plus one to catch string terminator. */ - memcpy (psf->str_end, str, str_len + 1) ; - psf->str_end += str_len + 1 ; break ; default : @@ -149,16 +122,35 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str) return SFE_STR_BAD_TYPE ; } ; - psf->str_flags |= str_flags ; + /* Plus one to catch string terminator. */ + str_len = strlen (str) + 1 ; + + if (psf->strings.storage_used + str_len + 1 > psf->strings.storage_len) + { char * temp = psf->strings.storage ; + size_t newlen = 2 * psf->strings.storage_len + str_len + 1 ; + + newlen = newlen < 256 ? 256 : newlen ; + + if ((psf->strings.storage = realloc (temp, newlen)) == NULL) + { psf->strings.storage = temp ; + return SFE_MALLOC_FAILED ; + } ; + + psf->strings.storage_len = newlen ; + } ; + + psf->strings.data [k].type = str_type ; + psf->strings.data [k].offset = psf->strings.storage_used ; + psf->strings.data [k].flags = str_flags ; + + memcpy (psf->strings.storage + psf->strings.storage_used, str, str_len) ; + psf->strings.storage_used += str_len ; + + psf->strings.flags |= str_flags ; #if STRINGS_DEBUG - psf_log_printf (psf, "str_storage : %X\n", (int) psf->str_storage) ; - psf_log_printf (psf, "str_end : %X\n", (int) psf->str_end) ; - psf_log_printf (psf, "sizeof (str_storage) : %d\n", SIGNED_SIZEOF (psf->str_storage)) ; - psf_log_printf (psf, "used : %d\n", (int ) (psf->str_end - psf->str_storage)) ; - psf_log_printf (psf, "remaining : %d\n", SIGNED_SIZEOF (psf->str_storage) - (psf->str_end - psf->str_storage)) ; - - hexdump (psf->str_storage, 300) ; + printf ("storage_used : %zd / %zd\n", psf->strings.storage_used, psf->strings.storage_len) ; + psf_hexdump (psf->strings.storage, psf->strings.storage_used) ; #endif return 0 ; @@ -177,8 +169,8 @@ psf_get_string (SF_PRIVATE *psf, int str_type) { int k ; for (k = 0 ; k < SF_MAX_STRINGS ; k++) - if (str_type == psf->strings [k].type) - return psf->strings [k].str ; + if (str_type == psf->strings.data [k].type) + return psf->strings.storage + psf->strings.data [k].offset ; return NULL ; } /* psf_get_string */ @@ -188,36 +180,8 @@ psf_location_string_count (const SF_PRIVATE * psf, int location) { int k, count = 0 ; for (k = 0 ; k < SF_MAX_STRINGS ; k++) - if (psf->strings [k].type > 0 && psf->strings [k].flags & location) + if (psf->strings.data [k].type > 0 && psf->strings.data [k].flags & location) count ++ ; return count ; } /* psf_location_string_count */ - -/*============================================================================== -*/ - -#if STRINGS_DEBUG - -#include -static void -hexdump (void *data, int len) -{ unsigned char *ptr ; - int k ; - - ptr = data ; - - puts ("---------------------------------------------------------") ; - while (len >= 16) - { for (k = 0 ; k < 16 ; k++) - printf ("%02X ", ptr [k] & 0xFF) ; - printf (" ") ; - for (k = 0 ; k < 16 ; k++) - printf ("%c", psf_isprint (ptr [k]) ? ptr [k] : '.') ; - puts ("") ; - ptr += 16 ; - len -= 16 ; - } ; -} /* hexdump */ - -#endif diff --git a/lib-src/libsndfile/src/svx.c b/lib-src/libsndfile/src/svx.c index b611f760a..72d803f13 100644 --- a/lib-src/libsndfile/src/svx.c +++ b/lib-src/libsndfile/src/svx.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -130,7 +130,7 @@ svx_open (SF_PRIVATE *psf) static int svx_read_header (SF_PRIVATE *psf) { VHDR_CHUNK vhdr ; - unsigned int FORMsize, vhdrsize, dword, marker ; + uint32_t chunk_size, marker ; int filetype = 0, parsestage = 0, done = 0 ; int bytecount = 0, channels ; @@ -146,28 +146,21 @@ svx_read_header (SF_PRIVATE *psf) psf->sf.format = SF_FORMAT_SVX ; while (! done) - { psf_binheader_readf (psf, "m", &marker) ; + { psf_binheader_readf (psf, "Em4", &marker, &chunk_size) ; + switch (marker) { case FORM_MARKER : if (parsestage) return SFE_SVX_NO_FORM ; - psf_binheader_readf (psf, "E4", &FORMsize) ; - - if (FORMsize != psf->filelength - 2 * sizeof (dword)) - { dword = psf->filelength - 2 * sizeof (dword) ; - psf_log_printf (psf, "FORM : %d (should be %d)\n", FORMsize, dword) ; - FORMsize = dword ; - } + if (chunk_size != psf->filelength - 2 * sizeof (chunk_size)) + psf_log_printf (psf, "FORM : %u (should be %u)\n", chunk_size, (uint32_t) psf->filelength - 2 * sizeof (chunk_size)) ; else - psf_log_printf (psf, "FORM : %d\n", FORMsize) ; + psf_log_printf (psf, "FORM : %u\n", chunk_size) ; parsestage |= HAVE_FORM ; - break ; - case SVX8_MARKER : - case SV16_MARKER : - if (! (parsestage & HAVE_FORM)) - return SFE_SVX_NO_FORM ; + psf_binheader_readf (psf, "m", &marker) ; + filetype = marker ; psf_log_printf (psf, " %M\n", marker) ; parsestage |= HAVE_SVX ; @@ -177,9 +170,7 @@ svx_read_header (SF_PRIVATE *psf) if (! (parsestage & (HAVE_FORM | HAVE_SVX))) return SFE_SVX_NO_FORM ; - psf_binheader_readf (psf, "E4", &vhdrsize) ; - - psf_log_printf (psf, " VHDR : %d\n", vhdrsize) ; + psf_log_printf (psf, " VHDR : %d\n", chunk_size) ; psf_binheader_readf (psf, "E4442114", &(vhdr.oneShotHiSamples), &(vhdr.repeatHiSamples), &(vhdr.samplesPerHiCycle), &(vhdr.samplesPerSec), &(vhdr.octave), &(vhdr.compression), @@ -222,8 +213,7 @@ svx_read_header (SF_PRIVATE *psf) if (! (parsestage & HAVE_VHDR)) return SFE_SVX_NO_BODY ; - psf_binheader_readf (psf, "E4", &dword) ; - psf->datalength = dword ; + psf->datalength = chunk_size ; psf->dataoffset = psf_ftell (psf) ; if (psf->dataoffset < 0) @@ -248,39 +238,33 @@ svx_read_header (SF_PRIVATE *psf) if (! (parsestage & HAVE_SVX)) return SFE_SVX_NO_FORM ; - psf_binheader_readf (psf, "E4", &dword) ; + psf_log_printf (psf, " %M : %u\n", marker, chunk_size) ; - psf_log_printf (psf, " %M : %d\n", marker, dword) ; - - if (strlen (psf->file.name.c) != dword) - { if (dword > sizeof (psf->file.name.c) - 1) + if (strlen (psf->file.name.c) != chunk_size) + { if (chunk_size > sizeof (psf->file.name.c) - 1) return SFE_SVX_BAD_NAME_LENGTH ; - psf_binheader_readf (psf, "b", psf->file.name.c, dword) ; - psf->file.name.c [dword] = 0 ; + psf_binheader_readf (psf, "b", psf->file.name.c, chunk_size) ; + psf->file.name.c [chunk_size] = 0 ; } else - psf_binheader_readf (psf, "j", dword) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; case ANNO_MARKER : if (! (parsestage & HAVE_SVX)) return SFE_SVX_NO_FORM ; - psf_binheader_readf (psf, "E4", &dword) ; + psf_log_printf (psf, " %M : %u\n", marker, chunk_size) ; - psf_log_printf (psf, " %M : %d\n", marker, dword) ; - - psf_binheader_readf (psf, "j", dword) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; case CHAN_MARKER : if (! (parsestage & HAVE_SVX)) return SFE_SVX_NO_FORM ; - psf_binheader_readf (psf, "E4", &dword) ; - - psf_log_printf (psf, " %M : %d\n", marker, dword) ; + psf_log_printf (psf, " %M : %u\n", marker, chunk_size) ; bytecount += psf_binheader_readf (psf, "E4", &channels) ; @@ -293,7 +277,7 @@ svx_read_header (SF_PRIVATE *psf) else psf_log_printf (psf, " Channels : %d *** assuming mono\n", channels) ; - psf_binheader_readf (psf, "j", dword - bytecount) ; + psf_binheader_readf (psf, "j", chunk_size - bytecount) ; break ; @@ -302,37 +286,38 @@ svx_read_header (SF_PRIVATE *psf) if (! (parsestage & HAVE_SVX)) return SFE_SVX_NO_FORM ; - psf_binheader_readf (psf, "E4", &dword) ; + psf_log_printf (psf, " %M : %u\n", marker, chunk_size) ; - psf_log_printf (psf, " %M : %d\n", marker, dword) ; - - psf_binheader_readf (psf, "j", dword) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; default : - if (psf_isprint ((marker >> 24) & 0xFF) && psf_isprint ((marker >> 16) & 0xFF) - && psf_isprint ((marker >> 8) & 0xFF) && psf_isprint (marker & 0xFF)) - { psf_binheader_readf (psf, "E4", &dword) ; - - psf_log_printf (psf, "%M : %d (unknown marker)\n", marker, dword) ; - - psf_binheader_readf (psf, "j", dword) ; + if (chunk_size >= 0xffff0000) + { done = SF_TRUE ; + psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D with length %u. Exiting parser.\n", marker, psf_ftell (psf) - 8, chunk_size) ; break ; } ; - if ((dword = psf_ftell (psf)) & 0x03) - { psf_log_printf (psf, " Unknown chunk marker at position %d. Resynching.\n", dword - 4) ; + + if (psf_isprint ((marker >> 24) & 0xFF) && psf_isprint ((marker >> 16) & 0xFF) + && psf_isprint ((marker >> 8) & 0xFF) && psf_isprint (marker & 0xFF)) + { psf_log_printf (psf, "%M : %u (unknown marker)\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size) ; + break ; + } ; + if ((chunk_size = psf_ftell (psf)) & 0x03) + { psf_log_printf (psf, " Unknown chunk marker at position %d. Resynching.\n", chunk_size - 4) ; psf_binheader_readf (psf, "j", -3) ; break ; } ; - psf_log_printf (psf, "*** Unknown chunk marker : %X. Exiting parser.\n", marker) ; - done = 1 ; + psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D. Exiting parser.\n", marker, psf_ftell (psf) - 8) ; + done = SF_TRUE ; } ; /* switch (marker) */ if (! psf->sf.seekable && (parsestage & HAVE_BODY)) break ; - if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (dword)) + if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (chunk_size)) break ; } ; /* while (1) */ @@ -372,41 +357,41 @@ svx_write_header (SF_PRIVATE *psf, int calc_length) psf->sf.frames = psf->datalength / (psf->bytewidth * psf->sf.channels) ; } ; - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; /* FORM marker and FORM size. */ - psf_binheader_writef (psf, "Etm8", FORM_MARKER, (psf->filelength < 8) ? - psf->filelength * 0 : psf->filelength - 8) ; + psf_binheader_writef (psf, "Etm8", BHWm (FORM_MARKER), BHW8 ((psf->filelength < 8) ? + psf->filelength * 0 : psf->filelength - 8)) ; - psf_binheader_writef (psf, "m", (psf->bytewidth == 1) ? SVX8_MARKER : SV16_MARKER) ; + psf_binheader_writef (psf, "m", BHWm ((psf->bytewidth == 1) ? SVX8_MARKER : SV16_MARKER)) ; /* VHDR chunk. */ - psf_binheader_writef (psf, "Em4", VHDR_MARKER, sizeof (VHDR_CHUNK)) ; + psf_binheader_writef (psf, "Em4", BHWm (VHDR_MARKER), BHW4 (sizeof (VHDR_CHUNK))) ; /* VHDR : oneShotHiSamples, repeatHiSamples, samplesPerHiCycle */ - psf_binheader_writef (psf, "E444", psf->sf.frames, 0, 0) ; + psf_binheader_writef (psf, "E444", BHW4 (psf->sf.frames), BHW4 (0), BHW4 (0)) ; /* VHDR : samplesPerSec, octave, compression */ - psf_binheader_writef (psf, "E211", psf->sf.samplerate, 1, 0) ; + psf_binheader_writef (psf, "E211", BHW2 (psf->sf.samplerate), BHW1 (1), BHW1 (0)) ; /* VHDR : volume */ - psf_binheader_writef (psf, "E4", (psf->bytewidth == 1) ? 0xFF : 0xFFFF) ; + psf_binheader_writef (psf, "E4", BHW4 ((psf->bytewidth == 1) ? 0xFF : 0xFFFF)) ; if (psf->sf.channels == 2) - psf_binheader_writef (psf, "Em44", CHAN_MARKER, 4, 6) ; + psf_binheader_writef (psf, "Em44", BHWm (CHAN_MARKER), BHW4 (4), BHW4 (6)) ; /* Filename and annotation strings. */ - psf_binheader_writef (psf, "Emsms", NAME_MARKER, psf->file.name.c, ANNO_MARKER, annotation) ; + psf_binheader_writef (psf, "Emsms", BHWm (NAME_MARKER), BHWs (psf->file.name.c), BHWm (ANNO_MARKER), BHWs (annotation)) ; /* BODY marker and size. */ - psf_binheader_writef (psf, "Etm8", BODY_MARKER, (psf->datalength < 0) ? - psf->datalength * 0 : psf->datalength) ; + psf_binheader_writef (psf, "Etm8", BHWm (BODY_MARKER), BHW8 ((psf->datalength < 0) ? + psf->datalength * 0 : psf->datalength)) ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; diff --git a/lib-src/libsndfile/src/test_audio_detect.c b/lib-src/libsndfile/src/test_audio_detect.c index 9706249ea..20926df03 100644 --- a/lib-src/libsndfile/src/test_audio_detect.c +++ b/lib-src/libsndfile/src/test_audio_detect.c @@ -23,6 +23,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include diff --git a/lib-src/libsndfile/src/test_binheader_writef.c b/lib-src/libsndfile/src/test_binheader_writef.c new file mode 100644 index 000000000..8b1f9c1ea --- /dev/null +++ b/lib-src/libsndfile/src/test_binheader_writef.c @@ -0,0 +1,61 @@ +/* +** Copyright (C) 2017 Erik de Castro Lopo +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include +#include + +#include "common.h" + +#include "test_main.h" + +void +test_binheader_writef (void) +{ char buffer [18] ; + SF_PRIVATE sf_private, *psf ; + int k, errors = 0 ; + + print_test_name ("Testing binheader_writef") ; + + memset (&sf_private, 0, sizeof (sf_private)) ; + + psf = &sf_private ; + for (k = 0 ; errors == 0 && k < 10 ; k++) + { psf_strlcpy (buffer, sizeof (buffer), "abcdefghijklmnop") ; + buffer [k] = 0 ; + + psf_binheader_writef (psf, "Ep", BHWp (buffer)) ; + + if ((psf->header.indx & 1) != 0) + errors = 1 ; + } ; + + free (psf->header.ptr) ; + + if (errors) + { puts ("\nExiting due to errors.\n") ; + exit (1) ; + } ; + + puts ("ok") ; +} /* test_log_printf */ + diff --git a/lib-src/libsndfile/src/test_broadcast_var.c b/lib-src/libsndfile/src/test_broadcast_var.c index 1f0240fd1..dbea94312 100644 --- a/lib-src/libsndfile/src/test_broadcast_var.c +++ b/lib-src/libsndfile/src/test_broadcast_var.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2010-2011 Erik de Castro Lopo +** Copyright (C) 2010-2012 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -57,8 +57,8 @@ fill_coding_history (SF_BROADCAST_INFO_512 * bi) return ; } /* fill_coding_listory */ -void -test_broadcast_var (void) +static void +test_broadcast_var_set (void) { SF_PRIVATE sf_private, *psf ; int k ; @@ -84,4 +84,36 @@ test_broadcast_var (void) free (psf->broadcast_16k) ; puts ("ok") ; +} /* test_broadcast_var_set */ + +static void +test_broadcast_var_zero (void) +{ SF_PRIVATE sf_private, *psf ; + SF_BROADCAST_INFO_VAR (0) bi ; + + psf = &sf_private ; + memset (psf, 0, sizeof (sf_private)) ; + psf->file.mode = SFM_RDWR ; + + print_test_name ("Testing broadcast_var_zero ") ; + + memset (&bi, 0, sizeof (bi)) ; + + broadcast_var_set (psf, (SF_BROADCAST_INFO*) &bi, sizeof (bi)) ; + + if (psf->broadcast_16k->coding_history_size != 0) + { printf ("\n\nLine %d: coding_history_size %d should be zero.\n\n", __LINE__, psf->broadcast_16k->coding_history_size) ; + exit (1) ; + } ; + + if (psf->broadcast_16k != NULL) + free (psf->broadcast_16k) ; + + puts ("ok") ; +} /* test_broadcast_var_zero */ + +void +test_broadcast_var (void) +{ test_broadcast_var_set () ; + test_broadcast_var_zero () ; } /* test_broadcast_var */ diff --git a/lib-src/libsndfile/src/test_cart_var.c b/lib-src/libsndfile/src/test_cart_var.c new file mode 100644 index 000000000..532a75587 --- /dev/null +++ b/lib-src/libsndfile/src/test_cart_var.c @@ -0,0 +1,91 @@ +/* +** Copyright (C) 2010-2013 Erik de Castro Lopo +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include + +#include "common.h" + +#include "test_main.h" + +#define CART_MAX 512 + +typedef SF_CART_INFO_VAR (CART_MAX) SF_CART_INFO_512 ; + +static void +fill_tag_text (SF_CART_INFO_512 * ci) +{ static const char *lines [] = + { "Lorem ipsum dolor sit amet,\nconsectetur adipiscing elit.", + "Donec dignissim erat\nvehicula libero condimentum\ndictum porta augue faucibus.", + "Maecenas nec turpis\nsit amet quam\nfaucibus adipiscing.", + "Mauris aliquam,\nlectus interdum\ntincidunt luctus.", + "\n\n\n\n\n\n\n\n\n\n\n\n", + "In auctor lorem\nvel est euismod\ncondimentum.", + "\n\n\n\n\n\n\n\n\n\n\n\n", + "Ut vitae magna\nid dui placerat vehicula\nin id lectus.", + "\n\n\n\n\n\n\n\n\n\n\n\n", + "Sed lacus leo,\nmolestie et luctus ac,\ntincidunt sit amet nisi.", + "\n\n\n\n\n\n\n\n\n\n\n\n", + "Sed ligula neque,\ngravida semper vulputate laoreet,\ngravida eu tellus.", + "Donec dolor dolor,\nscelerisque in consequat ornare,\ntempor nec nisl." + } ; + int k ; + + ci->tag_text [0] = 0 ; + + for (k = 0 ; strlen (ci->tag_text) < ci->tag_text_size - 1 ; k ++) + append_snprintf (ci->tag_text, ci->tag_text_size, "%s\n", lines [k % ARRAY_LEN (lines)]) ; + + return ; +} /* fill_tag_text */ + +void +test_cart_var (void) +{ SF_PRIVATE sf_private, *psf ; + SF_CART_TIMER timer ; + int k ; + + psf = &sf_private ; + memset (psf, 0, sizeof (sf_private)) ; + + print_test_name ("Testing cart_var_set ") ; + + for (k = 64 ; k < CART_MAX ; k++) + { + SF_CART_INFO_512 ci ; + + memset (&ci, 0, sizeof (ci)) ; + + memset (&timer, 0, sizeof (timer)) ; + memcpy (ci.post_timers, &timer, sizeof (timer)) ; + + ci.tag_text_size = k ; + fill_tag_text (&ci) ; + ci.tag_text_size -- ; + + cart_var_set (psf, (SF_CART_INFO*) &ci, sizeof (ci)) ; + } ; + + if (psf->cart_16k != NULL) + free (psf->cart_16k) ; + + puts ("ok") ; +} /* test_cart_var */ diff --git a/lib-src/libsndfile/src/test_conversions.c b/lib-src/libsndfile/src/test_conversions.c index 34600b0ab..329e22602 100644 --- a/lib-src/libsndfile/src/test_conversions.c +++ b/lib-src/libsndfile/src/test_conversions.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2006-2011 Erik de Castro Lopo +** Copyright (C) 2006-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -33,7 +33,7 @@ ** This is a bit rough, but it is the nicest way to do it. */ -#define cmp_test(line,ival,tval,str) \ +#define cmp_test(line, ival, tval, str) \ if (ival != tval) \ { printf (str, line, ival, tval) ; \ exit (1) ; \ @@ -70,7 +70,8 @@ conversion_test (char endian) } ; psf_binheader_writef (psf, format_str, i8, i16, i24, i32, i64) ; - psf_fwrite (psf->header, 1, psf->headindex, psf) ; + psf_fwrite (psf->header.ptr, 1, psf->header.indx, psf) ; + free (psf->header.ptr) ; psf_fclose (psf) ; memset (psf, 0, sizeof (sf_private)) ; @@ -84,6 +85,7 @@ conversion_test (char endian) } ; bytes = psf_binheader_readf (psf, format_str, &t8, &t16, &t24, &t32, &t64) ; + free (psf->header.ptr) ; psf_fclose (psf) ; if (bytes != 18) diff --git a/lib-src/libsndfile/src/test_endswap.c b/lib-src/libsndfile/src/test_endswap.c deleted file mode 100644 index 4931650c8..000000000 --- a/lib-src/libsndfile/src/test_endswap.c +++ /dev/null @@ -1,235 +0,0 @@ -/* -** Copyright (C) 2002-2011 Erik de Castro Lopo -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU Lesser General Public License as published by -** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include -#include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#include "common.h" -#include "sfendian.h" - -#include "test_main.h" - -#define FMT_SHORT "0x%04x\n" -#define FMT_INT "0x%08x\n" -#define FMT_INT64 "0x%016" PRIx64 "\n" - -/*============================================================================== -** Test functions. -*/ - - -static void -dump_short_array (const char * name, short * data, int datalen) -{ int k ; - - printf ("%-6s : ", name) ; - for (k = 0 ; k < datalen ; k++) - printf (FMT_SHORT, data [k]) ; - putchar ('\n') ; -} /* dump_short_array */ - -static void -test_endswap_short (void) -{ short orig [4], first [4], second [4] ; - int k ; - - printf (" %-40s : ", "test_endswap_short") ; - fflush (stdout) ; - - for (k = 0 ; k < ARRAY_LEN (orig) ; k++) - orig [k] = 0x3210 + k ; - - endswap_short_copy (first, orig, ARRAY_LEN (first)) ; - endswap_short_copy (second, first, ARRAY_LEN (second)) ; - - if (memcmp (orig, first, sizeof (orig)) == 0) - { printf ("\n\nLine %d : test 1 : these two array should not be the same:\n\n", __LINE__) ; - dump_short_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_short_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - if (memcmp (orig, second, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 2 : these two array should be the same:\n\n", __LINE__) ; - dump_short_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_short_array ("second", second, ARRAY_LEN (second)) ; - exit (1) ; - } ; - - endswap_short_array (first, ARRAY_LEN (first)) ; - - if (memcmp (orig, first, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 3 : these two array should be the same:\n\n", __LINE__) ; - dump_short_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_short_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - endswap_short_copy (first, orig, ARRAY_LEN (first)) ; - endswap_short_copy (first, first, ARRAY_LEN (first)) ; - - if (memcmp (orig, first, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 4 : these two array should be the same:\n\n", __LINE__) ; - dump_short_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_short_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - puts ("ok") ; -} /* test_endswap_short */ - -static void -dump_int_array (const char * name, int * data, int datalen) -{ int k ; - - printf ("%-6s : ", name) ; - for (k = 0 ; k < datalen ; k++) - printf (FMT_INT, data [k]) ; - putchar ('\n') ; -} /* dump_int_array */ - -static void -test_endswap_int (void) -{ int orig [4], first [4], second [4] ; - int k ; - - printf (" %-40s : ", "test_endswap_int") ; - fflush (stdout) ; - - for (k = 0 ; k < ARRAY_LEN (orig) ; k++) - orig [k] = 0x76543210 + k ; - - endswap_int_copy (first, orig, ARRAY_LEN (first)) ; - endswap_int_copy (second, first, ARRAY_LEN (second)) ; - - if (memcmp (orig, first, sizeof (orig)) == 0) - { printf ("\n\nLine %d : test 1 : these two array should not be the same:\n\n", __LINE__) ; - dump_int_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_int_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - if (memcmp (orig, second, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 2 : these two array should be the same:\n\n", __LINE__) ; - dump_int_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_int_array ("second", second, ARRAY_LEN (second)) ; - exit (1) ; - } ; - - endswap_int_array (first, ARRAY_LEN (first)) ; - - if (memcmp (orig, first, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 3 : these two array should be the same:\n\n", __LINE__) ; - dump_int_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_int_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - endswap_int_copy (first, orig, ARRAY_LEN (first)) ; - endswap_int_copy (first, first, ARRAY_LEN (first)) ; - - if (memcmp (orig, first, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 4 : these two array should be the same:\n\n", __LINE__) ; - dump_int_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_int_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - puts ("ok") ; -} /* test_endswap_int */ - -static void -dump_int64_t_array (const char * name, int64_t * data, int datalen) -{ int k ; - - printf ("%-6s : ", name) ; - for (k = 0 ; k < datalen ; k++) - printf (FMT_INT64, data [k]) ; - putchar ('\n') ; -} /* dump_int64_t_array */ - -static void -test_endswap_int64_t (void) -{ int64_t orig [4], first [4], second [4] ; - int k ; - - printf (" %-40s : ", "test_endswap_int64_t") ; - fflush (stdout) ; - - for (k = 0 ; k < ARRAY_LEN (orig) ; k++) - orig [k] = 0x0807050540302010LL + k ; - - endswap_int64_t_copy (first, orig, ARRAY_LEN (first)) ; - endswap_int64_t_copy (second, first, ARRAY_LEN (second)) ; - - if (memcmp (orig, first, sizeof (orig)) == 0) - { printf ("\n\nLine %d : test 1 : these two array should not be the same:\n\n", __LINE__) ; - dump_int64_t_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_int64_t_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - if (memcmp (orig, second, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 2 : these two array should be the same:\n\n", __LINE__) ; - dump_int64_t_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_int64_t_array ("second", second, ARRAY_LEN (second)) ; - exit (1) ; - } ; - - endswap_int64_t_array (first, ARRAY_LEN (first)) ; - - if (memcmp (orig, first, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 3 : these two array should be the same:\n\n", __LINE__) ; - dump_int64_t_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_int64_t_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - endswap_int64_t_copy (first, orig, ARRAY_LEN (first)) ; - endswap_int64_t_copy (first, first, ARRAY_LEN (first)) ; - - if (memcmp (orig, first, sizeof (orig)) != 0) - { printf ("\n\nLine %d : test 4 : these two array should be the same:\n\n", __LINE__) ; - dump_int64_t_array ("orig", orig, ARRAY_LEN (orig)) ; - dump_int64_t_array ("first", first, ARRAY_LEN (first)) ; - exit (1) ; - } ; - - puts ("ok") ; -} /* test_endswap_int64_t */ - - - -void -test_endswap (void) -{ - test_endswap_short () ; - test_endswap_int () ; - test_endswap_int64_t () ; - -} /* test_endswap */ - diff --git a/lib-src/libsndfile/src/test_endswap.def b/lib-src/libsndfile/src/test_endswap.def index c817322c9..1d6ab1f0d 100644 --- a/lib-src/libsndfile/src/test_endswap.def +++ b/lib-src/libsndfile/src/test_endswap.def @@ -2,19 +2,39 @@ autogen definitions test_endswap.tpl; int_type = { name = short ; - value = 0x3210 ; + value = '0x3210' ; format = FMT_SHORT ; } ; int_type = { name = int ; - value = 0x76543210 ; + value = '0x76543210' ; format = FMT_INT ; } ; int_type = { name = int64_t ; - value = "0x0807050540302010LL" ; + value = '0x0807050540302010LL' ; format = FMT_INT64 ; } ; +int_size = { + name = 16 ; + typename = int16_t ; + value = '0x4142' ; + strval = "AB" ; + } ; + +int_size = { + name = 32 ; + typename = int32_t ; + value = '0x30313233' ; + strval = "0123" ; + } ; + +int_size = { + name = 64 ; + typename = int64_t ; + value = '0x3031323334353637' ; + strval = "01234567" ; + } ; diff --git a/lib-src/libsndfile/src/test_endswap.tpl b/lib-src/libsndfile/src/test_endswap.tpl index ad7cee171..348a6be60 100644 --- a/lib-src/libsndfile/src/test_endswap.tpl +++ b/lib-src/libsndfile/src/test_endswap.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -27,6 +27,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include "common.h" @@ -56,7 +58,7 @@ dump_[+ (get "name") +]_array (const char * name, [+ (get "name") +] * data, int static void test_endswap_[+ (get "name") +] (void) { [+ (get "name") +] orig [4], first [4], second [4] ; - int k ; + int64_t k ; printf (" %-40s : ", "test_endswap_[+ (get "name") +]") ; fflush (stdout) ; @@ -105,6 +107,34 @@ test_endswap_[+ (get "name") +] (void) [+ ENDFOR int_type +] +[+ FOR int_size +] +static void +test_psf_put_be[+ (get "name") +] (void) +{ const char *test = "[+ (get "strval") +]" ; + uint8_t array [32] ; + int k ; + + printf (" %-40s : ", __func__) ; + fflush (stdout) ; + + for (k = 0 ; k < 10 ; k++) + { memset (array, 0, sizeof (array)) ; + + psf_put_be[+ (get "name") +] (array, k, [+ (get "value") +]) ; + if (memcmp (array + k, test, sizeof ([+ (get "typename") +])) != 0) + { printf ("\n\nLine %d : Put failed at index %d.\n", __LINE__, k) ; + exit (1) ; + } ; + if (psf_get_be[+ (get "name") +] (array, k) != [+ (get "value") +]) + { printf ("\n\nLine %d : Get failed at index %d.\n", __LINE__, k) ; + exit (1) ; + } ; + } ; + + puts ("ok") ; +} /* test_psf_put_be[+ (get "name") +] */ +[+ ENDFOR int_size ++] void test_endswap (void) @@ -113,5 +143,11 @@ test_endswap (void) +] test_endswap_[+ (get "name") +] () ; [+ ENDFOR int_type +] + +[+ FOR int_size ++] test_psf_put_be[+ (get "name") +] () ; +[+ ENDFOR int_size ++] + } /* test_endswap */ diff --git a/lib-src/libsndfile/src/test_file_io.c b/lib-src/libsndfile/src/test_file_io.c index 08fccebd2..36a85b0c3 100644 --- a/lib-src/libsndfile/src/test_file_io.c +++ b/lib-src/libsndfile/src/test_file_io.c @@ -23,6 +23,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -46,6 +48,7 @@ static void test_write_or_die (SF_PRIVATE *psf, void *data, sf_count_t bytes, sf static void test_read_or_die (SF_PRIVATE *psf, void *data, sf_count_t bytes, sf_count_t items, sf_count_t new_position, int linenum) ; static void test_equal_or_die (int *array1, int *array2, int len, int linenum) ; static void test_seek_or_die (SF_PRIVATE *psf, sf_count_t offset, int whence, sf_count_t new_position, int linenum) ; +static void test_tell_or_die (SF_PRIVATE *psf, sf_count_t expected_position, int linenum) ; @@ -324,6 +327,42 @@ file_truncate_test (const char *filename) puts ("ok") ; } /* file_truncate_test */ +static void +file_seek_with_offset_test (const char *filename) +{ SF_PRIVATE sf_data, *psf ; + sf_count_t real_end ; + const size_t fileoffset = 64 ; + + print_test_name ("Testing seek with offset") ; + + /* Open the file created by the previous test for reading. */ + memset (&sf_data, 0, sizeof (sf_data)) ; + psf = &sf_data ; + psf->file.mode = SFM_READ ; + snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", filename) ; + test_open_or_die (psf, __LINE__) ; + + /* Gather basic info before setting offset. */ + real_end = psf_fseek (psf, 0, SEEK_END) ; + test_tell_or_die (psf, real_end, __LINE__) ; + + /* Set the fileoffset (usually in a real system this is due to an id3 tag). */ + psf->fileoffset = fileoffset ; + + /* Check tell respects offset. */ + test_tell_or_die (psf, real_end - fileoffset, __LINE__) ; + + /* Check seeking works as expected. */ + test_seek_or_die (psf, 0, SEEK_SET, 0, __LINE__) ; + test_seek_or_die (psf, 0, SEEK_CUR, 0, __LINE__) ; + test_seek_or_die (psf, 0, SEEK_CUR, 0, __LINE__) ; + test_seek_or_die (psf, 0, SEEK_END, real_end - fileoffset, __LINE__) ; + + test_close_or_die (psf, __LINE__) ; + + puts ("ok") ; +} /* file_seek_with_offset_test */ + /*============================================================================== ** Testing helper functions. */ @@ -402,6 +441,20 @@ test_seek_or_die (SF_PRIVATE *psf, sf_count_t offset, int whence, sf_count_t new } /* test_seek_or_die */ +static void +test_tell_or_die (SF_PRIVATE *psf, sf_count_t expected_position, int linenum) +{ + sf_count_t retval ; + + retval = psf_ftell (psf) ; + + if (retval != expected_position) + { printf ("\n\nLine %d: psf_ftell() failed. Position reported as %" PRId64 " (should be %" PRId64 ").\n\n", + linenum, retval, expected_position) ; + exit (1) ; + } ; +} + static void test_equal_or_die (int *array1, int *array2, int len, int linenum) { int k ; @@ -431,6 +484,7 @@ test_file_io (void) file_open_test (filename) ; file_read_write_test (filename) ; + file_seek_with_offset_test (filename) ; file_truncate_test (filename) ; unlink (filename) ; diff --git a/lib-src/libsndfile/src/test_float.c b/lib-src/libsndfile/src/test_float.c index 9d0b09d8b..07879896e 100644 --- a/lib-src/libsndfile/src/test_float.c +++ b/lib-src/libsndfile/src/test_float.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2006-2011 Erik de Castro Lopo +** Copyright (C) 2006-2012 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -48,7 +48,7 @@ test_float_convert (void) test = float32_le_read (bytes) ; if (fabs (data [k] - test) > 1e-20) - { printf ("\n\nLine %d : Test %d, little endian error %.15g -> %.15g.\n\n", __LINE__, k, data [k], test ) ; + { printf ("\n\nLine %d : Test %d, little endian error %.15g -> %.15g.\n\n", __LINE__, k, data [k], test) ; exit (1) ; } ; @@ -85,7 +85,7 @@ test_double_convert (void) test = double64_le_read (bytes) ; if (fabs (data [k] - test) > 1e-20) - { printf ("\n\nLine %d : Test %d, little endian error %.15g -> %.15g.\n\n", __LINE__, k, data [k], test ) ; + { printf ("\n\nLine %d : Test %d, little endian error %.15g -> %.15g.\n\n", __LINE__, k, data [k], test) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/src/test_log_printf.c b/lib-src/libsndfile/src/test_log_printf.c index de9d45bcf..e1806a148 100644 --- a/lib-src/libsndfile/src/test_log_printf.c +++ b/lib-src/libsndfile/src/test_log_printf.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2003-2011 Erik de Castro Lopo +** Copyright (C) 2003-2012 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -28,39 +28,39 @@ #include "test_main.h" -#define CMP_0_ARGS(line,err,fmt) \ - { psf->logindex = 0 ; \ +#define CMP_0_ARGS(line, err, fmt) \ + { psf->parselog.indx = 0 ; \ snprintf (buffer, sizeof (buffer), (fmt)) ; \ psf_log_printf (psf, (fmt)) ; \ - err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ; \ + err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ; \ } -#define CMP_2_ARGS(line,err,fmt,a) \ - { psf->logindex = 0 ; \ +#define CMP_2_ARGS(line, err, fmt, a) \ + { psf->parselog.indx = 0 ; \ snprintf (buffer, sizeof (buffer), (fmt), (a), (a)) ; \ psf_log_printf (psf, (fmt), (a), (a)) ; \ - err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ; \ + err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ; \ } -#define CMP_4_ARGS(line,err,fmt,a) \ - { psf->logindex = 0 ; \ +#define CMP_4_ARGS(line, err, fmt, a) \ + { psf->parselog.indx = 0 ; \ snprintf (buffer, sizeof (buffer), (fmt), (a), (a), (a), (a)) ; \ psf_log_printf (psf, (fmt), (a), (a), (a), (a)) ; \ - err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ; \ + err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ; \ } -#define CMP_5_ARGS(line,err,fmt,a) \ - { psf->logindex = 0 ; \ +#define CMP_5_ARGS(line, err, fmt, a) \ + { psf->parselog.indx = 0 ; \ snprintf (buffer, sizeof (buffer), (fmt), (a), (a), (a), (a), (a)) ; \ psf_log_printf (psf, (fmt), (a), (a), (a), (a), (a)) ; \ - err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ; \ + err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ; \ } -#define CMP_6_ARGS(line,err,fmt,a) \ - { psf->logindex = 0 ; \ +#define CMP_6_ARGS(line, err, fmt, a) \ + { psf->parselog.indx = 0 ; \ snprintf (buffer, sizeof (buffer), (fmt), (a), (a), (a), (a), (a), (a)) ; \ psf_log_printf (psf, (fmt), (a), (a), (a), (a), (a), (a)) ; \ - err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ; \ + err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ; \ } static int diff --git a/lib-src/libsndfile/src/test_main.c b/lib-src/libsndfile/src/test_main.c index 669251448..f5a501d55 100644 --- a/lib-src/libsndfile/src/test_main.c +++ b/lib-src/libsndfile/src/test_main.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -20,21 +20,40 @@ #include #include +#if defined (HAVE_SYS_TYPES_H) && (HAVE_SYS_TYPES_H == 1) +#include +#endif #include #include #include #include "test_main.h" +static void +test_file_offsets_are_64_bit (void) +{ + print_test_name ("File offsets are 64 bit") ; + + // The Windows specific code path uses the 64 bit file I/O APIs. + if (! USE_WINDOWS_API && sizeof (off_t) != 8) + { printf ("\n\nError : sizeof (off_t) is %zd (should be 8).\n\n", sizeof (off_t)) ; + exit (1) ; + } ; + + puts ("ok") ; +} /* test_file_offsets_are_64_bit */ + int main (void) { + test_file_offsets_are_64_bit () ; test_conversions () ; test_endswap () ; test_float_convert () ; test_double_convert () ; test_log_printf () ; + test_binheader_writef () ; test_file_io () ; test_audio_detect () ; @@ -42,6 +61,9 @@ main (void) test_psf_strlcpy_crlf () ; test_broadcast_var () ; + test_cart_var () ; + + test_nms_adpcm () ; return 0 ; } /* main */ diff --git a/lib-src/libsndfile/src/test_main.h b/lib-src/libsndfile/src/test_main.h index 53b73116e..d08fb2e09 100644 --- a/lib-src/libsndfile/src/test_main.h +++ b/lib-src/libsndfile/src/test_main.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -27,6 +27,7 @@ print_test_name (const char * name) void test_conversions (void) ; void test_endswap (void) ; void test_log_printf (void) ; +void test_binheader_writef (void) ; void test_file_io (void) ; void test_float_convert (void) ; @@ -37,3 +38,7 @@ void test_ima_oki_adpcm (void) ; void test_psf_strlcpy_crlf (void) ; void test_broadcast_var (void) ; + +void test_cart_var (void) ; + +void test_nms_adpcm (void) ; diff --git a/lib-src/libsndfile/src/test_nms_adpcm.c b/lib-src/libsndfile/src/test_nms_adpcm.c new file mode 100644 index 000000000..8558a046d --- /dev/null +++ b/lib-src/libsndfile/src/test_nms_adpcm.c @@ -0,0 +1,400 @@ +/* +** Copyright (C) 2007-2018 Erik de Castro Lopo +** Copyright (C) 2017-2018 Arthur Taylor +** +** This library is free software; you can redistribute it and/or modify it +** under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2 of the License, or (at +** your option) any later version. +** +** This library 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 Lesser +** General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this library. If not, write to the Free Software Foundation, +** Fifth Floor, 51 Franklin Street, Boston, MA 02111-1301, USA. +*/ + +#include "sfconfig.h" + +#include + +#include "test_main.h" + +#include "nms_adpcm.c" + +static const short pcm_data_src [] = +{ 505, 743, 805, 409, 101, -552, -709, -679, + -624, -1174, -1050, 32, -401, -769, -679, 47, + -3273, -4425, -2158, -176, 824, 1057, 1245, 805, + 2414, 3282, 1739, -624, -1197, -1663, -913, 603, + 549, -614, 707, 3314, 2864, 1127, -294, -919, + -1251, -147, 30, -750, -131, 1394, 2197, 1829, + 1387, 417, 391, 533, 581, 179, -210, -210, + -884, -937, -1373, -1338, -1811, -2727, -2536, -1552, + -651, -3556, -7713, -9083, -6182, 1070, 4983, 5341, + 4596, 4682, 6488, 5197, 2401, -2702, -5261, -4036, + -1995, 463, 1056, 2436, 3238, 4395, 4478, 1130, + -2383, -4349, -4547, -3631, -1396, 1029, 2589, 3948, + 4966, 4312, 2362, 492, -1289, -2259, -1659, -597, + 239, 1433, 2353, 2512, 1763, 610, -291, -640, + 7, 132, 432, 438, -1070, -1202, -1071, -1841, + -462, 225, -4465, -11313, -10492, -4522, -2096, -7013, + -11770, -2546, 7687, 12765, 12014, 5324, 1645, 1191, + 3800, -187, -6689, -7778, -4631, 2487, 7352, 7928, + 4317, 2424, 3784, 2301, -1713, -6668, -8345, -6453, + -2303, 2269, 3232, 4114, 5054, 5054, 3768, 1060, + -1793, -3302, -2059, -86, 1153, 1690, 2869, 3841, + 3551, 1919, -197, -1391, -847, 128, 746, 1111, + 431, 559, 1086, 138, -1539, -2758, -1886, 1351, + 2407, -1883, -8356, -10999, -9917, -7329, -4295, -3209, + -11616, -15352, 1032, 12603, 13233, 9059, 4019, 1858, + 3368, 7454, -56, -8600, -7278, -818, 5478, 7039, + 5630, 1186, 1634, 5422, 2518, -3182, -8271, -7889, + -4399, -129, 3205, 2933, 3661, 5886, 6543, 3798, + 374, -2722, -3378, -1804, -24, 385, 1663, 3595, + 4749, 3865, 1402, -851, -1932, -1394, -725, -219, + 290, 658, 1074, 1638, 536, 204, -340, 408, + 1835, 1261, -2872, -4840, -5978, -8177, -7644, -6554, + -8093, -6174, -7796, -17019, -12355, 1280, 12576, 11868, + 10710, 8578, 5605, 9675, 7123, -977, -8770, -6740, + -1327, 2905, 6386, 5026, 3809, 5137, 6392, 2463, + -4924, -8830, -9572, -6122, -1608, 1677, 3379, 5660, + 8236, 7225, 4470, 295, -2628, -3572, -2107, -666, + 951, 3101, 5049, 4759, 2367, -140, -2078, -2471, + -2332, -1547, -798, 410, 1825, 3329, 3092, 352, + -3310, -3307, -1229, -415, 532, 2091, 465, -1430 +} ; + +/* pcm_data encoded as 16kbs from a known reference */ +static const unsigned short test_codes_16 [] = +{ 0x5777, 0xfff0, 0xdcd0, 0x672d, 0x1826, 0xc11c, 0x0822, 0xffee, + 0x3ddc, 0x6372, 0x0116, 0xc8d8, 0x6780, 0x8624, 0x3323, 0x33ef, + 0xd865, 0x4cd8, 0x3372, 0x1096, 0x0049, 0xa911, 0x1288, 0xa74d, + 0x3fee, 0xcc45, 0x52de, 0x6a72, 0x9118, 0xe291, 0x60a2, 0x3164, + 0x73fe, 0xeddf, 0x57b5, 0x185a, 0xe889, 0x460e, 0x2646, 0x8d87, + 0xe5ba, 0x004c +} ; + +/* pcm_data encoded as 24kbs from a known reference */ +static const unsigned short test_codes_24 [] = +{ 0x7776, 0x2fec, 0xceb0, 0xffd0, 0x3241, 0x650a, 0x0a26, 0x61ba, + 0xa10b, 0x3912, 0x39a8, 0xebfa, 0x1fff, 0x8552, 0x2342, 0x0204, + 0x454b, 0xccbb, 0x4318, 0xaa00, 0x1642, 0x3031, 0xfc8f, 0x38ff, + 0xf604, 0x4924, 0x2ddb, 0x0469, 0xbcaa, 0x83b6, 0x0049, 0x8828, + 0x2266, 0x3801, 0x873d, 0xcb86, 0x0eff, 0xef64, 0xd402, 0x44fa, + 0x2867, 0xd1d0, 0xa109, 0x2a11, 0x8a64, 0x4018, 0x1357, 0xd5a5, + 0x4bfc, 0xcbfe, 0x070a, 0x6307, 0x1858, 0x624b, 0xf9a9, 0x783b, + 0x0880, 0x1652, 0xc893, 0x641c, 0xf30d, 0x004c +} ; + +/* pcm_data encoded as 32kbs from a known reference */ +static const unsigned short test_codes_32 [] = +{ 0x7772, 0x0cdc, 0xbec2, 0xacb2, 0xff90, 0x1220, 0x551c, 0xcc84, + 0x2c47, 0x30aa, 0xa10b, 0x0663, 0x2812, 0x28a9, 0xf9ba, 0xceb9, + 0x1fec, 0x9553, 0x2361, 0x9ed8, 0x8314, 0x564b, 0xddba, 0x1346, + 0x6308, 0xab00, 0x0721, 0x2908, 0x3820, 0xf89c, 0x38ff, 0xa2bf, + 0xc535, 0x2933, 0x5de9, 0x8633, 0x8569, 0xbeca, 0x1186, 0x5528, + 0xd000, 0xaa21, 0x0473, 0x2800, 0x1112, 0xa64d, 0xdc17, 0x8eeb, + 0xccac, 0xfe74, 0xc501, 0x63f9, 0x2040, 0x3a73, 0xc9b9, 0x9188, + 0x7318, 0x0a81, 0x9a65, 0x5188, 0x00ba, 0x2256, 0xd5b6, 0x4bfa, + 0xbeac, 0xe8fe, 0x343b, 0x7117, 0x9ca4, 0x915a, 0x563d, 0xcad0, + 0xa837, 0x302a, 0x1a2a, 0x3561, 0x98a9, 0xb9b5, 0x578a, 0xc48b, + 0x25f0, 0x1000 +} ; + + +/* test_codes_16 decoded by a known reference */ +const short pcm_data_out16 [] = +{ 12, 16, 24, 36, 52, -68, -104, -156, + -224, -309, -433, 12, -449, -618, -851, 32, + -871, -1176, -1586, 60, 1172, 634, 1566, 983, + 1995, 2586, 1718, -1152, -815, -2313, -1610, 1261, + 1056, -253, 522, 1799, 2506, 1518, 72, -329, + -1510, -76, 337, -1144, 68, 1369, 2200, 1337, + 1016, 60, 405, 461, 433, 389, -36, -164, + -550, -871, -1212, -1626, -2136, -2791, -2064, -1642, + -485, -1566, -2538, -3445, -4481, 650, 4381, 3799, + 5807, 4742, 6674, 5590, 2072, -2228, -5650, -4983, + -1698, 441, 1333, 3064, 2855, 3815, 5108, 2156, + -2228, -3321, -5028, -4405, -1550, 771, 3232, 3273, + 4008, 5008, 2024, 859, -654, -2746, -1694, -136, + 68, 1409, 1759, 2453, 2016, 522, -514, -445, + 0, 305, 493, 518, -232, -1076, -1116, -1321, + -506, 365, -140, -1132, -2076, -2895, -2357, -2477, + -3325, -2859, 666, 4449, 7164, 6244, 1847, 1365, + 3827, -779, -7682, -8951, -3811, 1718, 6566, 7120, + 4674, 1959, 1819, 2032, -1104, -5220, -8518, -7626, + -2385, 2714, 3510, 3871, 4831, 4024, 4156, 1590, + -1694, -3437, -2393, 96, 959, 1847, 2775, 3638, + 3072, 1734, -204, -1730, -718, -92, 453, 807, + 220, 514, 1349, -40, -1285, -2477, -1566, 1273, + 2586, 546, -2887, -5534, -6883, -7461, -5281, -2224, + -2361, -5104, -48, 9228, 12140, 9048, 3614, 1927, + 4618, 6004, -148, -9871, -5582, -489, 6835, 6746, + 6839, 2851, 3028, 4566, 1461, -2028, -6883, -7642, + -5321, -610, 3385, 3461, 3088, 3389, 4570, 4321, + -389, -2630, -3369, -1706, -136, 220, 1594, 3024, + 4622, 4232, 1265, -943, -2273, -1638, -726, -232, + 365, 538, 995, 1530, 289, 453, -68, 12, + 1184, 1562, 92, -2558, -4859, -6277, -7096, -5461, + -4811, -6020, -8851, -12594, -11501, -943, 12927, 10449, + 8935, 10389, 5662, 5755, 9108, 1827, -10224, -7807, + -148, 3429, 7722, 5212, 4734, 3847, 5570, 3433, + -3931, -8244, -8461, -5397, -1710, 1919, 3787, 4558, + 5040, 5722, 4811, -441, -3140, -4180, -2397, -493, + 1309, 3064, 4116, 5040, 2759, -730, -2445, -2847, + -2080, -1682, -1124, 706, 2032, 3325, 3248, 425, + -3586, -2987, -1397, -188, 144, 1506, 4, -2028 +} ; + +/* test_codes_24 decoded by a known reference */ +static const short pcm_data_out24 [] = +{ 16, 32, 68, 140, 116, -232, -510, -650, + -771, -1329, -1052, -152, -317, -907, -710, -104, + -1144, -2132, -2598, -301, 662, 827, 1469, 702, + 2401, 2987, 1574, -244, -1481, -1365, -903, 738, + 369, -469, 473, 1630, 3124, 1542, -582, -1172, + -1381, -317, 4, -610, -40, 1236, 1843, 1493, + 1349, 417, 389, 630, 686, 188, -228, -168, + -742, -795, -1530, -1473, -1903, -3008, -2907, -1317, + -445, -2309, -4919, -8939, -5867, 1204, 5293, 5337, + 4871, 4562, 5602, 5104, 2485, -2337, -5594, -4240, + -1694, 867, 1281, 2622, 3638, 4228, 4654, 1405, + -1947, -4112, -4184, -3582, -1570, 1325, 2538, 4036, + 5144, 4630, 2718, 518, -1373, -2397, -1642, -453, + 349, 1566, 2558, 2493, 1927, 662, -365, -610, + -136, 188, 453, 437, -385, -1281, -1196, -1534, + -369, 265, -899, -3445, -7176, -4538, -2726, -5650, + -13152, -1694, 7040, 11489, 12224, 5971, 1971, 1779, + 3457, -373, -6040, -7714, -5008, 2594, 7658, 8156, + 4461, 2333, 4369, 2867, -1919, -7180, -8465, -6409, + -2618, 2152, 3120, 4208, 5570, 5558, 4120, 690, + -2088, -3345, -1975, -208, 1180, 1738, 2144, 3289, + 3686, 1819, -417, -1534, -875, 88, 678, 967, + 437, 558, 951, 20, -1638, -2558, -1967, 558, + 2289, 465, -4449, -11080, -8931, -6248, -4208, -3337, + -6493, -14550, -5068, 12305, 13261, 9742, 4261, 1851, + 3016, 6971, 441, -9554, -7096, -975, 5188, 6658, + 5409, 1341, 855, 6164, 1726, -2381, -7991, -7212, + -4799, -433, 3236, 3273, 3253, 4445, 6706, 3329, + 582, -2602, -3028, -1614, -152, 196, 1598, 3638, + 5144, 4016, 1586, -1004, -2016, -1401, -682, -128, + 273, 614, 963, 1614, 425, 269, -449, 277, + 1746, 1240, -1510, -4598, -6397, -8008, -7602, -7152, + -7393, -6738, -8606, -15385, -13385, 1192, 12212, 11152, + 9967, 8622, 5240, 6939, 7369, -2216, -9602, -7425, + -999, 3228, 6329, 4702, 4305, 4550, 6216, 3072, + -4983, -9313, -9437, -5586, -1987, 2088, 3184, 4662, + 8244, 6598, 4606, -277, -2718, -3188, -2321, -437, + 835, 2855, 4638, 4943, 2116, -393, -2269, -2502, + -2445, -1630, -646, 469, 1927, 3188, 2943, 502, + -3148, -3100, -1144, -642, 658, 1843, 449, -1445 +} ; + +/* test_codes_32 decoded by a known reference */ +static const short pcm_data_out32 [] = +{ 20, 96, 417, 433, 140, -506, -742, -714, + -598, -1092, -1044, 56, -445, -702, -622, 76, + -1116, -4293, -2429, -433, 606, 1196, 1357, 650, + 2465, 3040, 1730, -682, -1381, -1759, -867, 518, + 614, -698, 751, 2172, 3216, 1369, -562, -1076, + -1293, -116, -12, -803, -176, 1297, 2228, 1759, + 1257, 425, 453, 614, 622, 188, -212, -220, + -975, -951, -1441, -1309, -1698, -2578, -2405, -1650, + -590, -2293, -7052, -8506, -5907, 1100, 5192, 5305, + 4244, 4425, 6779, 5313, 2152, -2654, -5598, -3803, + -2176, 301, 1080, 2281, 3361, 4485, 4690, 1269, + -2253, -4477, -4562, -3598, -1345, 1108, 2638, 3783, + 4819, 4401, 2357, 409, -1180, -2204, -1730, -662, + 168, 1566, 2550, 2333, 1879, 485, -293, -690, + -28, 176, 445, 413, -767, -1088, -1204, -1847, + -481, 261, -1321, -8714, -10646, -4265, -1979, -7100, + -11678, -1911, 7449, 13333, 11991, 5244, 1935, 1072, + 3638, -4, -6377, -7650, -4819, 2674, 7148, 8036, + 4325, 2433, 3855, 2204, -1638, -6361, -8192, -6634, + -2184, 2144, 3357, 4164, 4783, 5168, 3835, 1100, + -1670, -3224, -2140, -144, 1120, 1755, 2530, 3626, + 3678, 1771, -281, -1289, -875, 48, 755, 1112, + 449, 546, 1140, 232, -1530, -2783, -1871, 1128, + 2216, -1899, -8606, -11333, -10140, -7546, -4357, -2979, + -6044, -14851, -3726, 13136, 13477, 9534, 3871, 1489, + 3526, 7012, 80, -8188, -7140, -1120, 5783, 7060, + 5823, 1337, 1108, 5566, 2345, -3373, -8140, -7919, + -4566, 76, 3060, 2795, 3385, 5907, 6558, 3638, + 257, -2630, -3401, -1807, -116, 349, 1610, 3417, + 4750, 3967, 1489, -907, -1923, -1385, -666, -265, + 253, 682, 1084, 1586, 538, 184, -381, 433, + 1875, 1289, -1574, -4538, -6168, -8196, -7887, -6750, + -7526, -6060, -8148, -16036, -12546, 895, 12991, 12060, + 10827, 8931, 5321, 8646, 7654, -473, -8582, -6614, + -1321, 2803, 6542, 5184, 3847, 4943, 6397, 2148, + -4999, -8799, -9614, -5931, -1574, 1546, 3493, 5397, + 7879, 6919, 4610, 160, -2538, -3582, -2052, -578, + 1060, 2987, 4843, 4791, 2421, -116, -1987, -2518, + -2333, -1534, -855, 365, 1779, 3389, 3080, 477, + -3281, -3120, -1188, -265, 638, 2224, 333, -1377 +} ; + + +static void +test_nms_adpcm_32 (void) +{ + struct nms_adpcm_state nms ; + int16_t *buffer ; + unsigned char code ; + int i, j, sl ; + + buffer = (int16_t *) malloc (sizeof (int16_t) * NMS_SAMPLES_PER_BLOCK) ; + + print_test_name ("Testing nms adpcm 32kbs encoder") ; + + nms_adpcm_codec_init (&nms, NMS32) ; + for (i = 0 ; i * NMS_BLOCK_SHORTS_32 < ARRAY_LEN (test_codes_32) ; i ++) + { /* Unpack the reference */ + nms_adpcm_block_unpack_32 (&(test_codes_32 [i * NMS_BLOCK_SHORTS_32]), buffer, NULL) ; + for (j = 0 ; j < NMS_SAMPLES_PER_BLOCK ; j++) + { sl = pcm_data_src [i * NMS_SAMPLES_PER_BLOCK + j] ; + code = nms_adpcm_encode_sample (&nms, sl) ; + if (code != buffer [j]) + { printf ("\n\nFail at sample %d (block %d, sample %d). Expected 0x%x got 0x%x\n\n", + i * NMS_SAMPLES_PER_BLOCK + j, i, j, buffer [j], code) ; + exit (1) ; + } + } + } + + puts ("ok") ; + + print_test_name ("Testing nms adpcm 32kbs decoder") ; + + nms_adpcm_codec_init (&nms, NMS32) ; + for (i = 0 ; i * NMS_BLOCK_SHORTS_32 < ARRAY_LEN (test_codes_32) ; i ++) + { /* Unpack the code */ + nms_adpcm_block_unpack_32 (&(test_codes_32 [i * NMS_BLOCK_SHORTS_32]), buffer, NULL) ; + for (j = 0 ; j < NMS_SAMPLES_PER_BLOCK ; j++) + { sl = nms_adpcm_decode_sample (&nms, buffer [j]) ; + if (sl != pcm_data_out32 [i * NMS_SAMPLES_PER_BLOCK + j]) + { printf ("\n\nFail at sample %d (block %d, sample %d). Expected %d got %d\n\n", + i * NMS_SAMPLES_PER_BLOCK + j, i, j, pcm_data_out32 [i * NMS_SAMPLES_PER_BLOCK + j], sl) ; + exit (1) ; + } + } + } + + puts ("ok") ; + + free (buffer) ; +} + + +static void +test_nms_adpcm_24 (void) +{ + struct nms_adpcm_state nms ; + int16_t *buffer ; + unsigned char code ; + int i, j, sl ; + + buffer = (int16_t *) malloc (sizeof (int16_t) * NMS_SAMPLES_PER_BLOCK) ; + + + print_test_name ("Testing nms adpcm 24kbs encoder") ; + + nms_adpcm_codec_init (&nms, NMS24) ; + for (i = 0 ; i * NMS_BLOCK_SHORTS_24 < ARRAY_LEN (test_codes_24) ; i ++) + { /* Unpack the reference */ + nms_adpcm_block_unpack_24 (&test_codes_24 [i * NMS_BLOCK_SHORTS_24], buffer, NULL) ; + for (j = 0 ; j < NMS_SAMPLES_PER_BLOCK ; j++) + { sl = pcm_data_src [i * NMS_SAMPLES_PER_BLOCK + j] ; + code = nms_adpcm_encode_sample (&nms, sl) ; + if (code != buffer [j]) + { printf ("\n\nFail at sample %d (block %d, sample %d). Expected 0x%x got 0x%x\n\n", + i * NMS_SAMPLES_PER_BLOCK + j, i, j, buffer [j], code) ; + exit (1) ; + } + } + } + + puts ("ok") ; + + + print_test_name ("Testing nms adpcm 24kbs decoder") ; + + nms_adpcm_codec_init (&nms, NMS24) ; + for (i = 0 ; i * NMS_BLOCK_SHORTS_24 < ARRAY_LEN (test_codes_24) ; i ++) + { /* Unpack the code */ + nms_adpcm_block_unpack_24 (&test_codes_24 [i * NMS_BLOCK_SHORTS_24], buffer, NULL) ; + for (j = 0 ; j < NMS_SAMPLES_PER_BLOCK ; j++) + { sl = nms_adpcm_decode_sample (&nms, buffer [j]) ; + if (sl != pcm_data_out24 [i * NMS_SAMPLES_PER_BLOCK + j]) + { printf ("\n\nFail at sample %d (block %d, sample %d). Expected %d got %d\n\n", + i * NMS_SAMPLES_PER_BLOCK + j, i, j, pcm_data_out24 [i * NMS_SAMPLES_PER_BLOCK + j], sl) ; + exit (1) ; + } + } + } + + puts ("ok") ; + + free (buffer) ; +} /* test_nms_adpcm_24 */ + +static void +test_nms_adpcm_16 (void) +{ struct nms_adpcm_state nms ; + int16_t *buffer ; + unsigned char code ; + int i, j, sl ; + + buffer = (int16_t *) malloc (sizeof (int16_t) * NMS_SAMPLES_PER_BLOCK) ; + + print_test_name ("Testing nms adpcm 16kbs encoder") ; + + nms_adpcm_codec_init (&nms, NMS16) ; + for (i = 0 ; i * NMS_BLOCK_SHORTS_16 < ARRAY_LEN (test_codes_16) ; i ++) + { /* Unpack the reference */ + nms_adpcm_block_unpack_16 (&test_codes_16 [i * NMS_BLOCK_SHORTS_16], buffer, NULL) ; + for (j = 0 ; j < NMS_SAMPLES_PER_BLOCK ; j++) + { sl = pcm_data_src [i * NMS_SAMPLES_PER_BLOCK + j] ; + code = nms_adpcm_encode_sample (&nms, sl) ; + if (code != buffer [j]) + { printf ("\n\nFail at sample %d (block %d, sample %d). Expected 0x%x got 0x%x\n\n", + i * NMS_SAMPLES_PER_BLOCK + j, i, j, buffer [j], code) ; + exit (1) ; + } + } + } + + puts ("ok") ; + + print_test_name ("Testing nms adpcm 16kbs decoder") ; + + nms_adpcm_codec_init (&nms, NMS16) ; + for (i = 0 ; i * NMS_BLOCK_SHORTS_16 < ARRAY_LEN (test_codes_16) ; i ++) + { /* Unpack the code */ + nms_adpcm_block_unpack_16 (&test_codes_16 [i * NMS_BLOCK_SHORTS_16], buffer, NULL) ; + for (j = 0 ; j < NMS_SAMPLES_PER_BLOCK ; j++) + { sl = nms_adpcm_decode_sample (&nms, buffer [j]) ; + if (sl != pcm_data_out16 [i * NMS_SAMPLES_PER_BLOCK + j]) + { printf ("\n\nFail at sample %d (block %d, sample %d). Expected %d got %d\n\n", + i * NMS_SAMPLES_PER_BLOCK + j, i, j, pcm_data_out16 [i * NMS_SAMPLES_PER_BLOCK + j], sl) ; + exit (1) ; + } + } + } + + puts ("ok") ; + + free (buffer) ; +} /* test_nms_adpcm_16 */ + +void +test_nms_adpcm (void) +{ test_nms_adpcm_32 () ; + test_nms_adpcm_24 () ; + test_nms_adpcm_16 () ; +} /* main */ + diff --git a/lib-src/libsndfile/src/test_strncpy_crlf.c b/lib-src/libsndfile/src/test_strncpy_crlf.c index 1bb183703..f21addc30 100644 --- a/lib-src/libsndfile/src/test_strncpy_crlf.c +++ b/lib-src/libsndfile/src/test_strncpy_crlf.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2010-2011 Erik de Castro Lopo +** Copyright (C) 2010-2012 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -40,11 +40,14 @@ test_psf_strlcpy_crlf (void) exit (1) ; } ; - dest [dest_len] = '\xea' ; + /* This value needs to be a in the [0, 127] range to avoid tripping up + ** compiles like Sun Studio 12.* + */ + dest [dest_len] = '\x5a' ; - psf_strlcpy_crlf (dest, src, dest_len, sizeof (src)) ; + psf_strlcpy_crlf (dest, src, dest_len, sizeof (*src)) ; - if (dest [dest_len] != '\xea') + if (dest [dest_len] != '\x5a') { printf ("\n\nLine %d: buffer overrun for dest_len == %d\n\n", __LINE__, dest_len) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/src/txw.c b/lib-src/libsndfile/src/txw.c index fce10959f..16525dfe2 100644 --- a/lib-src/libsndfile/src/txw.c +++ b/lib-src/libsndfile/src/txw.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2012 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -51,8 +51,8 @@ txw_open (SF_PRIVATE *psf) #define TXW_DATA_OFFSET 32 -#define TXW_LOOPED 0x49 -#define TXW_NO_LOOP 0xC9 +#define TXW_LOOPED 0x49 +#define TXW_NO_LOOP 0xC9 /*------------------------------------------------------------------------------ ** Private static functions. @@ -124,14 +124,15 @@ txw_open (SF_PRIVATE *psf) static int txw_read_header (SF_PRIVATE *psf) -{ TXW_HEADER txwh ; +{ BUF_UNION ubuf ; + TXW_HEADER txwh ; const char *strptr ; memset (&txwh, 0, sizeof (txwh)) ; - memset (psf->u.cbuf, 0, sizeof (psf->u.cbuf)) ; - psf_binheader_readf (psf, "pb", 0, psf->u.cbuf, 16) ; + memset (ubuf.cbuf, 0, sizeof (ubuf.cbuf)) ; + psf_binheader_readf (psf, "pb", 0, ubuf.cbuf, 16) ; - if (memcmp (psf->u.cbuf, "LM8953\0\0\0\0\0\0\0\0\0\0", 16) != 0) + if (memcmp (ubuf.cbuf, "LM8953\0\0\0\0\0\0\0\0\0\0", 16) != 0) return ERROR_666 ; psf_log_printf (psf, "Read only : Yamaha TX-16 Sampler (.txw)\nLM8953\n") ; @@ -235,18 +236,19 @@ txw_read_header (SF_PRIVATE *psf) static sf_count_t txw_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ unsigned char *ucptr ; +{ BUF_UNION ubuf ; + unsigned char *ucptr ; short sample ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.cbuf) / 3 ; + bufferlen = sizeof (ubuf.cbuf) / 3 ; bufferlen -= (bufferlen & 1) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; - count = psf_fread (psf->u.cbuf, 3, readcount, psf) ; + count = psf_fread (ubuf.cbuf, 3, readcount, psf) ; - ucptr = psf->u.ucbuf ; + ucptr = ubuf.ucbuf ; for (k = 0 ; k < readcount ; k += 2) { sample = (ucptr [0] << 8) | (ucptr [1] & 0xF0) ; ptr [total + k] = sample ; @@ -264,18 +266,19 @@ txw_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t txw_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ unsigned char *ucptr ; +{ BUF_UNION ubuf ; + unsigned char *ucptr ; short sample ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; - bufferlen = sizeof (psf->u.cbuf) / 3 ; + bufferlen = sizeof (ubuf.cbuf) / 3 ; bufferlen -= (bufferlen & 1) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; - count = psf_fread (psf->u.cbuf, 3, readcount, psf) ; + count = psf_fread (ubuf.cbuf, 3, readcount, psf) ; - ucptr = psf->u.ucbuf ; + ucptr = ubuf.ucbuf ; for (k = 0 ; k < readcount ; k += 2) { sample = (ucptr [0] << 8) | (ucptr [1] & 0xF0) ; ptr [total + k] = sample << 16 ; @@ -293,7 +296,8 @@ txw_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t txw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ unsigned char *ucptr ; +{ BUF_UNION ubuf ; + unsigned char *ucptr ; short sample ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -304,13 +308,13 @@ txw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) else normfact = 1.0 / 0x10 ; - bufferlen = sizeof (psf->u.cbuf) / 3 ; + bufferlen = sizeof (ubuf.cbuf) / 3 ; bufferlen -= (bufferlen & 1) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; - count = psf_fread (psf->u.cbuf, 3, readcount, psf) ; + count = psf_fread (ubuf.cbuf, 3, readcount, psf) ; - ucptr = psf->u.ucbuf ; + ucptr = ubuf.ucbuf ; for (k = 0 ; k < readcount ; k += 2) { sample = (ucptr [0] << 8) | (ucptr [1] & 0xF0) ; ptr [total + k] = normfact * sample ; @@ -328,7 +332,8 @@ txw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t txw_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ unsigned char *ucptr ; +{ BUF_UNION ubuf ; + unsigned char *ucptr ; short sample ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -339,13 +344,13 @@ txw_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) else normfact = 1.0 / 0x10 ; - bufferlen = sizeof (psf->u.cbuf) / 3 ; + bufferlen = sizeof (ubuf.cbuf) / 3 ; bufferlen -= (bufferlen & 1) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : len ; - count = psf_fread (psf->u.cbuf, 3, readcount, psf) ; + count = psf_fread (ubuf.cbuf, 3, readcount, psf) ; - ucptr = psf->u.ucbuf ; + ucptr = ubuf.ucbuf ; for (k = 0 ; k < readcount ; k += 2) { sample = (ucptr [0] << 8) | (ucptr [1] & 0xF0) ; ptr [total + k] = normfact * sample ; diff --git a/lib-src/libsndfile/src/ulaw.c b/lib-src/libsndfile/src/ulaw.c index c6ff7b849..b6070adeb 100644 --- a/lib-src/libsndfile/src/ulaw.c +++ b/lib-src/libsndfile/src/ulaw.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2013 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -19,6 +19,7 @@ #include "sfconfig.h" #include +#include #include "sndfile.h" #include "common.h" @@ -787,7 +788,7 @@ unsigned char ulaw_encode [8193] = 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00 + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 } ; static inline void @@ -799,7 +800,7 @@ ulaw2s_array (unsigned char *buffer, int count, short *ptr) static inline void ulaw2i_array (unsigned char *buffer, int count, int *ptr) { while (--count >= 0) - ptr [count] = ulaw_decode [buffer [count]] << 16 ; + ptr [count] = ((uint32_t) ulaw_decode [buffer [count]]) << 16 ; } /* ulaw2i_array */ static inline void @@ -827,7 +828,9 @@ s2ulaw_array (const short *ptr, int count, unsigned char *buffer) static inline void i2ulaw_array (const int *ptr, int count, unsigned char *buffer) { while (--count >= 0) - { if (ptr [count] >= 0) + { if (ptr [count] == INT_MIN) + buffer [count] = ulaw_encode [INT_MAX >> (16 + 2)] ; + else if (ptr [count] >= 0) buffer [count] = ulaw_encode [ptr [count] >> (16 + 2)] ; else buffer [count] = 0x7F & ulaw_encode [-ptr [count] >> (16 + 2)] ; @@ -847,7 +850,9 @@ f2ulaw_array (const float *ptr, int count, unsigned char *buffer, float normfact static inline void d2ulaw_array (const double *ptr, int count, unsigned char *buffer, double normfact) { while (--count >= 0) - { if (ptr [count] >= 0) + { if (!isfinite (ptr [count])) + buffer [count] = 0 ; + else if (ptr [count] >= 0) buffer [count] = ulaw_encode [lrint (normfact * ptr [count])] ; else buffer [count] = 0x7F & ulaw_encode [- lrint (normfact * ptr [count])] ; @@ -859,16 +864,17 @@ d2ulaw_array (const double *ptr, int count, unsigned char *buffer, double normfa static sf_count_t ulaw_read_ulaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ; - ulaw2s_array (psf->u.ucbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ; + ulaw2s_array (ubuf.ucbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -880,16 +886,17 @@ ulaw_read_ulaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t ulaw_read_ulaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ; - ulaw2i_array (psf->u.ucbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ; + ulaw2i_array (ubuf.ucbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -901,19 +908,20 @@ ulaw_read_ulaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t ulaw_read_ulaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ; - ulaw2f_array (psf->u.ucbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ; + ulaw2f_array (ubuf.ucbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -925,18 +933,19 @@ ulaw_read_ulaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t ulaw_read_ulaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ int bufferlen, readcount ; +{ BUF_UNION ubuf ; + int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; normfact = (psf->norm_double) ? 1.0 / ((double) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ; - ulaw2d_array (psf->u.ucbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ; + ulaw2d_array (ubuf.ucbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -951,16 +960,17 @@ ulaw_read_ulaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t ulaw_write_s2ulaw (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2ulaw_array (ptr + total, bufferlen, psf->u.ucbuf) ; - writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ; + s2ulaw_array (ptr + total, bufferlen, ubuf.ucbuf) ; + writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -972,16 +982,17 @@ ulaw_write_s2ulaw (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t ulaw_write_i2ulaw (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2ulaw_array (ptr + total, bufferlen, psf->u.ucbuf) ; - writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ; + i2ulaw_array (ptr + total, bufferlen, ubuf.ucbuf) ; + writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -993,20 +1004,21 @@ ulaw_write_i2ulaw (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t ulaw_write_f2ulaw (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; float normfact ; /* Factor in a divide by 4. */ normfact = (psf->norm_float == SF_TRUE) ? (0.25 * 0x7FFF) : 0.25 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - f2ulaw_array (ptr + total, bufferlen, psf->u.ucbuf, normfact) ; - writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ; + f2ulaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ; + writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -1018,20 +1030,21 @@ ulaw_write_f2ulaw (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t ulaw_write_d2ulaw (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ int bufferlen, writecount ; +{ BUF_UNION ubuf ; + int bufferlen, writecount ; sf_count_t total = 0 ; double normfact ; /* Factor in a divide by 4. */ normfact = (psf->norm_double) ? (0.25 * 0x7FFF) : 0.25 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - d2ulaw_array (ptr + total, bufferlen, psf->u.ucbuf, normfact) ; - writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ; + d2ulaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ; + writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; diff --git a/lib-src/libsndfile/src/version-metadata.rc.in b/lib-src/libsndfile/src/version-metadata.rc.in index 06f64c0f4..a672e4bbe 100644 --- a/lib-src/libsndfile/src/version-metadata.rc.in +++ b/lib-src/libsndfile/src/version-metadata.rc.in @@ -18,8 +18,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS VALUE "FileVersion", "@CLEAN_VERSION@.0\0" VALUE "Full Version", "@PACKAGE_VERSION@" VALUE "InternalName", "libsndfile" - VALUE "LegalCopyright", "Copyright (C) 1999-2010, Licensed LGPL" - VALUE "OriginalFilename", "libsndfile-1.dll" + VALUE "LegalCopyright", "Copyright (C) 1999-2012, Licensed LGPL" VALUE "ProductName", "libsndfile-1 DLL" VALUE "ProductVersion", "@CLEAN_VERSION@.0\0" VALUE "Language", "Language Neutral" diff --git a/lib-src/libsndfile/src/voc.c b/lib-src/libsndfile/src/voc.c index d13b03311..380d3a3f1 100644 --- a/lib-src/libsndfile/src/voc.c +++ b/lib-src/libsndfile/src/voc.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2018 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -199,7 +199,8 @@ voc_read_header (SF_PRIVATE *psf) psf->endian = SF_ENDIAN_LITTLE ; while (1) - { unsigned size ; + { char header [256] ; + unsigned size ; short count ; block_type = 0 ; @@ -211,10 +212,10 @@ voc_read_header (SF_PRIVATE *psf) psf_log_printf (psf, " ASCII : %d\n", size) ; - if (size < sizeof (psf->header) - 1) - { offset += psf_binheader_readf (psf, "b", psf->header, size) ; - psf->header [size] = 0 ; - psf_log_printf (psf, " text : %s\n", psf->header) ; + if (size < sizeof (header) - 1) + { offset += psf_binheader_readf (psf, "b", header, size) ; + header [size] = 0 ; + psf_log_printf (psf, " text : %s\n", header) ; continue ; } @@ -404,7 +405,7 @@ voc_read_header (SF_PRIVATE *psf) break ; default : /* Unknown */ - return SFE_UNKNOWN_FORMAT ; + return SFE_VOC_BAD_FORMAT ; break ; } ; @@ -435,15 +436,15 @@ voc_write_header (SF_PRIVATE *psf, int calc_length) subformat = SF_CODEC (psf->sf.format) ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; /* VOC marker and 0x1A byte. */ - psf_binheader_writef (psf, "eb1", "Creative Voice File", make_size_t (19), 0x1A) ; + psf_binheader_writef (psf, "eb1", BHWv ("Creative Voice File"), BHWz (19), BHW1 (0x1A)) ; /* Data offset, version and other. */ - psf_binheader_writef (psf, "e222", 26, 0x0114, 0x111F) ; + psf_binheader_writef (psf, "e222", BHW2 (26), BHW2 (0x0114), BHW2 (0x111F)) ; /* Use same logic as SOX. ** If the file is mono 8 bit data, use VOC_SOUND_DATA. @@ -456,7 +457,7 @@ voc_write_header (SF_PRIVATE *psf, int calc_length) rate_const = 256 - 1000000 / psf->sf.samplerate ; /* First type marker, length, rate_const and compression */ - psf_binheader_writef (psf, "e1311", VOC_SOUND_DATA, (int) (psf->datalength + 1), rate_const, 0) ; + psf_binheader_writef (psf, "e1311", BHW1 (VOC_SOUND_DATA), BHW3 ((int) (psf->datalength + 1)), BHW1 (rate_const), BHW1 (0)) ; } else if (subformat == SF_FORMAT_PCM_U8 && psf->sf.channels == 2) { /* sample_rate = 128000000 / (65536 - rate_short) ; */ @@ -465,7 +466,7 @@ voc_write_header (SF_PRIVATE *psf, int calc_length) /* First write the VOC_EXTENDED section ** marker, length, rate_const and compression */ - psf_binheader_writef (psf, "e13211", VOC_EXTENDED, 4, rate_const, 0, 1) ; + psf_binheader_writef (psf, "e13211", BHW1 (VOC_EXTENDED), BHW3 (4), BHW2 (rate_const), BHW1 (0), BHW1 (1)) ; /* samplerate = 1000000 / (256 - rate_const) ; */ rate_const = 256 - 1000000 / psf->sf.samplerate ; @@ -473,7 +474,7 @@ voc_write_header (SF_PRIVATE *psf, int calc_length) /* Now write the VOC_SOUND_DATA section ** marker, length, rate_const and compression */ - psf_binheader_writef (psf, "e1311", VOC_SOUND_DATA, (int) (psf->datalength + 1), rate_const, 0) ; + psf_binheader_writef (psf, "e1311", BHW1 (VOC_SOUND_DATA), BHW3 ((int) (psf->datalength + 1)), BHW1 (rate_const), BHW1 (0)) ; } else { int length ; @@ -486,38 +487,38 @@ voc_write_header (SF_PRIVATE *psf, int calc_length) psf->bytewidth = 1 ; length = psf->sf.frames * psf->sf.channels * psf->bytewidth + 12 ; /* Marker, length, sample rate, bitwidth, stereo flag, encoding and fourt zero bytes. */ - psf_binheader_writef (psf, "e1341124", VOC_EXTENDED_II, length, psf->sf.samplerate, 16, psf->sf.channels, 4, 0) ; + psf_binheader_writef (psf, "e1341124", BHW1 (VOC_EXTENDED_II), BHW3 (length), BHW4 (psf->sf.samplerate), BHW1 (16), BHW1 (psf->sf.channels), BHW2 (4), BHW4 (0)) ; break ; case SF_FORMAT_PCM_16 : psf->bytewidth = 2 ; length = psf->sf.frames * psf->sf.channels * psf->bytewidth + 12 ; /* Marker, length, sample rate, bitwidth, stereo flag, encoding and fourt zero bytes. */ - psf_binheader_writef (psf, "e1341124", VOC_EXTENDED_II, length, psf->sf.samplerate, 16, psf->sf.channels, 4, 0) ; + psf_binheader_writef (psf, "e1341124", BHW1 (VOC_EXTENDED_II), BHW3 (length), BHW4 (psf->sf.samplerate), BHW1 (16), BHW1 (psf->sf.channels), BHW2 (4), BHW4 (0)) ; break ; case SF_FORMAT_ALAW : psf->bytewidth = 1 ; length = psf->sf.frames * psf->sf.channels * psf->bytewidth + 12 ; - psf_binheader_writef (psf, "e1341124", VOC_EXTENDED_II, length, psf->sf.samplerate, 8, psf->sf.channels, 6, 0) ; + psf_binheader_writef (psf, "e1341124", BHW1 (VOC_EXTENDED_II), BHW3 (length), BHW4 (psf->sf.samplerate), BHW1 (8), BHW1 (psf->sf.channels), BHW2 (6), BHW4 (0)) ; break ; case SF_FORMAT_ULAW : psf->bytewidth = 1 ; length = psf->sf.frames * psf->sf.channels * psf->bytewidth + 12 ; - psf_binheader_writef (psf, "e1341124", VOC_EXTENDED_II, length, psf->sf.samplerate, 8, psf->sf.channels, 7, 0) ; + psf_binheader_writef (psf, "e1341124", BHW1 (VOC_EXTENDED_II), BHW3 (length), BHW4 (psf->sf.samplerate), BHW1 (8), BHW1 (psf->sf.channels), BHW2 (7), BHW4 (0)) ; break ; default : return SFE_UNIMPLEMENTED ; } ; } ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; diff --git a/lib-src/libsndfile/src/vox_adpcm.c b/lib-src/libsndfile/src/vox_adpcm.c index 579a5d07a..6db6618e1 100644 --- a/lib-src/libsndfile/src/vox_adpcm.c +++ b/lib-src/libsndfile/src/vox_adpcm.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2014 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -174,6 +174,7 @@ vox_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t vox_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) { IMA_OKI_ADPCM *pvox ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -182,13 +183,13 @@ vox_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) return 0 ; pvox = (IMA_OKI_ADPCM*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : (int) len ; count = vox_read_block (psf, pvox, sptr, readcount) ; for (k = 0 ; k < readcount ; k++) - ptr [total + k] = ((int) sptr [k]) << 16 ; + ptr [total + k] = arith_shift_left (sptr [k], 16) ; total += count ; len -= readcount ; if (count != readcount) @@ -201,6 +202,7 @@ vox_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t vox_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) { IMA_OKI_ADPCM *pvox ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -212,8 +214,8 @@ vox_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : (int) len ; count = vox_read_block (psf, pvox, sptr, readcount) ; @@ -231,6 +233,7 @@ vox_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t vox_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) { IMA_OKI_ADPCM *pvox ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, readcount, count ; sf_count_t total = 0 ; @@ -242,8 +245,8 @@ vox_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { readcount = (len >= bufferlen) ? bufferlen : (int) len ; count = vox_read_block (psf, pvox, sptr, readcount) ; @@ -308,6 +311,7 @@ vox_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t vox_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) { IMA_OKI_ADPCM *pvox ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -316,8 +320,8 @@ vox_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) return 0 ; pvox = (IMA_OKI_ADPCM*) psf->codec_data ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; for (k = 0 ; k < writecount ; k++) @@ -335,6 +339,7 @@ vox_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t vox_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) { IMA_OKI_ADPCM *pvox ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -346,8 +351,8 @@ vox_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; for (k = 0 ; k < writecount ; k++) @@ -365,6 +370,7 @@ vox_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t vox_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) { IMA_OKI_ADPCM *pvox ; + BUF_UNION ubuf ; short *sptr ; int k, bufferlen, writecount, count ; sf_count_t total = 0 ; @@ -376,8 +382,8 @@ vox_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - sptr = psf->u.sbuf ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + sptr = ubuf.sbuf ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { writecount = (len >= bufferlen) ? bufferlen : (int) len ; for (k = 0 ; k < writecount ; k++) diff --git a/lib-src/libsndfile/src/w64.c b/lib-src/libsndfile/src/w64.c index d56190650..a37d2c5f9 100644 --- a/lib-src/libsndfile/src/w64.c +++ b/lib-src/libsndfile/src/w64.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2018 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -26,7 +26,7 @@ #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "wav_w64.h" +#include "wavlike.h" /*------------------------------------------------------------------------------ ** W64 files use 16 byte markers as opposed to the four byte marker of @@ -37,13 +37,13 @@ ** header. */ -#define MAKE_HASH16(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,xa,xb,xc,xd,xe,xf) \ +#define MAKE_HASH16(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, xa, xb, xc, xd, xe, xf) \ ( (x0) ^ ((x1) << 1) ^ ((x2) << 2) ^ ((x3) << 3) ^ \ ((x4) << 4) ^ ((x5) << 5) ^ ((x6) << 6) ^ ((x7) << 7) ^ \ ((x8) << 8) ^ ((x9) << 9) ^ ((xa) << 10) ^ ((xb) << 11) ^ \ ((xc) << 12) ^ ((xd) << 13) ^ ((xe) << 14) ^ ((xf) << 15) ) -#define MAKE_MARKER16(name,x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,xa,xb,xc,xd,xe,xf) \ +#define MAKE_MARKER16(name, x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, xa, xb, xc, xd, xe, xf) \ static unsigned char name [16] = { (x0), (x1), (x2), (x3), (x4), (x5), \ (x6), (x7), (x8), (x9), (xa), (xb), (xc), (xd), (xe), (xf) } @@ -74,7 +74,7 @@ #define junk_HASH16 MAKE_HASH16 (0x6A, 0x75, 0x6E, 0x6b, 0xF3, 0xAC, 0xD3, 0x11, \ 0x8C, 0xD1, 0x00, 0xC0, 0x4f, 0x8E, 0xDB, 0x8A) -#define bext_MARKER MAKE_HASH16 (0x62, 0x65, 0x78, 0x74, 0xf3, 0xac, 0xd3, 0xaa, \ +#define bext_HASH16 MAKE_HASH16 (0x62, 0x65, 0x78, 0x74, 0xf3, 0xac, 0xd3, 0xaa, \ 0xd1, 0x8c, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A) #define MARKER_HASH16 MAKE_HASH16 (0x56, 0x62, 0xf7, 0xab, 0x2d, 0x39, 0xd2, 0x11, \ @@ -122,10 +122,10 @@ static int w64_close (SF_PRIVATE *psf) ; int w64_open (SF_PRIVATE *psf) -{ WAV_PRIVATE * wpriv ; +{ WAVLIKE_PRIVATE * wpriv ; int subformat, error, blockalign = 0, framesperblock = 0 ; - if ((wpriv = calloc (1, sizeof (WAV_PRIVATE))) == NULL) + if ((wpriv = calloc (1, sizeof (WAVLIKE_PRIVATE))) == NULL) return SFE_MALLOC_FAILED ; psf->container_data = wpriv ; @@ -148,15 +148,17 @@ w64_open (SF_PRIVATE *psf) psf->blockwidth = psf->bytewidth * psf->sf.channels ; if (subformat == SF_FORMAT_IMA_ADPCM || subformat == SF_FORMAT_MS_ADPCM) - { blockalign = wav_w64_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; + { blockalign = wavlike_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; framesperblock = -1 ; - /* FIXME : This block must go */ - psf->filelength = SF_COUNT_MAX ; + /* + ** At this point we don't know the file length so set it stupidly high, but not + ** so high that it triggers undefined behaviour whan something is added to it. + */ + psf->filelength = SF_COUNT_MAX - 10000 ; psf->datalength = psf->filelength ; if (psf->sf.frames <= 0) psf->sf.frames = (psf->blockwidth) ? psf->filelength / psf->blockwidth : psf->filelength ; - /* EMXIF : This block must go */ } ; if ((error = w64_write_header (psf, SF_FALSE))) @@ -196,11 +198,11 @@ w64_open (SF_PRIVATE *psf) break ; case SF_FORMAT_IMA_ADPCM : - error = wav_w64_ima_init (psf, blockalign, framesperblock) ; + error = wavlike_ima_init (psf, blockalign, framesperblock) ; break ; case SF_FORMAT_MS_ADPCM : - error = wav_w64_msadpcm_init (psf, blockalign, framesperblock) ; + error = wavlike_msadpcm_init (psf, blockalign, framesperblock) ; break ; /* Lite remove end */ @@ -220,7 +222,7 @@ w64_open (SF_PRIVATE *psf) static int w64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) -{ WAV_PRIVATE *wpriv ; +{ WAVLIKE_PRIVATE *wpriv ; WAV_FMT *wav_fmt ; int dword = 0, marker, format = 0 ; sf_count_t chunk_size, bytesread = 0 ; @@ -235,50 +237,50 @@ w64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) while (! done) { /* Each new chunk must start on an 8 byte boundary, so jump if needed. */ - if (psf->headindex & 0x7) - psf_binheader_readf (psf, "j", 8 - (psf->headindex & 0x7)) ; + if (psf->header.indx & 0x7) + psf_binheader_readf (psf, "j", 8 - (psf->header.indx & 0x7)) ; /* Generate hash of 16 byte marker. */ - bytesread += psf_binheader_readf (psf, "h", &marker) ; - chunk_size = 0 ; - + marker = chunk_size = 0 ; + bytesread = psf_binheader_readf (psf, "eh8", &marker, &chunk_size) ; + if (bytesread == 0) + break ; switch (marker) { case riff_HASH16 : if (parsestage) return SFE_W64_NO_RIFF ; - bytesread += psf_binheader_readf (psf, "e8", &chunk_size) ; - if (psf->filelength != chunk_size) psf_log_printf (psf, "riff : %D (should be %D)\n", chunk_size, psf->filelength) ; else psf_log_printf (psf, "riff : %D\n", chunk_size) ; parsestage |= HAVE_riff ; + + bytesread += psf_binheader_readf (psf, "h", &marker) ; + if (marker == wave_HASH16) + { if ((parsestage & HAVE_riff) != HAVE_riff) + return SFE_W64_NO_WAVE ; + psf_log_printf (psf, "wave\n") ; + parsestage |= HAVE_wave ; + } ; + chunk_size = 0 ; break ; case ACID_HASH16: psf_log_printf (psf, "Looks like an ACID file. Exiting.\n") ; return SFE_UNIMPLEMENTED ; - case wave_HASH16 : - if ((parsestage & HAVE_riff) != HAVE_riff) - return SFE_W64_NO_WAVE ; - psf_log_printf (psf, "wave\n") ; - parsestage |= HAVE_wave ; - break ; - case fmt_HASH16 : if ((parsestage & (HAVE_riff | HAVE_wave)) != (HAVE_riff | HAVE_wave)) return SFE_WAV_NO_FMT ; - bytesread += psf_binheader_readf (psf, "e8", &chunk_size) ; psf_log_printf (psf, " fmt : %D\n", chunk_size) ; /* size of 16 byte marker and 8 byte chunk_size value. */ chunk_size -= 24 ; - if ((error = wav_w64_read_fmt_chunk (psf, (int) chunk_size))) + if ((error = wavlike_read_fmt_chunk (psf, (int) chunk_size))) return error ; if (chunk_size % 8) @@ -286,15 +288,17 @@ w64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) format = wav_fmt->format ; parsestage |= HAVE_fmt ; + chunk_size = 0 ; break ; case fact_HASH16: { sf_count_t frames ; - psf_binheader_readf (psf, "e88", &chunk_size, &frames) ; - psf_log_printf (psf, " fact : %D\n frames : %D\n", + psf_binheader_readf (psf, "e8", &frames) ; + psf_log_printf (psf, "fact : %D\n frames : %D\n", chunk_size, frames) ; } ; + chunk_size = 0 ; break ; @@ -302,11 +306,8 @@ w64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) if ((parsestage & (HAVE_riff | HAVE_wave | HAVE_fmt)) != (HAVE_riff | HAVE_wave | HAVE_fmt)) return SFE_W64_NO_DATA ; - psf_binheader_readf (psf, "e8", &chunk_size) ; - psf->dataoffset = psf_ftell (psf) ; - - psf->datalength = chunk_size - 24 ; + psf->datalength = SF_MIN (chunk_size - 24, psf->filelength - psf->dataoffset) ; if (chunk_size % 8) chunk_size += 8 - (chunk_size % 8) ; @@ -320,66 +321,71 @@ w64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) /* Seek past data and continue reading header. */ psf_fseek (psf, chunk_size, SEEK_CUR) ; + chunk_size = 0 ; break ; case levl_HASH16 : - psf_binheader_readf (psf, "e8", &chunk_size) ; psf_log_printf (psf, "levl : %D\n", chunk_size) ; - dword = chunk_size ; - psf_binheader_readf (psf, "j", dword - 24) ; + chunk_size -= 24 ; break ; case list_HASH16 : - psf_binheader_readf (psf, "e8", &chunk_size) ; psf_log_printf (psf, "list : %D\n", chunk_size) ; - dword = chunk_size ; - psf_binheader_readf (psf, "j", dword - 24) ; + chunk_size -= 24 ; break ; case junk_HASH16 : - psf_binheader_readf (psf, "e8", &chunk_size) ; psf_log_printf (psf, "junk : %D\n", chunk_size) ; - dword = chunk_size ; - psf_binheader_readf (psf, "j", dword - 24) ; + chunk_size -= 24 ; break ; - case bext_MARKER : - psf_binheader_readf (psf, "e8", &chunk_size) ; + case bext_HASH16 : psf_log_printf (psf, "bext : %D\n", chunk_size) ; - dword = chunk_size ; - psf_binheader_readf (psf, "j", dword - 24) ; + chunk_size -= 24 ; break ; case MARKER_HASH16 : - psf_binheader_readf (psf, "e8", &chunk_size) ; psf_log_printf (psf, "marker : %D\n", chunk_size) ; - dword = chunk_size ; - psf_binheader_readf (psf, "j", dword - 24) ; + chunk_size -= 24 ; break ; case SUMLIST_HASH16 : - psf_binheader_readf (psf, "e8", &chunk_size) ; psf_log_printf (psf, "summary list : %D\n", chunk_size) ; - dword = chunk_size ; - psf_binheader_readf (psf, "j", dword - 24) ; + chunk_size -= 24 ; break ; default : - psf_log_printf (psf, "*** Unknown chunk marker : %X. Exiting parser.\n", marker) ; + psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D with length %D. Exiting parser.\n", marker, psf_ftell (psf) - 8, chunk_size) ; done = SF_TRUE ; break ; } ; /* switch (dword) */ + if (chunk_size >= psf->filelength) + { psf_log_printf (psf, "*** Chunk size %u > file length %D. Exiting parser.\n", chunk_size, psf->filelength) ; + break ; + } ; + if (psf->sf.seekable == 0 && (parsestage & HAVE_data)) break ; if (psf_ftell (psf) >= (psf->filelength - (2 * SIGNED_SIZEOF (dword)))) break ; + + if (chunk_size > 0 && chunk_size < 0xffff0000) + { dword = chunk_size ; + psf_binheader_readf (psf, "j", dword - 24) ; + } ; } ; /* while (1) */ if (psf->dataoffset <= 0) return SFE_W64_NO_DATA ; + if (psf->sf.channels < 1) + return SFE_CHANNEL_COUNT_ZERO ; + + if (psf->sf.channels > SF_MAX_CHANNELS) + return SFE_CHANNEL_COUNT ; + psf->endian = SF_ENDIAN_LITTLE ; /* All W64 files are little endian. */ if (psf_ftell (psf) != psf->dataoffset) @@ -454,12 +460,12 @@ w64_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; /* riff marker, length, wave and 'fmt ' markers. */ - psf_binheader_writef (psf, "eh8hh", riff_MARKER16, psf->filelength, wave_MARKER16, fmt_MARKER16) ; + psf_binheader_writef (psf, "eh8hh", BHWh (riff_MARKER16), BHW8 (psf->filelength), BHWh (wave_MARKER16), BHWh (fmt_MARKER16)) ; subformat = SF_CODEC (psf->sf.format) ; @@ -469,59 +475,59 @@ w64_write_header (SF_PRIVATE *psf, int calc_length) case SF_FORMAT_PCM_24 : case SF_FORMAT_PCM_32 : fmt_size = 24 + 2 + 2 + 4 + 4 + 2 + 2 ; - fmt_pad = (size_t) (8 - (fmt_size & 0x7)) ; + fmt_pad = (size_t) ((fmt_size & 0x7) ? 8 - (fmt_size & 0x7) : 0) ; fmt_size += fmt_pad ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "e8224", fmt_size, WAVE_FORMAT_PCM, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "e8224", BHW8 (fmt_size), BHW2 (WAVE_FORMAT_PCM), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "e4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "e4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth */ - psf_binheader_writef (psf, "e22", psf->bytewidth * psf->sf.channels, psf->bytewidth * 8) ; + psf_binheader_writef (psf, "e22", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (psf->bytewidth * 8)) ; break ; case SF_FORMAT_FLOAT : case SF_FORMAT_DOUBLE : fmt_size = 24 + 2 + 2 + 4 + 4 + 2 + 2 ; - fmt_pad = (size_t) (8 - (fmt_size & 0x7)) ; + fmt_pad = (size_t) ((fmt_size & 0x7) ? 8 - (fmt_size & 0x7) : 0) ; fmt_size += fmt_pad ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "e8224", fmt_size, WAVE_FORMAT_IEEE_FLOAT, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "e8224", BHW8 (fmt_size), BHW2 (WAVE_FORMAT_IEEE_FLOAT), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "e4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "e4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth */ - psf_binheader_writef (psf, "e22", psf->bytewidth * psf->sf.channels, psf->bytewidth * 8) ; + psf_binheader_writef (psf, "e22", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (psf->bytewidth * 8)) ; add_fact_chunk = SF_TRUE ; break ; case SF_FORMAT_ULAW : fmt_size = 24 + 2 + 2 + 4 + 4 + 2 + 2 ; - fmt_pad = (size_t) (8 - (fmt_size & 0x7)) ; + fmt_pad = (size_t) ((fmt_size & 0x7) ? 8 - (fmt_size & 0x7) : 0) ; fmt_size += fmt_pad ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "e8224", fmt_size, WAVE_FORMAT_MULAW, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "e8224", BHW8 (fmt_size), BHW2 (WAVE_FORMAT_MULAW), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "e4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "e4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth */ - psf_binheader_writef (psf, "e22", psf->bytewidth * psf->sf.channels, 8) ; + psf_binheader_writef (psf, "e22", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (8)) ; add_fact_chunk = SF_TRUE ; break ; case SF_FORMAT_ALAW : fmt_size = 24 + 2 + 2 + 4 + 4 + 2 + 2 ; - fmt_pad = (size_t) (8 - (fmt_size & 0x7)) ; + fmt_pad = (size_t) ((fmt_size & 0x7) ? 8 - (fmt_size & 0x7) : 0) ; fmt_size += fmt_pad ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "e8224", fmt_size, WAVE_FORMAT_ALAW, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "e8224", BHW8 (fmt_size), BHW2 (WAVE_FORMAT_ALAW), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "e4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "e4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth */ - psf_binheader_writef (psf, "e22", psf->bytewidth * psf->sf.channels, 8) ; + psf_binheader_writef (psf, "e22", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (8)) ; add_fact_chunk = SF_TRUE ; break ; @@ -530,23 +536,23 @@ w64_write_header (SF_PRIVATE *psf, int calc_length) case SF_FORMAT_IMA_ADPCM : { int blockalign, framesperblock, bytespersec ; - blockalign = wav_w64_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; + blockalign = wavlike_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; framesperblock = 2 * (blockalign - 4 * psf->sf.channels) / psf->sf.channels + 1 ; bytespersec = (psf->sf.samplerate * blockalign) / framesperblock ; /* fmt chunk. */ fmt_size = 24 + 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 ; - fmt_pad = (size_t) (8 - (fmt_size & 0x7)) ; + fmt_pad = (size_t) ((fmt_size & 0x7) ? 8 - (fmt_size & 0x7) : 0) ; fmt_size += fmt_pad ; /* fmt : size, WAV format type, channels. */ - psf_binheader_writef (psf, "e822", fmt_size, WAVE_FORMAT_IMA_ADPCM, psf->sf.channels) ; + psf_binheader_writef (psf, "e822", BHW8 (fmt_size), BHW2 (WAVE_FORMAT_IMA_ADPCM), BHW2 (psf->sf.channels)) ; /* fmt : samplerate, bytespersec. */ - psf_binheader_writef (psf, "e44", psf->sf.samplerate, bytespersec) ; + psf_binheader_writef (psf, "e44", BHW4 (psf->sf.samplerate), BHW4 (bytespersec)) ; /* fmt : blockalign, bitwidth, extrabytes, framesperblock. */ - psf_binheader_writef (psf, "e2222", blockalign, 4, 2, framesperblock) ; + psf_binheader_writef (psf, "e2222", BHW2 (blockalign), BHW2 (4), BHW2 (2), BHW2 (framesperblock)) ; } ; add_fact_chunk = SF_TRUE ; @@ -555,26 +561,26 @@ w64_write_header (SF_PRIVATE *psf, int calc_length) case SF_FORMAT_MS_ADPCM : { int blockalign, framesperblock, bytespersec, extrabytes ; - blockalign = wav_w64_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; + blockalign = wavlike_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; framesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / psf->sf.channels ; bytespersec = (psf->sf.samplerate * blockalign) / framesperblock ; /* fmt chunk. */ - extrabytes = 2 + 2 + MSADPCM_ADAPT_COEFF_COUNT * (2 + 2) ; + extrabytes = 2 + 2 + WAVLIKE_MSADPCM_ADAPT_COEFF_COUNT * (2 + 2) ; fmt_size = 24 + 2 + 2 + 4 + 4 + 2 + 2 + 2 + extrabytes ; - fmt_pad = (size_t) (8 - (fmt_size & 0x7)) ; + fmt_pad = (size_t) ((fmt_size & 0x7) ? 8 - (fmt_size & 0x7) : 0) ; fmt_size += fmt_pad ; /* fmt : size, W64 format type, channels. */ - psf_binheader_writef (psf, "e822", fmt_size, WAVE_FORMAT_MS_ADPCM, psf->sf.channels) ; + psf_binheader_writef (psf, "e822", BHW8 (fmt_size), BHW2 (WAVE_FORMAT_MS_ADPCM), BHW2 (psf->sf.channels)) ; /* fmt : samplerate, bytespersec. */ - psf_binheader_writef (psf, "e44", psf->sf.samplerate, bytespersec) ; + psf_binheader_writef (psf, "e44", BHW4 (psf->sf.samplerate), BHW4 (bytespersec)) ; /* fmt : blockalign, bitwidth, extrabytes, framesperblock. */ - psf_binheader_writef (psf, "e22222", blockalign, 4, extrabytes, framesperblock, 7) ; + psf_binheader_writef (psf, "e22222", BHW2 (blockalign), BHW2 (4), BHW2 (extrabytes), BHW2 (framesperblock), BHW2 (7)) ; - msadpcm_write_adapt_coeffs (psf) ; + wavlike_msadpcm_write_adapt_coeffs (psf) ; } ; add_fact_chunk = SF_TRUE ; @@ -584,21 +590,21 @@ w64_write_header (SF_PRIVATE *psf, int calc_length) case SF_FORMAT_GSM610 : { int bytespersec ; - bytespersec = (psf->sf.samplerate * WAV_W64_GSM610_BLOCKSIZE) / WAV_W64_GSM610_SAMPLES ; + bytespersec = (psf->sf.samplerate * WAVLIKE_GSM610_BLOCKSIZE) / WAVLIKE_GSM610_SAMPLES ; /* fmt chunk. */ fmt_size = 24 + 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 ; - fmt_pad = (size_t) (8 - (fmt_size & 0x7)) ; + fmt_pad = (size_t) ((fmt_size & 0x7) ? 8 - (fmt_size & 0x7) : 0) ; fmt_size += fmt_pad ; /* fmt : size, WAV format type, channels. */ - psf_binheader_writef (psf, "e822", fmt_size, WAVE_FORMAT_GSM610, psf->sf.channels) ; + psf_binheader_writef (psf, "e822", BHW8 (fmt_size), BHW2 (WAVE_FORMAT_GSM610), BHW2 (psf->sf.channels)) ; /* fmt : samplerate, bytespersec. */ - psf_binheader_writef (psf, "e44", psf->sf.samplerate, bytespersec) ; + psf_binheader_writef (psf, "e44", BHW4 (psf->sf.samplerate), BHW4 (bytespersec)) ; /* fmt : blockalign, bitwidth, extrabytes, framesperblock. */ - psf_binheader_writef (psf, "e2222", WAV_W64_GSM610_BLOCKSIZE, 0, 2, WAV_W64_GSM610_SAMPLES) ; + psf_binheader_writef (psf, "e2222", BHW2 (WAVLIKE_GSM610_BLOCKSIZE), BHW2 (0), BHW2 (2), BHW2 (WAVLIKE_GSM610_SAMPLES)) ; } ; add_fact_chunk = SF_TRUE ; @@ -609,18 +615,18 @@ w64_write_header (SF_PRIVATE *psf, int calc_length) /* Pad to 8 bytes with zeros. */ if (fmt_pad > 0) - psf_binheader_writef (psf, "z", fmt_pad) ; + psf_binheader_writef (psf, "z", BHWz (fmt_pad)) ; if (add_fact_chunk) - psf_binheader_writef (psf, "eh88", fact_MARKER16, (sf_count_t) (16 + 8 + 8), psf->sf.frames) ; + psf_binheader_writef (psf, "eh88", BHWh (fact_MARKER16), BHW8 ((sf_count_t) (16 + 8 + 8)), BHW8 (psf->sf.frames)) ; - psf_binheader_writef (psf, "eh8", data_MARKER16, psf->datalength + 24) ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_binheader_writef (psf, "eh8", BHWh (data_MARKER16), BHW8 (psf->datalength + 24)) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; diff --git a/lib-src/libsndfile/src/wav.c b/lib-src/libsndfile/src/wav.c index e4e43529e..104bd0a7b 100644 --- a/lib-src/libsndfile/src/wav.c +++ b/lib-src/libsndfile/src/wav.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2019 Erik de Castro Lopo ** Copyright (C) 2004-2005 David Viens ** ** This program is free software; you can redistribute it and/or modify @@ -29,76 +29,52 @@ #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "wav_w64.h" +#include "wavlike.h" /*------------------------------------------------------------------------------ * Macros to handle big/little endian issues. */ -#define RIFF_MARKER (MAKE_MARKER ('R', 'I', 'F', 'F')) -#define RIFX_MARKER (MAKE_MARKER ('R', 'I', 'F', 'X')) -#define WAVE_MARKER (MAKE_MARKER ('W', 'A', 'V', 'E')) -#define fmt_MARKER (MAKE_MARKER ('f', 'm', 't', ' ')) -#define data_MARKER (MAKE_MARKER ('d', 'a', 't', 'a')) -#define fact_MARKER (MAKE_MARKER ('f', 'a', 'c', 't')) -#define PEAK_MARKER (MAKE_MARKER ('P', 'E', 'A', 'K')) +#define RIFF_MARKER (MAKE_MARKER ('R', 'I', 'F', 'F')) +#define RIFX_MARKER (MAKE_MARKER ('R', 'I', 'F', 'X')) +#define WAVE_MARKER (MAKE_MARKER ('W', 'A', 'V', 'E')) +#define fmt_MARKER (MAKE_MARKER ('f', 'm', 't', ' ')) +#define fact_MARKER (MAKE_MARKER ('f', 'a', 'c', 't')) -#define cue_MARKER (MAKE_MARKER ('c', 'u', 'e', ' ')) -#define LIST_MARKER (MAKE_MARKER ('L', 'I', 'S', 'T')) -#define slnt_MARKER (MAKE_MARKER ('s', 'l', 'n', 't')) -#define wavl_MARKER (MAKE_MARKER ('w', 'a', 'v', 'l')) -#define INFO_MARKER (MAKE_MARKER ('I', 'N', 'F', 'O')) -#define plst_MARKER (MAKE_MARKER ('p', 'l', 's', 't')) -#define adtl_MARKER (MAKE_MARKER ('a', 'd', 't', 'l')) -#define labl_MARKER (MAKE_MARKER ('l', 'a', 'b', 'l')) -#define ltxt_MARKER (MAKE_MARKER ('l', 't', 'x', 't')) -#define note_MARKER (MAKE_MARKER ('n', 'o', 't', 'e')) -#define smpl_MARKER (MAKE_MARKER ('s', 'm', 'p', 'l')) -#define bext_MARKER (MAKE_MARKER ('b', 'e', 'x', 't')) -#define iXML_MARKER (MAKE_MARKER ('i', 'X', 'M', 'L')) -#define levl_MARKER (MAKE_MARKER ('l', 'e', 'v', 'l')) -#define MEXT_MARKER (MAKE_MARKER ('M', 'E', 'X', 'T')) -#define DISP_MARKER (MAKE_MARKER ('D', 'I', 'S', 'P')) -#define acid_MARKER (MAKE_MARKER ('a', 'c', 'i', 'd')) -#define strc_MARKER (MAKE_MARKER ('s', 't', 'r', 'c')) -#define PAD_MARKER (MAKE_MARKER ('P', 'A', 'D', ' ')) -#define afsp_MARKER (MAKE_MARKER ('a', 'f', 's', 'p')) -#define clm_MARKER (MAKE_MARKER ('c', 'l', 'm', ' ')) -#define elmo_MARKER (MAKE_MARKER ('e', 'l', 'm', 'o')) -#define cart_MARKER (MAKE_MARKER ('c', 'a', 'r', 't')) +#define cue_MARKER (MAKE_MARKER ('c', 'u', 'e', ' ')) +#define slnt_MARKER (MAKE_MARKER ('s', 'l', 'n', 't')) +#define wavl_MARKER (MAKE_MARKER ('w', 'a', 'v', 'l')) +#define plst_MARKER (MAKE_MARKER ('p', 'l', 's', 't')) +#define smpl_MARKER (MAKE_MARKER ('s', 'm', 'p', 'l')) +#define iXML_MARKER (MAKE_MARKER ('i', 'X', 'M', 'L')) +#define levl_MARKER (MAKE_MARKER ('l', 'e', 'v', 'l')) +#define MEXT_MARKER (MAKE_MARKER ('M', 'E', 'X', 'T')) +#define acid_MARKER (MAKE_MARKER ('a', 'c', 'i', 'd')) +#define strc_MARKER (MAKE_MARKER ('s', 't', 'r', 'c')) +#define afsp_MARKER (MAKE_MARKER ('a', 'f', 's', 'p')) +#define clm_MARKER (MAKE_MARKER ('c', 'l', 'm', ' ')) +#define elmo_MARKER (MAKE_MARKER ('e', 'l', 'm', 'o')) +#define FLLR_MARKER (MAKE_MARKER ('F', 'L', 'L', 'R')) -#define exif_MARKER (MAKE_MARKER ('e', 'x', 'i', 'f')) -#define ever_MARKER (MAKE_MARKER ('e', 'v', 'e', 'r')) -#define etim_MARKER (MAKE_MARKER ('e', 't', 'i', 'm')) -#define ecor_MARKER (MAKE_MARKER ('e', 'c', 'o', 'r')) -#define emdl_MARKER (MAKE_MARKER ('e', 'm', 'd', 'l')) -#define emnt_MARKER (MAKE_MARKER ('e', 'm', 'n', 't')) -#define erel_MARKER (MAKE_MARKER ('e', 'r', 'e', 'l')) -#define eucm_MARKER (MAKE_MARKER ('e', 'u', 'c', 'm')) +#define minf_MARKER (MAKE_MARKER ('m', 'i', 'n', 'f')) +#define elm1_MARKER (MAKE_MARKER ('e', 'l', 'm', '1')) +#define regn_MARKER (MAKE_MARKER ('r', 'e', 'g', 'n')) +#define ovwf_MARKER (MAKE_MARKER ('o', 'v', 'w', 'f')) +#define umid_MARKER (MAKE_MARKER ('u', 'm', 'i', 'd')) +#define SyLp_MARKER (MAKE_MARKER ('S', 'y', 'L', 'p')) +#define Cr8r_MARKER (MAKE_MARKER ('C', 'r', '8', 'r')) +#define JUNK_MARKER (MAKE_MARKER ('J', 'U', 'N', 'K')) +#define PMX_MARKER (MAKE_MARKER ('_', 'P', 'M', 'X')) +#define inst_MARKER (MAKE_MARKER ('i', 'n', 's', 't')) +#define AFAn_MARKER (MAKE_MARKER ('A', 'F', 'A', 'n')) -#define ISFT_MARKER (MAKE_MARKER ('I', 'S', 'F', 'T')) -#define ICRD_MARKER (MAKE_MARKER ('I', 'C', 'R', 'D')) -#define ICOP_MARKER (MAKE_MARKER ('I', 'C', 'O', 'P')) -#define IARL_MARKER (MAKE_MARKER ('I', 'A', 'R', 'L')) -#define IART_MARKER (MAKE_MARKER ('I', 'A', 'R', 'T')) -#define INAM_MARKER (MAKE_MARKER ('I', 'N', 'A', 'M')) -#define IENG_MARKER (MAKE_MARKER ('I', 'E', 'N', 'G')) -#define IGNR_MARKER (MAKE_MARKER ('I', 'G', 'N', 'R')) -#define ICOP_MARKER (MAKE_MARKER ('I', 'C', 'O', 'P')) -#define IPRD_MARKER (MAKE_MARKER ('I', 'P', 'R', 'D')) -#define ISRC_MARKER (MAKE_MARKER ('I', 'S', 'R', 'C')) -#define ISBJ_MARKER (MAKE_MARKER ('I', 'S', 'B', 'J')) -#define ICMT_MARKER (MAKE_MARKER ('I', 'C', 'M', 'T')) -#define IAUT_MARKER (MAKE_MARKER ('I', 'A', 'U', 'T')) -#define ITRK_MARKER (MAKE_MARKER ('I', 'T', 'R', 'K')) /* Weird WAVPACK marker which can show up at the start of the DATA section. */ #define wvpk_MARKER (MAKE_MARKER ('w', 'v', 'p', 'k')) #define OggS_MARKER (MAKE_MARKER ('O', 'g', 'g', 'S')) -#define WAV_PEAK_CHUNK_SIZE(ch) (2 * sizeof (int) + ch * (sizeof (float) + sizeof (int))) -#define WAV_BEXT_MIN_CHUNK_SIZE 602 -#define WAV_BEXT_MAX_CHUNK_SIZE (10 * 1024) +#define WAVLIKE_PEAK_CHUNK_SIZE(ch) (2 * sizeof (int) + ch * (sizeof (float) + sizeof (int))) + enum { HAVE_RIFF = 0x01, @@ -117,9 +93,11 @@ static const EXT_SUBFORMAT MSGUID_SUBTYPE_PCM = { 0x00000001, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } } ; +#if 0 static const EXT_SUBFORMAT MSGUID_SUBTYPE_MS_ADPCM = { 0x00000002, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } } ; +#endif static const EXT_SUBFORMAT MSGUID_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } @@ -158,38 +136,44 @@ static const EXT_SUBFORMAT MSGUID_SUBTYPE_PVOCEX = ** Private static functions. */ -static int wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) ; -static int wav_write_header (SF_PRIVATE *psf, int calc_length) ; +static int wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) ; +static int wav_write_header (SF_PRIVATE *psf, int calc_length) ; static int wav_write_tailer (SF_PRIVATE *psf) ; -static void wav_write_strings (SF_PRIVATE *psf, int location) ; static int wav_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; static int wav_close (SF_PRIVATE *psf) ; -static int wav_subchunk_parse (SF_PRIVATE *psf, int chunk) ; -static int exif_subchunk_parse (SF_PRIVATE *psf, unsigned int length) ; -static int wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) ; -static int wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen) ; +static int wav_read_smpl_chunk (SF_PRIVATE *psf, uint32_t chunklen) ; +static int wav_read_acid_chunk (SF_PRIVATE *psf, uint32_t chunklen) ; + +static int wav_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) ; +static SF_CHUNK_ITERATOR * wav_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) ; +static int wav_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; +static int wav_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ; /*------------------------------------------------------------------------------ ** Public function. */ int -wav_open (SF_PRIVATE *psf) -{ WAV_PRIVATE * wpriv ; +wav_open (SF_PRIVATE *psf) +{ WAVLIKE_PRIVATE * wpriv ; int format, subformat, error, blockalign = 0, framesperblock = 0 ; - if ((wpriv = calloc (1, sizeof (WAV_PRIVATE))) == NULL) + if ((wpriv = calloc (1, sizeof (WAVLIKE_PRIVATE))) == NULL) return SFE_MALLOC_FAILED ; psf->container_data = wpriv ; wpriv->wavex_ambisonic = SF_AMBISONIC_NONE ; - psf->str_flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ; + psf->strings.flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ; if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0)) { if ((error = wav_read_header (psf, &blockalign, &framesperblock))) return error ; + + psf->next_chunk_iterator = wav_next_chunk_iterator ; + psf->get_chunk_size = wav_get_chunk_size ; + psf->get_chunk_data = wav_get_chunk_data ; } ; subformat = SF_CODEC (psf->sf.format) ; @@ -221,7 +205,7 @@ wav_open (SF_PRIVATE *psf) } ; if (subformat == SF_FORMAT_IMA_ADPCM || subformat == SF_FORMAT_MS_ADPCM) - { blockalign = wav_w64_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; + { blockalign = wavlike_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; framesperblock = -1 ; /* Corrected later. */ } ; @@ -234,7 +218,8 @@ wav_open (SF_PRIVATE *psf) psf->peak_info->peak_loc = SF_PEAK_START ; } ; - psf->write_header = wav_write_header ; + psf->write_header = wav_write_header ; + psf->set_chunk = wav_set_chunk ; } ; psf->container_close = wav_close ; @@ -266,16 +251,23 @@ wav_open (SF_PRIVATE *psf) break ; case SF_FORMAT_IMA_ADPCM : - error = wav_w64_ima_init (psf, blockalign, framesperblock) ; + error = wavlike_ima_init (psf, blockalign, framesperblock) ; break ; case SF_FORMAT_MS_ADPCM : - error = wav_w64_msadpcm_init (psf, blockalign, framesperblock) ; + error = wavlike_msadpcm_init (psf, blockalign, framesperblock) ; break ; case SF_FORMAT_G721_32 : error = g72x_init (psf) ; break ; + + case SF_FORMAT_NMS_ADPCM_16 : + case SF_FORMAT_NMS_ADPCM_24 : + case SF_FORMAT_NMS_ADPCM_32 : + error = nms_adpcm_init (psf) ; + break ; + /* Lite remove end */ case SF_FORMAT_GSM610 : @@ -296,15 +288,14 @@ wav_open (SF_PRIVATE *psf) */ static int -wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) -{ WAV_PRIVATE *wpriv ; +wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) +{ WAVLIKE_PRIVATE *wpriv ; WAV_FMT *wav_fmt ; FACT_CHUNK fact_chunk ; - unsigned dword = 0, marker, RIFFsize = 0, done = 0 ; + uint32_t marker, chunk_size = 0, RIFFsize = 0, done = 0 ; int parsestage = 0, error, format = 0 ; - char *cptr ; - if (psf->filelength > SF_PLATFORM_S64 (0xffffffff)) + if (psf->is_pipe == 0 && psf->filelength > SF_PLATFORM_S64 (0xffffffff)) psf_log_printf (psf, "Warning : filelength > 0xffffffff. This is bad!!!!\n") ; if ((wpriv = psf->container_data) == NULL) @@ -312,10 +303,27 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) wav_fmt = &wpriv->wav_fmt ; /* Set position to start of file to begin reading header. */ - psf_binheader_readf (psf, "p", 0) ; + psf_binheader_readf (psf, "pmj", 0, &marker, -4) ; + psf->header.indx = 0 ; + + /* RIFX signifies big-endian format for all header and data to prevent + ** lots of code copying here, we'll set the psf->rwf_endian flag once here, + ** and never specify endian-ness for all other header ops/ + */ + psf->rwf_endian = (marker == RIFF_MARKER) ? SF_ENDIAN_LITTLE : SF_ENDIAN_BIG ; while (! done) - { psf_binheader_readf (psf, "m", &marker) ; + { size_t jump = chunk_size & 1 ; + + marker = chunk_size = 0 ; + psf_binheader_readf (psf, "jm4", jump, &marker, &chunk_size) ; + if (marker == 0) + { sf_count_t pos = psf_ftell (psf) ; + psf_log_printf (psf, "Have 0 marker at position %D (0x%x).\n", pos, pos) ; + break ; + } ; + + psf_store_read_chunk_u32 (&psf->rchunks, marker, psf_ftell (psf), chunk_size) ; switch (marker) { case RIFF_MARKER : @@ -325,16 +333,7 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) parsestage |= HAVE_RIFF ; - /* RIFX signifies big-endian format for all header and data - ** to prevent lots of code copying here, we'll set the psf->rwf_endian - ** flag once here, and never specify endian-ness for all other header ops - */ - if (marker == RIFF_MARKER) - psf->rwf_endian = SF_ENDIAN_LITTLE ; - else - psf->rwf_endian = SF_ENDIAN_BIG ; - - psf_binheader_readf (psf, "4", &RIFFsize) ; + RIFFsize = chunk_size ; if (psf->fileoffset > 0 && psf->filelength > RIFFsize + 8) { /* Set file length. */ @@ -344,13 +343,13 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) else psf_log_printf (psf, "RIFX : %u\n", RIFFsize) ; } - else if (psf->filelength < RIFFsize + 2 * SIGNED_SIZEOF (dword)) + else if (psf->filelength < RIFFsize + 2 * SIGNED_SIZEOF (marker)) { if (marker == RIFF_MARKER) - psf_log_printf (psf, "RIFF : %u (should be %D)\n", RIFFsize, psf->filelength - 2 * SIGNED_SIZEOF (dword)) ; + psf_log_printf (psf, "RIFF : %u (should be %D)\n", RIFFsize, psf->filelength - 2 * SIGNED_SIZEOF (marker)) ; else - psf_log_printf (psf, "RIFX : %u (should be %D)\n", RIFFsize, psf->filelength - 2 * SIGNED_SIZEOF (dword)) ; + psf_log_printf (psf, "RIFX : %u (should be %D)\n", RIFFsize, psf->filelength - 2 * SIGNED_SIZEOF (marker)) ; - RIFFsize = dword ; + RIFFsize = psf->filelength - 2 * SIGNED_SIZEOF (RIFFsize) ; } else { if (marker == RIFF_MARKER) @@ -358,14 +357,13 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) else psf_log_printf (psf, "RIFX : %u\n", RIFFsize) ; } ; - break ; - case WAVE_MARKER : - if ((parsestage & HAVE_RIFF) != HAVE_RIFF) + psf_binheader_readf (psf, "m", &marker) ; + if (marker != WAVE_MARKER) return SFE_WAV_NO_WAVE ; parsestage |= HAVE_WAVE ; - psf_log_printf (psf, "WAVE\n") ; + chunk_size = 0 ; break ; case fmt_MARKER : @@ -378,10 +376,9 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) parsestage |= HAVE_fmt ; - psf_binheader_readf (psf, "4", &dword) ; - psf_log_printf (psf, "fmt : %d\n", dword) ; + psf_log_printf (psf, "fmt : %d\n", chunk_size) ; - if ((error = wav_w64_read_fmt_chunk (psf, dword))) + if ((error = wavlike_read_fmt_chunk (psf, chunk_size))) return error ; format = wav_fmt->format ; @@ -396,13 +393,14 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) parsestage |= HAVE_data ; - psf_binheader_readf (psf, "4", &dword) ; + psf->datalength = chunk_size ; + if (psf->datalength & 1) + psf_log_printf (psf, "*** 'data' chunk should be an even number of bytes in length.\n") ; - psf->datalength = dword ; psf->dataoffset = psf_ftell (psf) ; if (psf->dataoffset > 0) - { if (dword == 0 && RIFFsize == 8 && psf->filelength > 44) + { if (chunk_size == 0 && RIFFsize == 8 && psf->filelength > 44) { psf_log_printf (psf, "*** Looks like a WAV file which wasn't closed properly. Fixing it.\n") ; psf->datalength = psf->filelength - psf->dataoffset ; } ; @@ -418,10 +416,8 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) if (psf->datalength + psf->dataoffset < psf->filelength) psf->dataend = psf->datalength + psf->dataoffset ; - if (format == WAVE_FORMAT_MS_ADPCM && psf->datalength % 2) - { psf->datalength ++ ; - psf_log_printf (psf, "*** Data length odd. Increasing it by 1.\n") ; - } ; + psf->datalength += chunk_size & 1 ; + chunk_size = 0 ; } ; if (! psf->sf.seekable || psf->dataoffset < 0) @@ -443,15 +439,15 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) if ((parsestage & HAVE_fmt) != HAVE_fmt) psf_log_printf (psf, "*** Should have 'fmt ' chunk before 'fact'\n") ; - psf_binheader_readf (psf, "44", &dword, & (fact_chunk.frames)) ; + psf_binheader_readf (psf, "4", & (fact_chunk.frames)) ; - if (dword > SIGNED_SIZEOF (fact_chunk)) - psf_binheader_readf (psf, "j", (int) (dword - SIGNED_SIZEOF (fact_chunk))) ; + if (chunk_size > SIGNED_SIZEOF (fact_chunk)) + psf_binheader_readf (psf, "j", (int) (chunk_size - SIGNED_SIZEOF (fact_chunk))) ; - if (dword) - psf_log_printf (psf, "%M : %d\n", marker, dword) ; + if (chunk_size) + psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; else - psf_log_printf (psf, "%M : %d (should not be zero)\n", marker, dword) ; + psf_log_printf (psf, "%M : %u (should not be zero)\n", marker, chunk_size) ; psf_log_printf (psf, " frames : %d\n", fact_chunk.frames) ; break ; @@ -462,79 +458,63 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) parsestage |= HAVE_PEAK ; - psf_binheader_readf (psf, "4", &dword) ; - - psf_log_printf (psf, "%M : %d\n", marker, dword) ; - if (dword != WAV_PEAK_CHUNK_SIZE (psf->sf.channels)) - { psf_binheader_readf (psf, "j", dword) ; - psf_log_printf (psf, "*** File PEAK chunk size doesn't fit with number of channels (%d).\n", psf->sf.channels) ; - return SFE_WAV_BAD_PEAK ; - } ; - - if ((psf->peak_info = peak_info_calloc (psf->sf.channels)) == NULL) - return SFE_MALLOC_FAILED ; - - /* read in rest of PEAK chunk. */ - psf_binheader_readf (psf, "44", & (psf->peak_info->version), & (psf->peak_info->timestamp)) ; - - if (psf->peak_info->version != 1) - psf_log_printf (psf, " version : %d *** (should be version 1)\n", psf->peak_info->version) ; - else - psf_log_printf (psf, " version : %d\n", psf->peak_info->version) ; - - psf_log_printf (psf, " time stamp : %d\n", psf->peak_info->timestamp) ; - psf_log_printf (psf, " Ch Position Value\n") ; - - cptr = psf->u.cbuf ; - for (dword = 0 ; dword < (unsigned) psf->sf.channels ; dword++) - { float value ; - unsigned int position ; - - psf_binheader_readf (psf, "f4", &value, &position) ; - psf->peak_info->peaks [dword].value = value ; - psf->peak_info->peaks [dword].position = position ; - - snprintf (cptr, sizeof (psf->u.cbuf), " %2d %-12" PRId64 " %g\n", - dword, psf->peak_info->peaks [dword].position, psf->peak_info->peaks [dword].value) ; - cptr [sizeof (psf->u.cbuf) - 1] = 0 ; - psf_log_printf (psf, "%s", cptr) ; - } ; - + psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; + if ((error = wavlike_read_peak_chunk (psf, chunk_size)) != 0) + return error ; psf->peak_info->peak_loc = ((parsestage & HAVE_data) == 0) ? SF_PEAK_START : SF_PEAK_END ; break ; case cue_MARKER : parsestage |= HAVE_other ; - { unsigned bytesread, cue_count ; - int id, position, chunk_id, chunk_start, block_start, offset ; + { uint32_t thisread, bytesread, cue_count, position, offset ; + int id, chunk_id, chunk_start, block_start, cue_index ; - bytesread = psf_binheader_readf (psf, "44", &dword, &cue_count) ; - bytesread -= 4 ; /* Remove bytes for first dword. */ - psf_log_printf (psf, "%M : %u\n", marker, dword) ; + bytesread = psf_binheader_readf (psf, "4", &cue_count) ; + psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; - if (cue_count > 10) - { psf_log_printf (psf, " Count : %d (skipping)\n", cue_count) ; - psf_binheader_readf (psf, "j", cue_count * 24) ; + if (cue_count > 2500) /* 2500 is close to the largest number of cues possible because of block sizes */ + { psf_log_printf (psf, " Count : %u (skipping)\n", cue_count) ; + psf_binheader_readf (psf, "j", chunk_size - bytesread) ; break ; } ; psf_log_printf (psf, " Count : %d\n", cue_count) ; + if ((psf->cues = psf_cues_alloc (cue_count)) == NULL) + return SFE_MALLOC_FAILED ; + + cue_index = 0 ; + while (cue_count) - { bytesread += psf_binheader_readf (psf, "444444", &id, &position, - &chunk_id, &chunk_start, &block_start, &offset) ; - psf_log_printf (psf, " Cue ID : %2d" - " Pos : %5u Chunk : %M" - " Chk Start : %d Blk Start : %d" - " Offset : %5d\n", - id, position, chunk_id, chunk_start, block_start, offset) ; + { + if ((thisread = psf_binheader_readf (psf, "e44m444", &id, &position, &chunk_id, &chunk_start, &block_start, &offset)) == 0) + break ; + bytesread += thisread ; + + if (cue_index < 10) /* avoid swamping log buffer with cues */ + psf_log_printf (psf, " Cue ID : %2d" + " Pos : %5u Chunk : %M" + " Chk Start : %d Blk Start : %d" + " Offset : %5d\n", + id, position, chunk_id, chunk_start, block_start, offset) ; + else if (cue_index == 10) + psf_log_printf (psf, " (Skipping)\n") ; + + psf->cues->cue_points [cue_index].indx = id ; + psf->cues->cue_points [cue_index].position = position ; + psf->cues->cue_points [cue_index].fcc_chunk = chunk_id ; + psf->cues->cue_points [cue_index].chunk_start = chunk_start ; + psf->cues->cue_points [cue_index].block_start = block_start ; + psf->cues->cue_points [cue_index].sample_offset = offset ; + psf->cues->cue_points [cue_index].name [0] = '\0' ; cue_count -- ; + cue_index ++ ; } ; - if (bytesread != dword) - { psf_log_printf (psf, "**** Chunk size weirdness (%d != %d)\n", dword, bytesread) ; - psf_binheader_readf (psf, "j", dword - bytesread) ; + if (bytesread != chunk_size) + { psf_log_printf (psf, "**** Chunk size weirdness (%d != %d)\n", chunk_size, bytesread) ; + psf_binheader_readf (psf, "j", chunk_size - bytesread) ; } ; } ; break ; @@ -542,20 +522,18 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) case smpl_MARKER : parsestage |= HAVE_other ; - psf_binheader_readf (psf, "4", &dword) ; - psf_log_printf (psf, "smpl : %u\n", dword) ; + psf_log_printf (psf, "smpl : %u\n", chunk_size) ; - if ((error = wav_read_smpl_chunk (psf, dword))) + if ((error = wav_read_smpl_chunk (psf, chunk_size))) return error ; break ; case acid_MARKER : parsestage |= HAVE_other ; - psf_binheader_readf (psf, "4", &dword) ; - psf_log_printf (psf, "acid : %u\n", dword) ; + psf_log_printf (psf, "acid : %u\n", chunk_size) ; - if ((error = wav_read_acid_chunk (psf, dword))) + if ((error = wav_read_acid_chunk (psf, chunk_size))) return error ; break ; @@ -563,7 +541,7 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) case LIST_MARKER : parsestage |= HAVE_other ; - if ((error = wav_subchunk_parse (psf, marker)) != 0) + if ((error = wavlike_subchunk_parse (psf, marker, chunk_size)) != 0) return error ; break ; @@ -572,8 +550,7 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) The 'bext' chunk can actually be updated, so don't need to set this. parsestage |= HAVE_other ; */ - psf_binheader_readf (psf, "4", &dword) ; - if ((error = wav_read_bext_chunk (psf, dword))) + if ((error = wavlike_read_bext_chunk (psf, chunk_size))) return error ; break ; @@ -582,10 +559,13 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) We can eat into a 'PAD ' chunk if we need to. parsestage |= HAVE_other ; */ - psf_binheader_readf (psf, "4", &dword) ; - psf_log_printf (psf, "%M : %u\n", marker, dword) ; - dword += (dword & 1) ; - psf_binheader_readf (psf, "j", dword) ; + psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size) ; + break ; + + case cart_MARKER: + if ((error = wavlike_read_cart_chunk (psf, chunk_size))) + return error ; break ; case iXML_MARKER : /* See http://en.wikipedia.org/wiki/IXML */ @@ -593,42 +573,60 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) case afsp_MARKER : case clm_MARKER : case elmo_MARKER : - case cart_MARKER : case levl_MARKER : case plst_MARKER : + case minf_MARKER : + case elm1_MARKER : + case regn_MARKER : + case ovwf_MARKER : + case inst_MARKER : + case AFAn_MARKER : + case umid_MARKER : + case SyLp_MARKER : + case Cr8r_MARKER : + case JUNK_MARKER : + case PMX_MARKER : case DISP_MARKER : case MEXT_MARKER : - parsestage |= HAVE_other ; - - psf_binheader_readf (psf, "4", &dword) ; - psf_log_printf (psf, "%M : %u\n", marker, dword) ; - dword += (dword & 1) ; - psf_binheader_readf (psf, "j", dword) ; + case FLLR_MARKER : + psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; default : - parsestage |= HAVE_other ; + if (chunk_size >= 0xffff0000) + { done = SF_TRUE ; + psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D with length %u. Exiting parser.\n", marker, psf_ftell (psf) - 8, chunk_size) ; + break ; + } ; + if (psf_isprint ((marker >> 24) & 0xFF) && psf_isprint ((marker >> 16) & 0xFF) && psf_isprint ((marker >> 8) & 0xFF) && psf_isprint (marker & 0xFF)) - { psf_binheader_readf (psf, "4", &dword) ; - psf_log_printf (psf, "*** %M : %d (unknown marker)\n", marker, dword) ; - psf_binheader_readf (psf, "j", dword) ; + { psf_log_printf (psf, "*** %M : %u (unknown marker)\n", marker, chunk_size) ; + psf_binheader_readf (psf, "j", chunk_size) ; break ; } ; if (psf_ftell (psf) & 0x03) - { psf_log_printf (psf, " Unknown chunk marker at position %d. Resynching.\n", dword - 4) ; + { psf_log_printf (psf, " Unknown chunk marker at position %D. Resynching.\n", psf_ftell (psf) - 8) ; psf_binheader_readf (psf, "j", -3) ; + /* File is too messed up so we prevent editing in RDWR mode here. */ + parsestage |= HAVE_other ; break ; } ; - psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D. Exiting parser.\n", marker, psf_ftell (psf) - 4) ; + psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D. Exiting parser.\n", marker, psf_ftell (psf) - 8) ; done = SF_TRUE ; break ; - } ; /* switch (dword) */ + } ; /* switch (marker) */ + + if (chunk_size >= psf->filelength) + { psf_log_printf (psf, "*** Chunk size %u > file length %D. Exiting parser.\n", chunk_size, psf->filelength) ; + break ; + } ; if (! psf->sf.seekable && (parsestage & HAVE_data)) break ; - if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (dword)) + if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (chunk_size)) { psf_log_printf (psf, "End\n") ; break ; } ; @@ -637,6 +635,15 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) if (psf->dataoffset <= 0) return SFE_WAV_NO_DATA ; + if (psf->sf.channels < 1) + return SFE_CHANNEL_COUNT_ZERO ; + + if (psf->sf.channels > SF_MAX_CHANNELS) + return SFE_CHANNEL_COUNT ; + + if (format != WAVE_FORMAT_PCM && (parsestage & HAVE_fact) == 0) + psf_log_printf (psf, "**** All non-PCM format files should have a 'fact' chunk.\n") ; + /* WAVs can be little or big endian */ psf->endian = psf->rwf_endian ; @@ -670,6 +677,25 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) } ; break ; + case WAVE_FORMAT_NMS_VBXADPCM : + *blockalign = wav_fmt->min.blockalign ; + *framesperblock = 160 ; + switch (wav_fmt->min.bitwidth) + { case 2 : + psf->sf.format = SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16 ; + break ; + case 3 : + psf->sf.format = SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24 ; + break ; + case 4 : + psf->sf.format = SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32 ; + break ; + + default : + return SFE_UNIMPLEMENTED ; + } + break ; + case WAVE_FORMAT_PCM : psf->sf.format = SF_FORMAT_WAV | u_bitwidth_to_subformat (psf->bytewidth * 8) ; break ; @@ -713,7 +739,7 @@ wav_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) } ; if (wpriv->fmt_is_broken) - wav_w64_analyze (psf) ; + wavlike_analyze (psf) ; /* Only set the format endian-ness if its non-standard big-endian. */ if (psf->endian == SF_ENDIAN_BIG) @@ -736,11 +762,11 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) fmt_size = 2 + 2 + 4 + 4 + 2 + 2 ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "4224", fmt_size, WAVE_FORMAT_PCM, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "4224", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_PCM), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth */ - psf_binheader_writef (psf, "22", psf->bytewidth * psf->sf.channels, psf->bytewidth * 8) ; + psf_binheader_writef (psf, "22", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (psf->bytewidth * 8)) ; break ; case SF_FORMAT_FLOAT : @@ -748,11 +774,11 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) fmt_size = 2 + 2 + 4 + 4 + 2 + 2 ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "4224", fmt_size, WAVE_FORMAT_IEEE_FLOAT, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "4224", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_IEEE_FLOAT), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth */ - psf_binheader_writef (psf, "22", psf->bytewidth * psf->sf.channels, psf->bytewidth * 8) ; + psf_binheader_writef (psf, "22", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (psf->bytewidth * 8)) ; add_fact_chunk = SF_TRUE ; break ; @@ -761,11 +787,11 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "4224", fmt_size, WAVE_FORMAT_MULAW, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "4224", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_MULAW), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth, extrabytes */ - psf_binheader_writef (psf, "222", psf->bytewidth * psf->sf.channels, 8, 0) ; + psf_binheader_writef (psf, "222", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (8), BHW2 (0)) ; add_fact_chunk = SF_TRUE ; break ; @@ -774,11 +800,11 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "4224", fmt_size, WAVE_FORMAT_ALAW, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "4224", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_ALAW), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth, extrabytes */ - psf_binheader_writef (psf, "222", psf->bytewidth * psf->sf.channels, 8, 0) ; + psf_binheader_writef (psf, "222", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (8), BHW2 (0)) ; add_fact_chunk = SF_TRUE ; break ; @@ -787,7 +813,7 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) case SF_FORMAT_IMA_ADPCM : { int blockalign, framesperblock, bytespersec ; - blockalign = wav_w64_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; + blockalign = wavlike_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; framesperblock = 2 * (blockalign - 4 * psf->sf.channels) / psf->sf.channels + 1 ; bytespersec = (psf->sf.samplerate * blockalign) / framesperblock ; @@ -795,11 +821,11 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 ; /* fmt : size, WAV format type, channels, samplerate, bytespersec */ - psf_binheader_writef (psf, "42244", fmt_size, WAVE_FORMAT_IMA_ADPCM, - psf->sf.channels, psf->sf.samplerate, bytespersec) ; + psf_binheader_writef (psf, "42244", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_IMA_ADPCM), + BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate), BHW4 (bytespersec)) ; /* fmt : blockalign, bitwidth, extrabytes, framesperblock. */ - psf_binheader_writef (psf, "2222", blockalign, 4, 2, framesperblock) ; + psf_binheader_writef (psf, "2222", BHW2 (blockalign), BHW2 (4), BHW2 (2), BHW2 (framesperblock)) ; } ; add_fact_chunk = SF_TRUE ; @@ -808,24 +834,24 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) case SF_FORMAT_MS_ADPCM : { int blockalign, framesperblock, bytespersec, extrabytes ; - blockalign = wav_w64_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; + blockalign = wavlike_srate2blocksize (psf->sf.samplerate * psf->sf.channels) ; framesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / psf->sf.channels ; bytespersec = (psf->sf.samplerate * blockalign) / framesperblock ; /* fmt chunk. */ - extrabytes = 2 + 2 + MSADPCM_ADAPT_COEFF_COUNT * (2 + 2) ; + extrabytes = 2 + 2 + WAVLIKE_MSADPCM_ADAPT_COEFF_COUNT * (2 + 2) ; fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 + extrabytes ; /* fmt : size, WAV format type, channels. */ - psf_binheader_writef (psf, "422", fmt_size, WAVE_FORMAT_MS_ADPCM, psf->sf.channels) ; + psf_binheader_writef (psf, "422", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_MS_ADPCM), BHW2 (psf->sf.channels)) ; /* fmt : samplerate, bytespersec. */ - psf_binheader_writef (psf, "44", psf->sf.samplerate, bytespersec) ; + psf_binheader_writef (psf, "44", BHW4 (psf->sf.samplerate), BHW4 (bytespersec)) ; /* fmt : blockalign, bitwidth, extrabytes, framesperblock. */ - psf_binheader_writef (psf, "22222", blockalign, 4, extrabytes, framesperblock, 7) ; + psf_binheader_writef (psf, "22222", BHW2 (blockalign), BHW2 (4), BHW2 (extrabytes), BHW2 (framesperblock), BHW2 (7)) ; - msadpcm_write_adapt_coeffs (psf) ; + wavlike_msadpcm_write_adapt_coeffs (psf) ; } ; add_fact_chunk = SF_TRUE ; @@ -837,35 +863,57 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 ; /* fmt : size, WAV format type, channels, samplerate, bytespersec */ - psf_binheader_writef (psf, "42244", fmt_size, WAVE_FORMAT_G721_ADPCM, - psf->sf.channels, psf->sf.samplerate, psf->sf.samplerate * psf->sf.channels / 2) ; + psf_binheader_writef (psf, "42244", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_G721_ADPCM), + BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate), BHW4 (psf->sf.samplerate * psf->sf.channels / 2)) ; /* fmt : blockalign, bitwidth, extrabytes, auxblocksize. */ - psf_binheader_writef (psf, "2222", 64, 4, 2, 0) ; + psf_binheader_writef (psf, "2222", BHW2 (64), BHW2 (4), BHW2 (2), BHW2 (0)) ; add_fact_chunk = SF_TRUE ; break ; + case SF_FORMAT_NMS_ADPCM_16 : + case SF_FORMAT_NMS_ADPCM_24 : + case SF_FORMAT_NMS_ADPCM_32 : + { int bytespersec, blockalign, bitwidth ; + + bitwidth = subformat == SF_FORMAT_NMS_ADPCM_16 ? 2 : subformat == SF_FORMAT_NMS_ADPCM_24 ? 3 : 4 ; + blockalign = 20 * bitwidth + 2 ; + bytespersec = psf->sf.samplerate * blockalign / 160 ; + + /* fmt chunk. */ + fmt_size = 2 + 2 + 4 + 4 + 2 + 2 ; + + /* fmt : format, channels, samplerate */ + psf_binheader_writef (psf, "4224", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_NMS_VBXADPCM), + BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; + /* fmt : bytespersec, blockalign, bitwidth */ + psf_binheader_writef (psf, "422", BHW4 (bytespersec), BHW2 (blockalign), BHW2 (bitwidth)) ; + + add_fact_chunk = SF_TRUE ; + break ; + } + /* Lite remove end */ case SF_FORMAT_GSM610 : { int blockalign, framesperblock, bytespersec ; - blockalign = WAV_W64_GSM610_BLOCKSIZE ; - framesperblock = WAV_W64_GSM610_SAMPLES ; + blockalign = WAVLIKE_GSM610_BLOCKSIZE ; + framesperblock = WAVLIKE_GSM610_SAMPLES ; bytespersec = (psf->sf.samplerate * blockalign) / framesperblock ; /* fmt chunk. */ fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 ; /* fmt : size, WAV format type, channels. */ - psf_binheader_writef (psf, "422", fmt_size, WAVE_FORMAT_GSM610, psf->sf.channels) ; + psf_binheader_writef (psf, "422", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_GSM610), BHW2 (psf->sf.channels)) ; /* fmt : samplerate, bytespersec. */ - psf_binheader_writef (psf, "44", psf->sf.samplerate, bytespersec) ; + psf_binheader_writef (psf, "44", BHW4 (psf->sf.samplerate), BHW4 (bytespersec)) ; /* fmt : blockalign, bitwidth, extrabytes, framesperblock. */ - psf_binheader_writef (psf, "2222", blockalign, 0, 2, framesperblock) ; + psf_binheader_writef (psf, "2222", BHW2 (blockalign), BHW2 (0), BHW2 (2), BHW2 (framesperblock)) ; } ; add_fact_chunk = SF_TRUE ; @@ -875,15 +923,15 @@ wav_write_fmt_chunk (SF_PRIVATE *psf) } ; if (add_fact_chunk) - psf_binheader_writef (psf, "tm48", fact_MARKER, 4, psf->sf.frames) ; + psf_binheader_writef (psf, "tm48", BHWm (fact_MARKER), BHW4 (4), BHW8 (psf->sf.frames)) ; return 0 ; } /* wav_write_fmt_chunk */ static int wavex_write_fmt_chunk (SF_PRIVATE *psf) -{ WAV_PRIVATE *wpriv ; - int subformat, fmt_size, add_fact_chunk = 0 ; +{ WAVLIKE_PRIVATE *wpriv ; + int subformat, fmt_size ; if ((wpriv = psf->container_data) == NULL) return SFE_INTERNAL ; @@ -903,25 +951,25 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf) fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 + 2 + 4 + 4 + 2 + 2 + 8 ; /* fmt : format, channels, samplerate */ - psf_binheader_writef (psf, "4224", fmt_size, WAVE_FORMAT_EXTENSIBLE, psf->sf.channels, psf->sf.samplerate) ; + psf_binheader_writef (psf, "4224", BHW4 (fmt_size), BHW2 (WAVE_FORMAT_EXTENSIBLE), BHW2 (psf->sf.channels), BHW4 (psf->sf.samplerate)) ; /* fmt : bytespersec */ - psf_binheader_writef (psf, "4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ; + psf_binheader_writef (psf, "4", BHW4 (psf->sf.samplerate * psf->bytewidth * psf->sf.channels)) ; /* fmt : blockalign, bitwidth */ - psf_binheader_writef (psf, "22", psf->bytewidth * psf->sf.channels, psf->bytewidth * 8) ; + psf_binheader_writef (psf, "22", BHW2 (psf->bytewidth * psf->sf.channels), BHW2 (psf->bytewidth * 8)) ; /* cbSize 22 is sizeof (WAVEFORMATEXTENSIBLE) - sizeof (WAVEFORMATEX) */ - psf_binheader_writef (psf, "2", 22) ; + psf_binheader_writef (psf, "2", BHW2 (22)) ; /* wValidBitsPerSample, for our use same as bitwidth as we use it fully */ - psf_binheader_writef (psf, "2", psf->bytewidth * 8) ; + psf_binheader_writef (psf, "2", BHW2 (psf->bytewidth * 8)) ; /* For an Ambisonic file set the channel mask to zero. ** Otherwise use a default based on the channel count. */ if (wpriv->wavex_ambisonic != SF_AMBISONIC_NONE) - psf_binheader_writef (psf, "4", 0) ; + psf_binheader_writef (psf, "4", BHW4 (0)) ; else if (wpriv->wavex_channelmask != 0) - psf_binheader_writef (psf, "4", wpriv->wavex_channelmask) ; + psf_binheader_writef (psf, "4", BHW4 (wpriv->wavex_channelmask)) ; else { /* ** Ok some liberty is taken here to use the most commonly used channel masks @@ -930,27 +978,27 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf) */ switch (psf->sf.channels) { case 1 : /* center channel mono */ - psf_binheader_writef (psf, "4", 0x4) ; + psf_binheader_writef (psf, "4", BHW4 (0x4)) ; break ; case 2 : /* front left and right */ - psf_binheader_writef (psf, "4", 0x1 | 0x2) ; + psf_binheader_writef (psf, "4", BHW4 (0x1 | 0x2)) ; break ; case 4 : /* Quad */ - psf_binheader_writef (psf, "4", 0x1 | 0x2 | 0x10 | 0x20) ; + psf_binheader_writef (psf, "4", BHW4 (0x1 | 0x2 | 0x10 | 0x20)) ; break ; case 6 : /* 5.1 */ - psf_binheader_writef (psf, "4", 0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20) ; + psf_binheader_writef (psf, "4", BHW4 (0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20)) ; break ; case 8 : /* 7.1 */ - psf_binheader_writef (psf, "4", 0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20 | 0x40 | 0x80) ; + psf_binheader_writef (psf, "4", BHW4 (0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20 | 0x40 | 0x80)) ; break ; default : /* 0 when in doubt , use direct out, ie NO mapping*/ - psf_binheader_writef (psf, "4", 0x0) ; + psf_binheader_writef (psf, "4", BHW4 (0x0)) ; break ; } ; } ; @@ -968,32 +1016,28 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf) case SF_FORMAT_PCM_16 : case SF_FORMAT_PCM_24 : case SF_FORMAT_PCM_32 : - wavex_write_guid (psf, wpriv->wavex_ambisonic == SF_AMBISONIC_NONE ? + wavlike_write_guid (psf, wpriv->wavex_ambisonic == SF_AMBISONIC_NONE ? &MSGUID_SUBTYPE_PCM : &MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_PCM) ; break ; case SF_FORMAT_FLOAT : case SF_FORMAT_DOUBLE : - wavex_write_guid (psf, wpriv->wavex_ambisonic == SF_AMBISONIC_NONE ? + wavlike_write_guid (psf, wpriv->wavex_ambisonic == SF_AMBISONIC_NONE ? &MSGUID_SUBTYPE_IEEE_FLOAT : &MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_IEEE_FLOAT) ; - add_fact_chunk = SF_TRUE ; break ; case SF_FORMAT_ULAW : - wavex_write_guid (psf, &MSGUID_SUBTYPE_MULAW) ; - add_fact_chunk = SF_TRUE ; + wavlike_write_guid (psf, &MSGUID_SUBTYPE_MULAW) ; break ; case SF_FORMAT_ALAW : - wavex_write_guid (psf, &MSGUID_SUBTYPE_ALAW) ; - add_fact_chunk = SF_TRUE ; + wavlike_write_guid (psf, &MSGUID_SUBTYPE_ALAW) ; break ; #if 0 /* This is dead code due to return in previous switch statement. */ case SF_FORMAT_MS_ADPCM : /* todo, GUID exists */ - wavex_write_guid (psf, &MSGUID_SUBTYPE_MS_ADPCM) ; - add_fact_chunk = SF_TRUE ; + wavlike_write_guid (psf, &MSGUID_SUBTYPE_MS_ADPCM) ; break ; return SFE_UNIMPLEMENTED ; #endif @@ -1001,8 +1045,7 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf) default : return SFE_UNIMPLEMENTED ; } ; - if (add_fact_chunk) - psf_binheader_writef (psf, "tm48", fact_MARKER, 4, psf->sf.frames) ; + psf_binheader_writef (psf, "tm48", BHWm (fact_MARKER), BHW4 (4), BHW8 (psf->sf.frames)) ; return 0 ; } /* wavex_write_fmt_chunk */ @@ -1011,7 +1054,7 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf) static int wav_write_header (SF_PRIVATE *psf, int calc_length) { sf_count_t current ; - int k, error, has_data = SF_FALSE ; + int error, has_data = SF_FALSE ; current = psf_ftell (psf) ; @@ -1025,14 +1068,13 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) if (psf->dataend) psf->datalength -= psf->filelength - psf->dataend ; - - if (psf->bytewidth > 0) - psf->sf.frames = psf->datalength / (psf->bytewidth * psf->sf.channels) ; + else if (psf->bytewidth > 0 && psf->sf.seekable == SF_TRUE) + psf->datalength = psf->sf.frames * psf->bytewidth * psf->sf.channels ; } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; /* @@ -1044,12 +1086,12 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) /* RIFF/RIFX marker, length, WAVE and 'fmt ' markers. */ if (psf->endian == SF_ENDIAN_LITTLE) - psf_binheader_writef (psf, "etm8", RIFF_MARKER, (psf->filelength < 8) ? 8 : psf->filelength - 8) ; + psf_binheader_writef (psf, "etm8", BHWm (RIFF_MARKER), BHW8 ((psf->filelength < 8) ? 8 : psf->filelength - 8)) ; else - psf_binheader_writef (psf, "Etm8", RIFX_MARKER, (psf->filelength < 8) ? 8 : psf->filelength - 8) ; + psf_binheader_writef (psf, "Etm8", BHWm (RIFX_MARKER), BHW8 ((psf->filelength < 8) ? 8 : psf->filelength - 8)) ; /* WAVE and 'fmt ' markers. */ - psf_binheader_writef (psf, "mm", WAVE_MARKER, fmt_MARKER) ; + psf_binheader_writef (psf, "mm", BHWm (WAVE_MARKER), BHWm (fmt_MARKER)) ; /* Write the 'fmt ' chunk. */ switch (SF_CONTAINER (psf->sf.format)) @@ -1068,61 +1110,79 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) } ; /* The LIST/INFO chunk. */ - if (psf->str_flags & SF_STR_LOCATE_START) - wav_write_strings (psf, SF_STR_LOCATE_START) ; + if (psf->strings.flags & SF_STR_LOCATE_START) + wavlike_write_strings (psf, SF_STR_LOCATE_START) ; if (psf->peak_info != NULL && psf->peak_info->peak_loc == SF_PEAK_START) - { psf_binheader_writef (psf, "m4", PEAK_MARKER, WAV_PEAK_CHUNK_SIZE (psf->sf.channels)) ; - psf_binheader_writef (psf, "44", 1, time (NULL)) ; - for (k = 0 ; k < psf->sf.channels ; k++) - psf_binheader_writef (psf, "ft8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ; - } ; + wavlike_write_peak_chunk (psf) ; if (psf->broadcast_16k != NULL) - wav_write_bext_chunk (psf) ; + wavlike_write_bext_chunk (psf) ; + + if (psf->cart_16k != NULL) + wavlike_write_cart_chunk (psf) ; + + if (psf->cues != NULL) + { uint32_t k ; + + psf_binheader_writef (psf, "em44", BHWm (cue_MARKER), BHW4 (4 + psf->cues->cue_count * 6 * 4), BHW4 (psf->cues->cue_count)) ; + + for (k = 0 ; k < psf->cues->cue_count ; k++) + psf_binheader_writef (psf, "e44m444", BHW4 (psf->cues->cue_points [k].indx), BHW4 (psf->cues->cue_points [k].position), + BHWm (psf->cues->cue_points [k].fcc_chunk), BHW4 (psf->cues->cue_points [k].chunk_start), + BHW4 (psf->cues->cue_points [k].block_start), BHW4 (psf->cues->cue_points [k].sample_offset)) ; + } ; if (psf->instrument != NULL) { int tmp ; double dtune = (double) (0x40000000) / 25.0 ; - psf_binheader_writef (psf, "m4", smpl_MARKER, 9 * 4 + psf->instrument->loop_count * 6 * 4) ; - psf_binheader_writef (psf, "44", 0, 0) ; /* Manufacturer zero is everyone */ + psf_binheader_writef (psf, "m4", BHWm (smpl_MARKER), BHW4 (9 * 4 + psf->instrument->loop_count * 6 * 4)) ; + psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (0)) ; /* Manufacturer zero is everyone */ tmp = (int) (1.0e9 / psf->sf.samplerate) ; /* Sample period in nano seconds */ - psf_binheader_writef (psf, "44", tmp, psf->instrument->basenote) ; - tmp = (unsigned int) (psf->instrument->detune * dtune + 0.5) ; - psf_binheader_writef (psf, "4", tmp) ; - psf_binheader_writef (psf, "44", 0, 0) ; /* SMTPE format */ - psf_binheader_writef (psf, "44", psf->instrument->loop_count, 0) ; + psf_binheader_writef (psf, "44", BHW4 (tmp), BHW4 (psf->instrument->basenote)) ; + tmp = (uint32_t) (psf->instrument->detune * dtune + 0.5) ; + psf_binheader_writef (psf, "4", BHW4 (tmp)) ; + psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (0)) ; /* SMTPE format */ + psf_binheader_writef (psf, "44", BHW4 (psf->instrument->loop_count), BHW4 (0)) ; + + /* Make sure we don't read past the loops array end. */ + if (psf->instrument->loop_count > ARRAY_LEN (psf->instrument->loops)) + psf->instrument->loop_count = ARRAY_LEN (psf->instrument->loops) ; for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++) { int type ; type = psf->instrument->loops [tmp].mode ; - type = (type == SF_LOOP_FORWARD ? 0 : type==SF_LOOP_BACKWARD ? 2 : type == SF_LOOP_ALTERNATING ? 1 : 32) ; + type = (type == SF_LOOP_FORWARD ? 0 : type == SF_LOOP_BACKWARD ? 2 : type == SF_LOOP_ALTERNATING ? 1 : 32) ; - psf_binheader_writef (psf, "44", tmp, type) ; - psf_binheader_writef (psf, "44", psf->instrument->loops [tmp].start, psf->instrument->loops [tmp].end - 1) ; - psf_binheader_writef (psf, "44", 0, psf->instrument->loops [tmp].count) ; + psf_binheader_writef (psf, "44", BHW4 (tmp), BHW4 (type)) ; + psf_binheader_writef (psf, "44", BHW4 (psf->instrument->loops [tmp].start), BHW4 (psf->instrument->loops [tmp].end - 1)) ; + psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (psf->instrument->loops [tmp].count)) ; } ; } ; - if (psf->headindex + 16 < psf->dataoffset) + /* Write custom headers. */ + if (psf->wchunks.used > 0) + wavlike_write_custom_chunks (psf) ; + + if (psf->header.indx + 16 < psf->dataoffset) { /* Add PAD data if necessary. */ - k = psf->dataoffset - (psf->headindex + 16) ; - psf_binheader_writef (psf, "m4z", PAD_MARKER, k, make_size_t (k)) ; + size_t k = psf->dataoffset - (psf->header.indx + 16) ; + psf_binheader_writef (psf, "m4z", BHWm (PAD_MARKER), BHW4 (k), BHWz (k)) ; } ; - psf_binheader_writef (psf, "tm8", data_MARKER, psf->datalength) ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_binheader_writef (psf, "tm8", BHWm (data_MARKER), BHW8 (psf->datalength)) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - if (has_data && psf->dataoffset != psf->headindex) - { psf_log_printf (psf, "Oooops : has_data && psf->dataoffset != psf->headindex\n") ; + if (has_data && psf->dataoffset != psf->header.indx) + { psf_log_printf (psf, "Oooops : has_data && psf->dataoffset != psf->header.indx\n") ; return psf->error = SFE_INTERNAL ; } ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (! has_data) psf_fseek (psf, psf->dataoffset, SEEK_SET) ; @@ -1135,101 +1195,38 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) static int wav_write_tailer (SF_PRIVATE *psf) -{ int k ; - +{ /* Reset the current header buffer length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; + + if (psf->bytewidth > 0 && psf->sf.seekable == SF_TRUE) + { psf->datalength = psf->sf.frames * psf->bytewidth * psf->sf.channels ; + psf->dataend = psf->dataoffset + psf->datalength ; + } ; if (psf->dataend > 0) psf_fseek (psf, psf->dataend, SEEK_SET) ; else psf->dataend = psf_fseek (psf, 0, SEEK_END) ; + if (psf->dataend & 1) + psf_binheader_writef (psf, "z", BHWz (1)) ; + /* Add a PEAK chunk if requested. */ if (psf->peak_info != NULL && psf->peak_info->peak_loc == SF_PEAK_END) - { psf_binheader_writef (psf, "m4", PEAK_MARKER, WAV_PEAK_CHUNK_SIZE (psf->sf.channels)) ; - psf_binheader_writef (psf, "44", 1, time (NULL)) ; - for (k = 0 ; k < psf->sf.channels ; k++) - psf_binheader_writef (psf, "f4", psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ; - } ; + wavlike_write_peak_chunk (psf) ; - if (psf->str_flags & SF_STR_LOCATE_END) - wav_write_strings (psf, SF_STR_LOCATE_END) ; + if (psf->strings.flags & SF_STR_LOCATE_END) + wavlike_write_strings (psf, SF_STR_LOCATE_END) ; /* Write the tailer. */ - if (psf->headindex > 0) - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + if (psf->header.indx > 0) + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; return 0 ; } /* wav_write_tailer */ -static void -wav_write_strings (SF_PRIVATE *psf, int location) -{ int k, prev_head_index, saved_head_index ; - - if (psf_location_string_count (psf, location) == 0) - return ; - - prev_head_index = psf->headindex + 4 ; - - psf_binheader_writef (psf, "m4m", LIST_MARKER, 0xBADBAD, INFO_MARKER) ; - - for (k = 0 ; k < SF_MAX_STRINGS ; k++) - { if (psf->strings [k].type == 0) - break ; - if (psf->strings [k].type < 0 || psf->strings [k].flags != location) - continue ; - - switch (psf->strings [k].type) - { case SF_STR_SOFTWARE : - psf_binheader_writef (psf, "ms", ISFT_MARKER, psf->strings [k].str) ; - break ; - - case SF_STR_TITLE : - psf_binheader_writef (psf, "ms", INAM_MARKER, psf->strings [k].str) ; - break ; - - case SF_STR_COPYRIGHT : - psf_binheader_writef (psf, "ms", ICOP_MARKER, psf->strings [k].str) ; - break ; - - case SF_STR_ARTIST : - psf_binheader_writef (psf, "ms", IART_MARKER, psf->strings [k].str) ; - break ; - - case SF_STR_COMMENT : - psf_binheader_writef (psf, "ms", ICMT_MARKER, psf->strings [k].str) ; - break ; - - case SF_STR_DATE : - psf_binheader_writef (psf, "ms", ICRD_MARKER, psf->strings [k].str) ; - break ; - - case SF_STR_GENRE : - psf_binheader_writef (psf, "ms", IGNR_MARKER, psf->strings [k].str) ; - break ; - - case SF_STR_ALBUM : - psf_binheader_writef (psf, "ms", IPRD_MARKER, psf->strings [k].str) ; - break ; - - case SF_STR_TRACKNUMBER : - psf_binheader_writef (psf, "ms", ITRK_MARKER, psf->strings [k].str) ; - break ; - - default : - break ; - } ; - } ; - - saved_head_index = psf->headindex ; - psf->headindex = prev_head_index ; - psf_binheader_writef (psf, "4", saved_head_index - prev_head_index - 4) ; - psf->headindex = saved_head_index ; - -} /* wav_write_strings */ - static int wav_close (SF_PRIVATE *psf) { @@ -1258,7 +1255,7 @@ wav_close (SF_PRIVATE *psf) static int wav_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize) -{ WAV_PRIVATE *wpriv ; +{ WAVLIKE_PRIVATE *wpriv ; if ((wpriv = psf->container_data) == NULL) return SFE_INTERNAL ; @@ -1279,7 +1276,7 @@ wav_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize) return wpriv->wavex_ambisonic ; case SFC_SET_CHANNEL_MAP_INFO : - wpriv->wavex_channelmask = wavex_gen_channel_mask (psf->channel_map, psf->sf.channels) ; + wpriv->wavex_channelmask = wavlike_gen_channel_mask (psf->channel_map, psf->sf.channels) ; return (wpriv->wavex_channelmask != 0) ; default : @@ -1290,183 +1287,10 @@ wav_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize) } /* wav_command */ static int -wav_subchunk_parse (SF_PRIVATE *psf, int chunk) -{ sf_count_t current_pos ; - char *cptr ; - unsigned dword, bytesread, length ; - - current_pos = psf_fseek (psf, 0, SEEK_CUR) ; - - bytesread = psf_binheader_readf (psf, "4", &length) ; - - if (length <= 8) - { /* This case is for broken files generated by PEAK. */ - psf_log_printf (psf, "%M : %d (weird length)\n", chunk, length) ; - psf_binheader_readf (psf, "mj", &chunk, length - 4) ; - psf_log_printf (psf, " %M\n", chunk) ; - return 0 ; - } ; - - if (psf->headindex + length > SIGNED_SIZEOF (psf->header)) - { psf_log_printf (psf, "%M : %d (too long)\n", chunk, length) ; - psf_binheader_readf (psf, "j", length) ; - return 0 ; - } ; - - if (current_pos + length > psf->filelength) - { psf_log_printf (psf, "%M : %d (should be %d)\n", chunk, length, (int) (psf->filelength - current_pos)) ; - length = psf->filelength - current_pos ; - } - else - psf_log_printf (psf, "%M : %d\n", chunk, length) ; - - while (bytesread < length) - { bytesread += psf_binheader_readf (psf, "m", &chunk) ; - - switch (chunk) - { case adtl_MARKER : - case INFO_MARKER : - /* These markers don't contain anything. */ - psf_log_printf (psf, " %M\n", chunk) ; - break ; - - case data_MARKER : - psf_log_printf (psf, " %M inside a LIST block??? Backing out.\n", chunk) ; - /* Jump back four bytes and return to caller. */ - psf_binheader_readf (psf, "j", -4) ; - return 0 ; - - case ISFT_MARKER : - case ICOP_MARKER : - case IARL_MARKER : - case IART_MARKER : - case ICMT_MARKER : - case ICRD_MARKER : - case IENG_MARKER : - case IGNR_MARKER : - case INAM_MARKER : - case IPRD_MARKER : - case ISBJ_MARKER : - case ISRC_MARKER : - case IAUT_MARKER : - case ITRK_MARKER : - bytesread += psf_binheader_readf (psf, "4", &dword) ; - dword += (dword & 1) ; - if (dword >= SIGNED_SIZEOF (psf->u.cbuf)) - { psf_log_printf (psf, " *** %M : %d (too big)\n", chunk, dword) ; - psf_binheader_readf (psf, "j", dword) ; - break ; - } ; - - cptr = psf->u.cbuf ; - psf_binheader_readf (psf, "b", cptr, dword) ; - bytesread += dword ; - cptr [dword] = 0 ; - psf_log_printf (psf, " %M : %s\n", chunk, cptr) ; - break ; - - case labl_MARKER : - { int mark_id ; - - bytesread += psf_binheader_readf (psf, "44", &dword, &mark_id) ; - dword -= 4 ; - dword += (dword & 1) ; - if (dword < 1 || dword >= SIGNED_SIZEOF (psf->u.cbuf)) - { psf_log_printf (psf, " *** %M : %d (too big)\n", chunk, dword) ; - psf_binheader_readf (psf, "j", dword) ; - break ; - } ; - - cptr = psf->u.cbuf ; - psf_binheader_readf (psf, "b", cptr, dword) ; - bytesread += dword ; - cptr [dword] = 0 ; - psf_log_printf (psf, " %M : %d : %s\n", chunk, mark_id, cptr) ; - } ; - break ; - - - case DISP_MARKER : - case ltxt_MARKER : - case note_MARKER : - bytesread += psf_binheader_readf (psf, "4", &dword) ; - dword += (dword & 1) ; - psf_binheader_readf (psf, "j", dword) ; - bytesread += dword ; - psf_log_printf (psf, " %M : %d\n", chunk, dword) ; - break ; - - case exif_MARKER : - psf_log_printf (psf, " %M\n", chunk) ; - bytesread += exif_subchunk_parse (psf, length - bytesread) ; - break ; - - case 0 : - /* - ** Four zero bytes where a marker was expected. Assume this means - ** the rest of the chunk is garbage. - */ - psf_log_printf (psf, " *** Found weird-ass zero marker. Jumping to end of chunk.\n") ; - if (bytesread < length) - bytesread += psf_binheader_readf (psf, "j", length - bytesread + 4) ; - psf_log_printf (psf, " *** Offset is now : 0x%X\n", psf_fseek (psf, 0, SEEK_CUR)) ; - return 0 ; - - default : - psf_binheader_readf (psf, "4", &dword) ; - bytesread += sizeof (dword) ; - dword += (dword & 1) ; - psf_binheader_readf (psf, "j", dword) ; - bytesread += dword ; - psf_log_printf (psf, " *** %M : %d\n", chunk, dword) ; - if (dword > length) - return 0 ; - break ; - } ; - - switch (chunk) - { case ISFT_MARKER : - psf_store_string (psf, SF_STR_SOFTWARE, psf->u.cbuf) ; - break ; - case ICOP_MARKER : - psf_store_string (psf, SF_STR_COPYRIGHT, psf->u.cbuf) ; - break ; - case INAM_MARKER : - psf_store_string (psf, SF_STR_TITLE, psf->u.cbuf) ; - break ; - case IART_MARKER : - psf_store_string (psf, SF_STR_ARTIST, psf->u.cbuf) ; - break ; - case ICMT_MARKER : - psf_store_string (psf, SF_STR_COMMENT, psf->u.cbuf) ; - break ; - case ICRD_MARKER : - psf_store_string (psf, SF_STR_DATE, psf->u.cbuf) ; - break ; - case IGNR_MARKER : - psf_store_string (psf, SF_STR_GENRE, psf->u.cbuf) ; - break ; - case IPRD_MARKER : - psf_store_string (psf, SF_STR_ALBUM, psf->u.cbuf) ; - break ; - case ITRK_MARKER : - psf_store_string (psf, SF_STR_TRACKNUMBER, psf->u.cbuf) ; - break ; - } ; - } ; - - current_pos = psf_fseek (psf, 0, SEEK_CUR) - current_pos ; - - if (current_pos - 4 != length) - psf_log_printf (psf, "**** Bad chunk length %d sbould be %D\n", length, current_pos - 4) ; - - return 0 ; -} /* wav_subchunk_parse */ - -static int -wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) -{ unsigned int bytesread = 0, dword, sampler_data, loop_count ; - unsigned int note, start, end, type = -1, count ; +wav_read_smpl_chunk (SF_PRIVATE *psf, uint32_t chunklen) +{ char buffer [512] ; + uint32_t thisread, bytesread = 0, dword, sampler_data, loop_count ; + uint32_t note, pitch, start, end, type = -1, count ; int j, k ; chunklen += (chunklen & 1) ; @@ -1483,11 +1307,11 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) bytesread += psf_binheader_readf (psf, "4", ¬e) ; psf_log_printf (psf, " Midi Note : %u\n", note) ; - bytesread += psf_binheader_readf (psf, "4", &dword) ; - if (dword != 0) - { snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%f", - (1.0 * 0x80000000) / ((unsigned int) dword)) ; - psf_log_printf (psf, " Pitch Fract. : %s\n", psf->u.cbuf) ; + bytesread += psf_binheader_readf (psf, "4", &pitch) ; + if (pitch != 0) + { snprintf (buffer, sizeof (buffer), "%f", + (1.0 * 0x80000000) / ((uint32_t) pitch)) ; + psf_log_printf (psf, " Pitch Fract. : %s\n", buffer) ; } else psf_log_printf (psf, " Pitch Fract. : 0\n") ; @@ -1496,13 +1320,16 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) psf_log_printf (psf, " SMPTE Format : %u\n", dword) ; bytesread += psf_binheader_readf (psf, "4", &dword) ; - snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%02d:%02d:%02d %02d", - (dword >> 24) & 0x7F, (dword >> 16) & 0x7F, (dword >> 8) & 0x7F, dword & 0x7F) ; - psf_log_printf (psf, " SMPTE Offset : %s\n", psf->u.cbuf) ; + snprintf (buffer, sizeof (buffer), "%02d:%02d:%02d %02d", + (dword >> 24) & 0x7F, (dword >> 16) & 0x7F, (dword >> 8) & 0x7F, dword & 0x7F) ; + psf_log_printf (psf, " SMPTE Offset : %s\n", buffer) ; bytesread += psf_binheader_readf (psf, "4", &loop_count) ; psf_log_printf (psf, " Loop Count : %u\n", loop_count) ; + if (loop_count == 0 && chunklen == bytesread) + return 0 ; + /* Sampler Data holds the number of data bytes after the CUE chunks which ** is not actually CUE data. Display value after CUE data. */ @@ -1514,7 +1341,9 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) psf->instrument->loop_count = loop_count ; for (j = 0 ; loop_count > 0 && chunklen - bytesread >= 24 ; j ++) - { bytesread += psf_binheader_readf (psf, "4", &dword) ; + { if ((thisread = psf_binheader_readf (psf, "4", &dword)) == 0) + break ; + bytesread += thisread ; psf_log_printf (psf, " Cue ID : %2u", dword) ; bytesread += psf_binheader_readf (psf, "4", &type) ; @@ -1577,7 +1406,9 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) if (k > 0 && (k % 20) == 0) psf_log_printf (psf, "\n ") ; - bytesread += psf_binheader_readf (psf, "1", &ch) ; + if ((thisread = psf_binheader_readf (psf, "1", &ch)) == 0) + break ; + bytesread += thisread ; psf_log_printf (psf, "%02X ", ch & 0xFF) ; } ; @@ -1585,6 +1416,7 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) } ; psf->instrument->basenote = note ; + psf->instrument->detune = (int8_t) (pitch / (0x40000000 / 25.0) + 0.5) ; psf->instrument->gain = 1 ; psf->instrument->velocity_lo = psf->instrument->key_lo = 0 ; psf->instrument->velocity_hi = psf->instrument->key_hi = 127 ; @@ -1624,8 +1456,9 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) */ static int -wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen) -{ unsigned int bytesread = 0 ; +wav_read_acid_chunk (SF_PRIVATE *psf, uint32_t chunklen) +{ char buffer [512] ; + uint32_t bytesread = 0 ; int beats, flags ; short rootnote, q1, meter_denom, meter_numer ; float q2, tempo ; @@ -1634,7 +1467,7 @@ wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen) bytesread += psf_binheader_readf (psf, "422f", &flags, &rootnote, &q1, &q2) ; - snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%f", q2) ; + snprintf (buffer, sizeof (buffer), "%f", q2) ; psf_log_printf (psf, " Flags : 0x%04x (%s,%s,%s,%s,%s)\n", flags, (flags & 0x01) ? "OneShot" : "Loop", @@ -1644,12 +1477,12 @@ wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen) (flags & 0x10) ? "??On" : "??Off") ; psf_log_printf (psf, " Root note : 0x%x\n ???? : 0x%04x\n ???? : %s\n", - rootnote, q1, psf->u.cbuf) ; + rootnote, q1, buffer) ; bytesread += psf_binheader_readf (psf, "422f", &beats, &meter_denom, &meter_numer, &tempo) ; - snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%f", tempo) ; + snprintf (buffer, sizeof (buffer), "%f", tempo) ; psf_log_printf (psf, " Beats : %d\n Meter : %d/%d\n Tempo : %s\n", - beats, meter_numer, meter_denom, psf->u.cbuf) ; + beats, meter_numer, meter_denom, buffer) ; psf_binheader_readf (psf, "j", chunklen - bytesread) ; @@ -1666,172 +1499,49 @@ wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen) return 0 ; } /* wav_read_acid_chunk */ -int -wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunksize) -{ - SF_BROADCAST_INFO_16K * b ; - unsigned int bytes = 0 ; - - if (chunksize < WAV_BEXT_MIN_CHUNK_SIZE) - { psf_log_printf (psf, "bext : %u (should be >= %d)\n", chunksize, WAV_BEXT_MIN_CHUNK_SIZE) ; - psf_binheader_readf (psf, "j", chunksize) ; - return 0 ; - } ; - - if (chunksize > WAV_BEXT_MAX_CHUNK_SIZE) - { psf_log_printf (psf, "bext : %u (should be < %d)\n", chunksize, WAV_BEXT_MAX_CHUNK_SIZE) ; - psf_binheader_readf (psf, "j", chunksize) ; - return 0 ; - } ; - - if (chunksize >= sizeof (SF_BROADCAST_INFO_16K)) - { psf_log_printf (psf, "bext : %u too big to be handled\n", chunksize) ; - psf_binheader_readf (psf, "j", chunksize) ; - return 0 ; - } ; - - psf_log_printf (psf, "bext : %u\n", chunksize) ; - - if ((psf->broadcast_16k = broadcast_var_alloc ()) == NULL) - { psf->error = SFE_MALLOC_FAILED ; - return psf->error ; - } ; - - b = psf->broadcast_16k ; - - bytes += psf_binheader_readf (psf, "b", b->description, sizeof (b->description)) ; - bytes += psf_binheader_readf (psf, "b", b->originator, sizeof (b->originator)) ; - bytes += psf_binheader_readf (psf, "b", b->originator_reference, sizeof (b->originator_reference)) ; - bytes += psf_binheader_readf (psf, "b", b->origination_date, sizeof (b->origination_date)) ; - bytes += psf_binheader_readf (psf, "b", b->origination_time, sizeof (b->origination_time)) ; - bytes += psf_binheader_readf (psf, "442", &b->time_reference_low, &b->time_reference_high, &b->version) ; - bytes += psf_binheader_readf (psf, "bj", &b->umid, sizeof (b->umid), 190) ; - - if (chunksize > WAV_BEXT_MIN_CHUNK_SIZE) - { /* File has coding history data. */ - - b->coding_history_size = chunksize - WAV_BEXT_MIN_CHUNK_SIZE ; - - /* We do not parse the coding history */ - bytes += psf_binheader_readf (psf, "b", b->coding_history, b->coding_history_size) ; - } ; - - if (bytes < chunksize) - psf_binheader_readf (psf, "j", chunksize - bytes) ; - - return 0 ; -} /* wav_read_bext_chunk */ - -int -wav_write_bext_chunk (SF_PRIVATE *psf) -{ SF_BROADCAST_INFO_16K *b ; - - if (psf->broadcast_16k == NULL) - return -1 ; - - b = psf->broadcast_16k ; - - psf_binheader_writef (psf, "m4", bext_MARKER, WAV_BEXT_MIN_CHUNK_SIZE + b->coding_history_size) ; - - /* - ** Note that it is very important the the field widths of the SF_BROADCAST_INFO - ** struct match those for the bext chunk fields. - */ - - psf_binheader_writef (psf, "b", b->description, sizeof (b->description)) ; - psf_binheader_writef (psf, "b", b->originator, sizeof (b->originator)) ; - psf_binheader_writef (psf, "b", b->originator_reference, sizeof (b->originator_reference)) ; - psf_binheader_writef (psf, "b", b->origination_date, sizeof (b->origination_date)) ; - psf_binheader_writef (psf, "b", b->origination_time, sizeof (b->origination_time)) ; - psf_binheader_writef (psf, "442", b->time_reference_low, b->time_reference_high, b->version) ; - psf_binheader_writef (psf, "b", b->umid, sizeof (b->umid)) ; - psf_binheader_writef (psf, "z", make_size_t (190)) ; - - if (b->coding_history_size > 0) - psf_binheader_writef (psf, "b", b->coding_history, make_size_t (b->coding_history_size)) ; - - return 0 ; -} /* wav_write_bext_chunk */ - -static int -exif_fill_and_sink (SF_PRIVATE *psf, char* buf, size_t bufsz, size_t toread) -{ - size_t bytesread = 0 ; - - buf [0] = 0 ; - bufsz -= 1 ; - if (toread < bufsz) - bufsz = toread ; - bytesread = psf_binheader_readf (psf, "b", buf, bufsz) ; - buf [bufsz] = 0 ; - - if (bytesread == bufsz && toread > bufsz) - bytesread += psf_binheader_readf (psf, "j", toread - bufsz) ; - - return bytesread ; -} /* exif_fill_and_sink */ - -/* -** Exif specification for audio files, at JEITA CP-3451 Exif 2.2 section 5 -** (Exif Audio File Specification) http://www.exif.org/Exif2-2.PDF +/*============================================================================== */ + static int -exif_subchunk_parse (SF_PRIVATE *psf, unsigned int length) -{ unsigned marker, dword, vmajor = -1, vminor = -1, bytesread = 0 ; - char buf [4096] ; +wav_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) +{ return psf_save_write_chunk (&psf->wchunks, chunk_info) ; +} /* wav_set_chunk */ - while (bytesread < length) - { - bytesread += psf_binheader_readf (psf, "m", &marker) ; +static SF_CHUNK_ITERATOR * +wav_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) +{ return psf_next_chunk_iterator (&psf->rchunks, iterator) ; +} /* wav_next_chunk_iterator */ - switch (marker) - { - case 0 : /* camera padding? */ - break ; +static int +wav_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ int indx ; - case ever_MARKER : - bytesread += psf_binheader_readf (psf, "j4", 4, &dword) ; - vmajor = 10 * (((dword >> 24) & 0xff) - '0') + (((dword >> 16) & 0xff) - '0') ; - vminor = 10 * (((dword >> 8) & 0xff) - '0') + ((dword & 0xff) - '0') ; - psf_log_printf (psf, " EXIF Version : %u.%02u\n", vmajor, vminor) ; - break ; + if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0) + return SFE_UNKNOWN_CHUNK ; - case emnt_MARKER : /* design information: null-terminated string */ - case emdl_MARKER : /* model name ; null-terminated string */ - case ecor_MARKER : /* manufacturer: null-terminated string */ - case etim_MARKER : /* creation time: null-terminated string in the format "hour:minute:second.subsecond" */ - case erel_MARKER : /* relation info: null-terminated string (filename) */ - case eucm_MARKER : /* user comment: 4-byte size follows, then possibly unicode data */ - psf_binheader_readf (psf, "4", &dword) ; - bytesread += sizeof (dword) ; - dword += (dword & 1) ; + chunk_info->datalen = psf->rchunks.chunks [indx].len ; - if (dword >= sizeof (buf)) - { psf_log_printf (psf, "*** Marker '%M' is too big %u\n\n", marker, dword) ; - return bytesread ; - } ; + return SFE_NO_ERROR ; +} /* wav_get_chunk_size */ - bytesread += exif_fill_and_sink (psf, buf, sizeof (buf), dword) ; +static int +wav_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) +{ int indx ; + sf_count_t pos ; - /* BAD - don't know what's going on here -- maybe a bug in the camera */ - /* field should be NULL-terminated but there's no room for it with the reported number */ - /* example output: emdl : 8 (EX-Z1050) */ - if (marker == emdl_MARKER && dword == strlen (buf) /* should be >= strlen+1*/) - { psf_log_printf (psf, " *** field size too small for string (sinking 2 bytes)\n") ; - bytesread += psf_binheader_readf (psf, "j", 2) ; - } ; + if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0) + return SFE_UNKNOWN_CHUNK ; - psf_log_printf (psf, " %M : %d (%s)\n", marker, dword, buf) ; - if (dword > length) - return bytesread ; - break ; + if (chunk_info->data == NULL) + return SFE_BAD_CHUNK_DATA_PTR ; - default : - psf_log_printf (psf, " *** %M (%d): -- ignored --\n", marker, marker) ; - break ; - } ; - } ; + chunk_info->id_size = psf->rchunks.chunks [indx].id_size ; + memcpy (chunk_info->id, psf->rchunks.chunks [indx].id, sizeof (chunk_info->id) / sizeof (*chunk_info->id)) ; - return bytesread ; -} /* exif_subchunk_parse */ + pos = psf_ftell (psf) ; + psf_fseek (psf, psf->rchunks.chunks [indx].offset, SEEK_SET) ; + psf_fread (chunk_info->data, SF_MIN (chunk_info->datalen, psf->rchunks.chunks [indx].len), 1, psf) ; + psf_fseek (psf, pos, SEEK_SET) ; + return SFE_NO_ERROR ; +} /* wav_get_chunk_data */ diff --git a/lib-src/libsndfile/src/wav_w64.c b/lib-src/libsndfile/src/wav_w64.c deleted file mode 100644 index 438912955..000000000 --- a/lib-src/libsndfile/src/wav_w64.c +++ /dev/null @@ -1,674 +0,0 @@ -/* -** Copyright (C) 1999-2011 Erik de Castro Lopo -** Copyright (C) 2004-2005 David Viens -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU Lesser General Public License as published by -** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include -#include -#include - -#include "sndfile.h" -#include "sfendian.h" -#include "common.h" -#include "wav_w64.h" - -/* Known WAVEFORMATEXTENSIBLE GUIDS. */ -static const EXT_SUBFORMAT MSGUID_SUBTYPE_PCM = -{ 0x00000001, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } -} ; - -static const EXT_SUBFORMAT MSGUID_SUBTYPE_MS_ADPCM = -{ 0x00000002, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } -} ; - -static const EXT_SUBFORMAT MSGUID_SUBTYPE_IEEE_FLOAT = -{ 0x00000003, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } -} ; - -static const EXT_SUBFORMAT MSGUID_SUBTYPE_ALAW = -{ 0x00000006, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } -} ; - -static const EXT_SUBFORMAT MSGUID_SUBTYPE_MULAW = -{ 0x00000007, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } -} ; - -/* -** the next two are from -** http://dream.cs.bath.ac.uk/researchdev/wave-ex/bformat.html -*/ - -static const EXT_SUBFORMAT MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_PCM = -{ 0x00000001, 0x0721, 0x11d3, { 0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00 } -} ; - -static const EXT_SUBFORMAT MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_IEEE_FLOAT = -{ 0x00000003, 0x0721, 0x11d3, { 0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00 } -} ; - - -#if 0 -/* maybe interesting one day to read the following through sf_read_raw */ -/* http://www.bath.ac.uk/~masrwd/pvocex/pvocex.html */ -static const EXT_SUBFORMAT MSGUID_SUBTYPE_PVOCEX = -{ 0x8312b9c2, 0x2e6e, 0x11d4, { 0xa8, 0x24, 0xde, 0x5b, 0x96, 0xc3, 0xab, 0x21 } -} ; -#endif - -/* This stores which bit in dwChannelMask maps to which channel */ -static const struct chanmap_s -{ int id ; - const char * name ; -} channel_mask_bits [] = -{ /* WAVEFORMATEXTENSIBLE doesn't distuingish FRONT_LEFT from LEFT */ - { SF_CHANNEL_MAP_LEFT, "L" }, - { SF_CHANNEL_MAP_RIGHT, "R" }, - { SF_CHANNEL_MAP_CENTER, "C" }, - { SF_CHANNEL_MAP_LFE, "LFE" }, - { SF_CHANNEL_MAP_REAR_LEFT, "Ls" }, - { SF_CHANNEL_MAP_REAR_RIGHT, "Rs" }, - { SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER, "Lc" }, - { SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER, "Rc" }, - { SF_CHANNEL_MAP_REAR_CENTER, "Cs" }, - { SF_CHANNEL_MAP_SIDE_LEFT, "Sl" }, - { SF_CHANNEL_MAP_SIDE_RIGHT, "Sr" }, - { SF_CHANNEL_MAP_TOP_CENTER, "Tc" }, - { SF_CHANNEL_MAP_TOP_FRONT_LEFT, "Tfl" }, - { SF_CHANNEL_MAP_TOP_FRONT_CENTER, "Tfc" }, - { SF_CHANNEL_MAP_TOP_FRONT_RIGHT, "Tfr" }, - { SF_CHANNEL_MAP_TOP_REAR_LEFT, "Trl" }, - { SF_CHANNEL_MAP_TOP_REAR_CENTER, "Trc" }, - { SF_CHANNEL_MAP_TOP_REAR_RIGHT, "Trr" }, -} ; - -/*------------------------------------------------------------------------------ - * Private static functions. - */ - -static int -wavex_guid_equal (const EXT_SUBFORMAT * first, const EXT_SUBFORMAT * second) -{ return !memcmp (first, second, sizeof (EXT_SUBFORMAT)) ; -} /* wavex_guid_equal */ - - - -int -wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize) -{ WAV_PRIVATE * wpriv ; - WAV_FMT *wav_fmt ; - int bytesread, k, bytespersec = 0 ; - - if ((wpriv = psf->container_data) == NULL) - return SFE_INTERNAL ; - wav_fmt = &wpriv->wav_fmt ; - - memset (wav_fmt, 0, sizeof (WAV_FMT)) ; - - if (fmtsize < 16) - return SFE_WAV_FMT_SHORT ; - - /* assume psf->rwf_endian is already properly set */ - - /* Read the minimal WAV file header here. */ - bytesread = psf_binheader_readf (psf, "224422", - &(wav_fmt->format), &(wav_fmt->min.channels), - &(wav_fmt->min.samplerate), &(wav_fmt->min.bytespersec), - &(wav_fmt->min.blockalign), &(wav_fmt->min.bitwidth)) ; - - psf_log_printf (psf, " Format : 0x%X => %s\n", wav_fmt->format, wav_w64_format_str (wav_fmt->format)) ; - psf_log_printf (psf, " Channels : %d\n", wav_fmt->min.channels) ; - psf_log_printf (psf, " Sample Rate : %d\n", wav_fmt->min.samplerate) ; - psf_log_printf (psf, " Block Align : %d\n", wav_fmt->min.blockalign) ; - - if (wav_fmt->min.blockalign == 0) - { psf_log_printf (psf, "*** Error : wav_fmt->min.blockalign should not be zero.\n") ; - return SFE_INTERNAL ; - } ; - - if (wav_fmt->format == WAVE_FORMAT_PCM && wav_fmt->min.bitwidth == 24 && - wav_fmt->min.blockalign == 4 * wav_fmt->min.channels) - { psf_log_printf (psf, " Bit Width : 24\n") ; - - psf_log_printf (psf, "\n" - " Ambiguous information in 'fmt ' chunk. Possibile file types:\n" - " 0) Invalid IEEE float file generated by Syntrillium's Cooledit!\n" - " 1) File generated by ALSA's arecord containing 24 bit samples in 32 bit containers.\n" - " 2) 24 bit file with incorrect Block Align value.\n" - "\n") ; - - wpriv->fmt_is_broken = 1 ; - } - else if (wav_fmt->min.bitwidth == 0) - { switch (wav_fmt->format) - { case WAVE_FORMAT_GSM610 : - case WAVE_FORMAT_IPP_ITU_G_723_1 : - psf_log_printf (psf, " Bit Width : %d\n", wav_fmt->min.bitwidth) ; - break ; - default : - psf_log_printf (psf, " Bit Width : %d (should not be 0)\n", wav_fmt->min.bitwidth) ; - } - } - else - { switch (wav_fmt->format) - { case WAVE_FORMAT_GSM610 : - case WAVE_FORMAT_IPP_ITU_G_723_1 : - psf_log_printf (psf, " Bit Width : %d (should be 0)\n", wav_fmt->min.bitwidth) ; - break ; - default : - psf_log_printf (psf, " Bit Width : %d\n", wav_fmt->min.bitwidth) ; - } - } ; - - psf->sf.samplerate = wav_fmt->min.samplerate ; - psf->sf.frames = 0 ; /* Correct this when reading data chunk. */ - psf->sf.channels = wav_fmt->min.channels ; - - switch (wav_fmt->format) - { case WAVE_FORMAT_PCM : - case WAVE_FORMAT_IEEE_FLOAT : - bytespersec = wav_fmt->min.samplerate * wav_fmt->min.blockalign ; - if (wav_fmt->min.bytespersec != (unsigned) bytespersec) - psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->min.bytespersec, bytespersec) ; - else - psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->min.bytespersec) ; - - psf->bytewidth = BITWIDTH2BYTES (wav_fmt->min.bitwidth) ; - break ; - - case WAVE_FORMAT_ALAW : - case WAVE_FORMAT_MULAW : - if (wav_fmt->min.bytespersec / wav_fmt->min.blockalign != wav_fmt->min.samplerate) - psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->min.bytespersec, wav_fmt->min.samplerate * wav_fmt->min.blockalign) ; - else - psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->min.bytespersec) ; - - psf->bytewidth = 1 ; - if (fmtsize >= 18) - { bytesread += psf_binheader_readf (psf, "2", &(wav_fmt->size20.extrabytes)) ; - psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->size20.extrabytes) ; - } ; - break ; - - case WAVE_FORMAT_IMA_ADPCM : - if (wav_fmt->min.bitwidth != 4) - return SFE_WAV_ADPCM_NOT4BIT ; - if (wav_fmt->min.channels < 1 || wav_fmt->min.channels > 2) - return SFE_WAV_ADPCM_CHANNELS ; - - bytesread += - psf_binheader_readf (psf, "22", &(wav_fmt->ima.extrabytes), &(wav_fmt->ima.samplesperblock)) ; - - bytespersec = (wav_fmt->ima.samplerate * wav_fmt->ima.blockalign) / wav_fmt->ima.samplesperblock ; - if (wav_fmt->ima.bytespersec != (unsigned) bytespersec) - psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->ima.bytespersec, bytespersec) ; - else - psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->ima.bytespersec) ; - - psf->bytewidth = 2 ; - psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->ima.extrabytes) ; - psf_log_printf (psf, " Samples/Block : %d\n", wav_fmt->ima.samplesperblock) ; - break ; - - case WAVE_FORMAT_MS_ADPCM : - if (wav_fmt->msadpcm.bitwidth != 4) - return SFE_WAV_ADPCM_NOT4BIT ; - if (wav_fmt->msadpcm.channels < 1 || wav_fmt->msadpcm.channels > 2) - return SFE_WAV_ADPCM_CHANNELS ; - - bytesread += - psf_binheader_readf (psf, "222", &(wav_fmt->msadpcm.extrabytes), - &(wav_fmt->msadpcm.samplesperblock), &(wav_fmt->msadpcm.numcoeffs)) ; - - bytespersec = (wav_fmt->min.samplerate * wav_fmt->min.blockalign) / wav_fmt->msadpcm.samplesperblock ; - if (wav_fmt->min.bytespersec == (unsigned) bytespersec) - psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->min.bytespersec) ; - else if (wav_fmt->min.bytespersec == (wav_fmt->min.samplerate / wav_fmt->msadpcm.samplesperblock) * wav_fmt->min.blockalign) - psf_log_printf (psf, " Bytes/sec : %d (should be %d (MS BUG!))\n", wav_fmt->min.bytespersec, bytespersec) ; - else - psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->min.bytespersec, bytespersec) ; - - psf->bytewidth = 2 ; - psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->msadpcm.extrabytes) ; - psf_log_printf (psf, " Samples/Block : %d\n", wav_fmt->msadpcm.samplesperblock) ; - if (wav_fmt->msadpcm.numcoeffs > ARRAY_LEN (wav_fmt->msadpcm.coeffs)) - { psf_log_printf (psf, " No. of Coeffs : %d (should be <= %d)\n", wav_fmt->msadpcm.numcoeffs, ARRAY_LEN (wav_fmt->msadpcm.coeffs)) ; - wav_fmt->msadpcm.numcoeffs = ARRAY_LEN (wav_fmt->msadpcm.coeffs) ; - } - else - psf_log_printf (psf, " No. of Coeffs : %d\n", wav_fmt->msadpcm.numcoeffs) ; - - psf_log_printf (psf, " Index Coeffs1 Coeffs2\n") ; - for (k = 0 ; k < wav_fmt->msadpcm.numcoeffs ; k++) - { bytesread += - psf_binheader_readf (psf, "22", &(wav_fmt->msadpcm.coeffs [k].coeff1), &(wav_fmt->msadpcm.coeffs [k].coeff2)) ; - snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), " %2d %7d %7d\n", k, wav_fmt->msadpcm.coeffs [k].coeff1, wav_fmt->msadpcm.coeffs [k].coeff2) ; - psf_log_printf (psf, psf->u.cbuf) ; - } ; - break ; - - case WAVE_FORMAT_GSM610 : - if (wav_fmt->gsm610.channels != 1 || wav_fmt->gsm610.blockalign != 65) - return SFE_WAV_GSM610_FORMAT ; - - bytesread += - psf_binheader_readf (psf, "22", &(wav_fmt->gsm610.extrabytes), &(wav_fmt->gsm610.samplesperblock)) ; - - if (wav_fmt->gsm610.samplesperblock != 320) - return SFE_WAV_GSM610_FORMAT ; - - bytespersec = (wav_fmt->gsm610.samplerate * wav_fmt->gsm610.blockalign) / wav_fmt->gsm610.samplesperblock ; - if (wav_fmt->gsm610.bytespersec != (unsigned) bytespersec) - psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->gsm610.bytespersec, bytespersec) ; - else - psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->gsm610.bytespersec) ; - - psf->bytewidth = 2 ; - psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->gsm610.extrabytes) ; - psf_log_printf (psf, " Samples/Block : %d\n", wav_fmt->gsm610.samplesperblock) ; - break ; - - case WAVE_FORMAT_EXTENSIBLE : - if (wav_fmt->ext.bytespersec / wav_fmt->ext.blockalign != wav_fmt->ext.samplerate) - psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->ext.bytespersec, wav_fmt->ext.samplerate * wav_fmt->ext.blockalign) ; - else - psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->ext.bytespersec) ; - - bytesread += - psf_binheader_readf (psf, "224", &(wav_fmt->ext.extrabytes), &(wav_fmt->ext.validbits), - &(wav_fmt->ext.channelmask)) ; - - psf_log_printf (psf, " Valid Bits : %d\n", wav_fmt->ext.validbits) ; - - if (wav_fmt->ext.channelmask == 0) - psf_log_printf (psf, " Channel Mask : 0x0 (should not be zero)\n") ; - else - { unsigned bit ; - - wpriv->wavex_channelmask = wav_fmt->ext.channelmask ; - - /* It's probably wise to ignore the channel mask if it is all zero */ - free (psf->channel_map) ; - - if ((psf->channel_map = calloc (psf->sf.channels, sizeof (psf->channel_map [0]))) == NULL) - return SFE_MALLOC_FAILED ; - - /* Terminate the buffer we're going to append_snprintf into. */ - psf->u.cbuf [0] = 0 ; - - for (bit = k = 0 ; bit < ARRAY_LEN (channel_mask_bits) ; bit++) - { - if (wav_fmt->ext.channelmask & (1 << bit)) - { if (k > psf->sf.channels) - { psf_log_printf (psf, "*** More channel map bits than there are channels.\n") ; - break ; - } ; - - psf->channel_map [k++] = channel_mask_bits [bit].id ; - append_snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%s, ", channel_mask_bits [bit].name) ; - } ; - } ; - - /* Remove trailing ", ". */ - bit = strlen (psf->u.cbuf) ; - psf->u.cbuf [--bit] = 0 ; - psf->u.cbuf [--bit] = 0 ; - - if (k != psf->sf.channels) - { psf_log_printf (psf, " Channel Mask : 0x%X\n", wav_fmt->ext.channelmask) ; - psf_log_printf (psf, "*** Less channel map bits than there are channels.\n") ; - } - else - psf_log_printf (psf, " Channel Mask : 0x%X (%s)\n", wav_fmt->ext.channelmask, psf->u.cbuf) ; - } ; - - bytesread += psf_binheader_readf (psf, "422", &(wav_fmt->ext.esf.esf_field1), &(wav_fmt->ext.esf.esf_field2), &(wav_fmt->ext.esf.esf_field3)) ; - - /* compare the esf_fields with each known GUID? and print? */ - psf_log_printf (psf, " Subformat\n") ; - psf_log_printf (psf, " esf_field1 : 0x%X\n", wav_fmt->ext.esf.esf_field1) ; - psf_log_printf (psf, " esf_field2 : 0x%X\n", wav_fmt->ext.esf.esf_field2) ; - psf_log_printf (psf, " esf_field3 : 0x%X\n", wav_fmt->ext.esf.esf_field3) ; - psf_log_printf (psf, " esf_field4 : ") ; - for (k = 0 ; k < 8 ; k++) - { bytesread += psf_binheader_readf (psf, "1", &(wav_fmt->ext.esf.esf_field4 [k])) ; - psf_log_printf (psf, "0x%X ", wav_fmt->ext.esf.esf_field4 [k] & 0xFF) ; - } ; - psf_log_printf (psf, "\n") ; - psf->bytewidth = BITWIDTH2BYTES (wav_fmt->ext.bitwidth) ; - - /* Compare GUIDs for known ones. */ - if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_PCM)) - { psf->sf.format = SF_FORMAT_WAVEX | u_bitwidth_to_subformat (psf->bytewidth * 8) ; - psf_log_printf (psf, " format : pcm\n") ; - } - else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_MS_ADPCM)) - { psf->sf.format = (SF_FORMAT_WAVEX | SF_FORMAT_MS_ADPCM) ; - psf_log_printf (psf, " format : ms adpcm\n") ; - } - else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_IEEE_FLOAT)) - { psf->sf.format = SF_FORMAT_WAVEX | ((psf->bytewidth == 8) ? SF_FORMAT_DOUBLE : SF_FORMAT_FLOAT) ; - psf_log_printf (psf, " format : IEEE float\n") ; - } - else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_ALAW)) - { psf->sf.format = (SF_FORMAT_WAVEX | SF_FORMAT_ALAW) ; - psf_log_printf (psf, " format : A-law\n") ; - } - else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_MULAW)) - { psf->sf.format = (SF_FORMAT_WAVEX | SF_FORMAT_ULAW) ; - psf_log_printf (psf, " format : u-law\n") ; - } - else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_PCM)) - { psf->sf.format = SF_FORMAT_WAVEX | u_bitwidth_to_subformat (psf->bytewidth * 8) ; - psf_log_printf (psf, " format : pcm (Ambisonic B)\n") ; - wpriv->wavex_ambisonic = SF_AMBISONIC_B_FORMAT ; - } - else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_IEEE_FLOAT)) - { psf->sf.format = SF_FORMAT_WAVEX | ((psf->bytewidth == 8) ? SF_FORMAT_DOUBLE : SF_FORMAT_FLOAT) ; - psf_log_printf (psf, " format : IEEE float (Ambisonic B)\n") ; - wpriv->wavex_ambisonic = SF_AMBISONIC_B_FORMAT ; - } - else - return SFE_UNIMPLEMENTED ; - - break ; - - case WAVE_FORMAT_G721_ADPCM : - psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->g72x.bytespersec) ; - if (fmtsize >= 20) - { bytesread += psf_binheader_readf (psf, "22", &(wav_fmt->g72x.extrabytes), &(wav_fmt->g72x.auxblocksize)) ; - if (wav_fmt->g72x.extrabytes == 0) - psf_log_printf (psf, " Extra Bytes : %d (should be 2)\n", wav_fmt->g72x.extrabytes) ; - else - psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->g72x.extrabytes) ; - psf_log_printf (psf, " Aux Blk Size : %d\n", wav_fmt->g72x.auxblocksize) ; - } - else if (fmtsize == 18) - { bytesread += psf_binheader_readf (psf, "2", &(wav_fmt->g72x.extrabytes)) ; - psf_log_printf (psf, " Extra Bytes : %d%s\n", wav_fmt->g72x.extrabytes, wav_fmt->g72x.extrabytes != 0 ? " (should be 0)" : "") ; - } - else - psf_log_printf (psf, "*** 'fmt ' chunk should be bigger than this!\n") ; - break ; - - default : - psf_log_printf (psf, "*** No 'fmt ' chunk dumper for this format!\n") ; - return SFE_WAV_BAD_FMT ; - } ; - - if (bytesread > fmtsize) - { psf_log_printf (psf, "*** wav_w64_read_fmt_chunk (bytesread > fmtsize)\n") ; - return SFE_WAV_BAD_FMT ; - } - else - psf_binheader_readf (psf, "j", fmtsize - bytesread) ; - - psf->blockwidth = wav_fmt->min.channels * psf->bytewidth ; - - return 0 ; -} /* wav_w64_read_fmt_chunk */ - -void -wavex_write_guid (SF_PRIVATE *psf, const EXT_SUBFORMAT * subformat) -{ - psf_binheader_writef (psf, "422b", subformat->esf_field1, - subformat->esf_field2, subformat->esf_field3, - subformat->esf_field4, make_size_t (8)) ; -} /* wavex_write_guid */ - - -int -wavex_gen_channel_mask (const int *chan_map, int channels) -{ int chan, mask = 0, bit = -1, last_bit = -1 ; - - if (chan_map == NULL) - return 0 ; - - for (chan = 0 ; chan < channels ; chan ++) - { int k ; - - for (k = bit + 1 ; k < ARRAY_LEN (channel_mask_bits) ; k++) - if (chan_map [chan] == channel_mask_bits [k].id) - { bit = k ; - break ; - } ; - - /* Check for bad sequence. */ - if (bit <= last_bit) - return 0 ; - - mask += 1 << bit ; - last_bit = bit ; - } ; - - return mask ; -} /* wavex_gen_channel_mask */ - -void -wav_w64_analyze (SF_PRIVATE *psf) -{ AUDIO_DETECT ad ; - int format = 0 ; - - if (psf->is_pipe) - { psf_log_printf (psf, "*** Error : Reading from a pipe. Can't analyze data section to figure out real data format.\n\n") ; - return ; - } ; - - psf_log_printf (psf, "---------------------------------------------------\n" - "Format is known to be broken. Using detection code.\n") ; - - /* Code goes here. */ - ad.endianness = SF_ENDIAN_LITTLE ; - ad.channels = psf->sf.channels ; - - psf_fseek (psf, 3 * 4 * 50, SEEK_SET) ; - - while (psf_fread (psf->u.ucbuf, 1, 4096, psf) == 4096) - { format = audio_detect (psf, &ad, psf->u.ucbuf, 4096) ; - if (format != 0) - break ; - } ; - - /* Seek to start of DATA section. */ - psf_fseek (psf, psf->dataoffset, SEEK_SET) ; - - if (format == 0) - { psf_log_printf (psf, "wav_w64_analyze : detection failed.\n") ; - return ; - } ; - - switch (format) - { case SF_FORMAT_PCM_32 : - case SF_FORMAT_FLOAT : - psf_log_printf (psf, "wav_w64_analyze : found format : 0x%X\n", format) ; - psf->sf.format = (psf->sf.format & ~SF_FORMAT_SUBMASK) + format ; - psf->bytewidth = 4 ; - psf->blockwidth = psf->sf.channels * psf->bytewidth ; - break ; - - case SF_FORMAT_PCM_24 : - psf_log_printf (psf, "wav_w64_analyze : found format : 0x%X\n", format) ; - psf->sf.format = (psf->sf.format & ~SF_FORMAT_SUBMASK) + format ; - psf->bytewidth = 3 ; - psf->blockwidth = psf->sf.channels * psf->bytewidth ; - break ; - - default : - psf_log_printf (psf, "wav_w64_analyze : unhandled format : 0x%X\n", format) ; - break ; - } ; - - return ; -} /* wav_w64_analyze */ - -/*============================================================================== -*/ - -typedef struct -{ int ID ; - const char *name ; -} WAV_FORMAT_DESC ; - -#define STR(x) #x -#define FORMAT_TYPE(x) { x, STR (x) } - -static WAV_FORMAT_DESC wave_descs [] = -{ FORMAT_TYPE (WAVE_FORMAT_PCM), - FORMAT_TYPE (WAVE_FORMAT_MS_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_IEEE_FLOAT), - FORMAT_TYPE (WAVE_FORMAT_VSELP), - FORMAT_TYPE (WAVE_FORMAT_IBM_CVSD), - FORMAT_TYPE (WAVE_FORMAT_ALAW), - FORMAT_TYPE (WAVE_FORMAT_MULAW), - FORMAT_TYPE (WAVE_FORMAT_OKI_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_IMA_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_MEDIASPACE_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_SIERRA_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_G723_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_DIGISTD), - FORMAT_TYPE (WAVE_FORMAT_DIGIFIX), - FORMAT_TYPE (WAVE_FORMAT_DIALOGIC_OKI_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_MEDIAVISION_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_CU_CODEC), - FORMAT_TYPE (WAVE_FORMAT_YAMAHA_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_SONARC), - FORMAT_TYPE (WAVE_FORMAT_DSPGROUP_TRUESPEECH), - FORMAT_TYPE (WAVE_FORMAT_ECHOSC1), - FORMAT_TYPE (WAVE_FORMAT_AUDIOFILE_AF36), - FORMAT_TYPE (WAVE_FORMAT_APTX), - FORMAT_TYPE (WAVE_FORMAT_AUDIOFILE_AF10), - FORMAT_TYPE (WAVE_FORMAT_PROSODY_1612), - FORMAT_TYPE (WAVE_FORMAT_LRC), - FORMAT_TYPE (WAVE_FORMAT_DOLBY_AC2), - FORMAT_TYPE (WAVE_FORMAT_GSM610), - FORMAT_TYPE (WAVE_FORMAT_MSNAUDIO), - FORMAT_TYPE (WAVE_FORMAT_ANTEX_ADPCME), - FORMAT_TYPE (WAVE_FORMAT_CONTROL_RES_VQLPC), - FORMAT_TYPE (WAVE_FORMAT_DIGIREAL), - FORMAT_TYPE (WAVE_FORMAT_DIGIADPCM), - FORMAT_TYPE (WAVE_FORMAT_CONTROL_RES_CR10), - FORMAT_TYPE (WAVE_FORMAT_NMS_VBXADPCM), - FORMAT_TYPE (WAVE_FORMAT_ROLAND_RDAC), - FORMAT_TYPE (WAVE_FORMAT_ECHOSC3), - FORMAT_TYPE (WAVE_FORMAT_ROCKWELL_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_ROCKWELL_DIGITALK), - FORMAT_TYPE (WAVE_FORMAT_XEBEC), - FORMAT_TYPE (WAVE_FORMAT_G721_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_G728_CELP), - FORMAT_TYPE (WAVE_FORMAT_MSG723), - FORMAT_TYPE (WAVE_FORMAT_MPEG), - FORMAT_TYPE (WAVE_FORMAT_RT24), - FORMAT_TYPE (WAVE_FORMAT_PAC), - FORMAT_TYPE (WAVE_FORMAT_MPEGLAYER3), - FORMAT_TYPE (WAVE_FORMAT_LUCENT_G723), - FORMAT_TYPE (WAVE_FORMAT_CIRRUS), - FORMAT_TYPE (WAVE_FORMAT_ESPCM), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE), - FORMAT_TYPE (WAVE_FORMAT_CANOPUS_ATRAC), - FORMAT_TYPE (WAVE_FORMAT_G726_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_G722_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_DSAT), - FORMAT_TYPE (WAVE_FORMAT_DSAT_DISPLAY), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_BYTE_ALIGNED), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_AC8), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_AC10), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_AC16), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_AC20), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_RT24), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_RT29), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_RT29HW), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_VR12), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_VR18), - FORMAT_TYPE (WAVE_FORMAT_VOXWARE_TQ40), - FORMAT_TYPE (WAVE_FORMAT_SOFTSOUND), - FORMAT_TYPE (WAVE_FORMAT_VOXARE_TQ60), - FORMAT_TYPE (WAVE_FORMAT_MSRT24), - FORMAT_TYPE (WAVE_FORMAT_G729A), - FORMAT_TYPE (WAVE_FORMAT_MVI_MV12), - FORMAT_TYPE (WAVE_FORMAT_DF_G726), - FORMAT_TYPE (WAVE_FORMAT_DF_GSM610), - FORMAT_TYPE (WAVE_FORMAT_ONLIVE), - FORMAT_TYPE (WAVE_FORMAT_SBC24), - FORMAT_TYPE (WAVE_FORMAT_DOLBY_AC3_SPDIF), - FORMAT_TYPE (WAVE_FORMAT_ZYXEL_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_PHILIPS_LPCBB), - FORMAT_TYPE (WAVE_FORMAT_PACKED), - FORMAT_TYPE (WAVE_FORMAT_RHETOREX_ADPCM), - FORMAT_TYPE (IBM_FORMAT_MULAW), - FORMAT_TYPE (IBM_FORMAT_ALAW), - FORMAT_TYPE (IBM_FORMAT_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_VIVO_G723), - FORMAT_TYPE (WAVE_FORMAT_VIVO_SIREN), - FORMAT_TYPE (WAVE_FORMAT_DIGITAL_G723), - FORMAT_TYPE (WAVE_FORMAT_CREATIVE_ADPCM), - FORMAT_TYPE (WAVE_FORMAT_CREATIVE_FASTSPEECH8), - FORMAT_TYPE (WAVE_FORMAT_CREATIVE_FASTSPEECH10), - FORMAT_TYPE (WAVE_FORMAT_QUARTERDECK), - FORMAT_TYPE (WAVE_FORMAT_FM_TOWNS_SND), - FORMAT_TYPE (WAVE_FORMAT_BZV_DIGITAL), - FORMAT_TYPE (WAVE_FORMAT_VME_VMPCM), - FORMAT_TYPE (WAVE_FORMAT_OLIGSM), - FORMAT_TYPE (WAVE_FORMAT_OLIADPCM), - FORMAT_TYPE (WAVE_FORMAT_OLICELP), - FORMAT_TYPE (WAVE_FORMAT_OLISBC), - FORMAT_TYPE (WAVE_FORMAT_OLIOPR), - FORMAT_TYPE (WAVE_FORMAT_LH_CODEC), - FORMAT_TYPE (WAVE_FORMAT_NORRIS), - FORMAT_TYPE (WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS), - FORMAT_TYPE (WAVE_FORMAT_DVM), - FORMAT_TYPE (WAVE_FORMAT_INTERWAV_VSC112), - FORMAT_TYPE (WAVE_FORMAT_IPP_ITU_G_723_1), - FORMAT_TYPE (WAVE_FORMAT_EXTENSIBLE), -} ; - -char const* -wav_w64_format_str (int k) -{ int lower, upper, mid ; - - lower = -1 ; - upper = sizeof (wave_descs) / sizeof (WAV_FORMAT_DESC) ; - - /* binary search */ - if ((wave_descs [0].ID <= k) && (k <= wave_descs [upper - 1].ID)) - { - while (lower + 1 < upper) - { mid = (upper + lower) / 2 ; - - if (k == wave_descs [mid].ID) - return wave_descs [mid].name ; - if (k < wave_descs [mid].ID) - upper = mid ; - else - lower = mid ; - } ; - } ; - - return "Unknown format" ; -} /* wav_w64_format_str */ - -int -wav_w64_srate2blocksize (int srate_chan_product) -{ if (srate_chan_product < 12000) - return 256 ; - if (srate_chan_product < 23000) - return 512 ; - if (srate_chan_product < 44000) - return 1024 ; - return 2048 ; -} /* srate2blocksize */ diff --git a/lib-src/libsndfile/src/wavlike.c b/lib-src/libsndfile/src/wavlike.c new file mode 100644 index 000000000..1134b112a --- /dev/null +++ b/lib-src/libsndfile/src/wavlike.c @@ -0,0 +1,1332 @@ +/* +** Copyright (C) 1999-2017 Erik de Castro Lopo +** Copyright (C) 2004-2005 David Viens +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include + +#include "sndfile.h" +#include "sfendian.h" +#include "common.h" +#include "wavlike.h" + + +#define WAV_BEXT_MIN_CHUNK_SIZE 602 +#define WAV_BEXT_MAX_CHUNK_SIZE (10 * 1024) + +#define WAV_CART_MIN_CHUNK_SIZE 2048 +#define WAV_CART_MAX_CHUNK_SIZE 0xffffffff + + +static int exif_subchunk_parse (SF_PRIVATE *psf, uint32_t length) ; + + +/* Known WAVEFORMATEXTENSIBLE GUIDS. */ +static const EXT_SUBFORMAT MSGUID_SUBTYPE_PCM = +{ 0x00000001, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } +} ; + +static const EXT_SUBFORMAT MSGUID_SUBTYPE_MS_ADPCM = +{ 0x00000002, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } +} ; + +static const EXT_SUBFORMAT MSGUID_SUBTYPE_IEEE_FLOAT = +{ 0x00000003, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } +} ; + +static const EXT_SUBFORMAT MSGUID_SUBTYPE_ALAW = +{ 0x00000006, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } +} ; + +static const EXT_SUBFORMAT MSGUID_SUBTYPE_MULAW = +{ 0x00000007, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } +} ; + +/* +** the next two are from +** http://dream.cs.bath.ac.uk/researchdev/wave-ex/bformat.html +*/ + +static const EXT_SUBFORMAT MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_PCM = +{ 0x00000001, 0x0721, 0x11d3, { 0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00 } +} ; + +static const EXT_SUBFORMAT MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_IEEE_FLOAT = +{ 0x00000003, 0x0721, 0x11d3, { 0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00 } +} ; + + +#if 0 +/* maybe interesting one day to read the following through sf_read_raw */ +/* http://www.bath.ac.uk/~masrwd/pvocex/pvocex.html */ +static const EXT_SUBFORMAT MSGUID_SUBTYPE_PVOCEX = +{ 0x8312b9c2, 0x2e6e, 0x11d4, { 0xa8, 0x24, 0xde, 0x5b, 0x96, 0xc3, 0xab, 0x21 } +} ; +#endif + +/* This stores which bit in dwChannelMask maps to which channel */ +static const struct chanmap_s +{ int id ; + const char * name ; +} channel_mask_bits [] = +{ /* WAVEFORMATEXTENSIBLE doesn't distuingish FRONT_LEFT from LEFT */ + { SF_CHANNEL_MAP_LEFT, "L" }, + { SF_CHANNEL_MAP_RIGHT, "R" }, + { SF_CHANNEL_MAP_CENTER, "C" }, + { SF_CHANNEL_MAP_LFE, "LFE" }, + { SF_CHANNEL_MAP_REAR_LEFT, "Ls" }, + { SF_CHANNEL_MAP_REAR_RIGHT, "Rs" }, + { SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER, "Lc" }, + { SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER, "Rc" }, + { SF_CHANNEL_MAP_REAR_CENTER, "Cs" }, + { SF_CHANNEL_MAP_SIDE_LEFT, "Sl" }, + { SF_CHANNEL_MAP_SIDE_RIGHT, "Sr" }, + { SF_CHANNEL_MAP_TOP_CENTER, "Tc" }, + { SF_CHANNEL_MAP_TOP_FRONT_LEFT, "Tfl" }, + { SF_CHANNEL_MAP_TOP_FRONT_CENTER, "Tfc" }, + { SF_CHANNEL_MAP_TOP_FRONT_RIGHT, "Tfr" }, + { SF_CHANNEL_MAP_TOP_REAR_LEFT, "Trl" }, + { SF_CHANNEL_MAP_TOP_REAR_CENTER, "Trc" }, + { SF_CHANNEL_MAP_TOP_REAR_RIGHT, "Trr" }, +} ; + +/*------------------------------------------------------------------------------ + * Private static functions. + */ + +static int +wavex_guid_equal (const EXT_SUBFORMAT * first, const EXT_SUBFORMAT * second) +{ return !memcmp (first, second, sizeof (EXT_SUBFORMAT)) ; +} /* wavex_guid_equal */ + + + +int +wavlike_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize) +{ WAVLIKE_PRIVATE * wpriv ; + WAV_FMT *wav_fmt ; + int bytesread, k, bytespersec = 0 ; + + if ((wpriv = psf->container_data) == NULL) + return SFE_INTERNAL ; + wav_fmt = &wpriv->wav_fmt ; + + memset (wav_fmt, 0, sizeof (WAV_FMT)) ; + + if (fmtsize < 16) + return SFE_WAV_FMT_SHORT ; + + /* assume psf->rwf_endian is already properly set */ + + /* Read the minimal WAV file header here. */ + bytesread = psf_binheader_readf (psf, "224422", + &(wav_fmt->format), &(wav_fmt->min.channels), + &(wav_fmt->min.samplerate), &(wav_fmt->min.bytespersec), + &(wav_fmt->min.blockalign), &(wav_fmt->min.bitwidth)) ; + + psf_log_printf (psf, " Format : 0x%X => %s\n", wav_fmt->format, wavlike_format_str (wav_fmt->format)) ; + psf_log_printf (psf, " Channels : %d\n", wav_fmt->min.channels) ; + psf_log_printf (psf, " Sample Rate : %d\n", wav_fmt->min.samplerate) ; + + if (wav_fmt->format == WAVE_FORMAT_PCM && wav_fmt->min.blockalign == 0 + && wav_fmt->min.bitwidth > 0 && wav_fmt->min.channels > 0) + { wav_fmt->min.blockalign = wav_fmt->min.bitwidth / 8 + (wav_fmt->min.bitwidth % 8 > 0 ? 1 : 0) ; + wav_fmt->min.blockalign *= wav_fmt->min.channels ; + psf_log_printf (psf, " Block Align : 0 (should be %d)\n", wav_fmt->min.blockalign) ; + } + else + psf_log_printf (psf, " Block Align : %d\n", wav_fmt->min.blockalign) ; + + if (wav_fmt->format == WAVE_FORMAT_PCM && wav_fmt->min.bitwidth == 24 && + wav_fmt->min.blockalign == 4 * wav_fmt->min.channels) + { psf_log_printf (psf, " Bit Width : 24\n") ; + + psf_log_printf (psf, "\n" + " Ambiguous information in 'fmt ' chunk. Possibile file types:\n" + " 0) Invalid IEEE float file generated by Syntrillium's Cooledit!\n" + " 1) File generated by ALSA's arecord containing 24 bit samples in 32 bit containers.\n" + " 2) 24 bit file with incorrect Block Align value.\n" + "\n") ; + + wpriv->fmt_is_broken = 1 ; + } + else if (wav_fmt->min.bitwidth == 0) + { switch (wav_fmt->format) + { case WAVE_FORMAT_GSM610 : + case WAVE_FORMAT_IPP_ITU_G_723_1 : + psf_log_printf (psf, " Bit Width : %d\n", wav_fmt->min.bitwidth) ; + break ; + default : + psf_log_printf (psf, " Bit Width : %d (should not be 0)\n", wav_fmt->min.bitwidth) ; + } + } + else + { switch (wav_fmt->format) + { case WAVE_FORMAT_GSM610 : + case WAVE_FORMAT_IPP_ITU_G_723_1 : + psf_log_printf (psf, " Bit Width : %d (should be 0)\n", wav_fmt->min.bitwidth) ; + break ; + default : + psf_log_printf (psf, " Bit Width : %d\n", wav_fmt->min.bitwidth) ; + } + } ; + + psf->sf.samplerate = wav_fmt->min.samplerate ; + psf->sf.frames = 0 ; /* Correct this when reading data chunk. */ + psf->sf.channels = wav_fmt->min.channels ; + + switch (wav_fmt->format) + { case WAVE_FORMAT_PCM : + case WAVE_FORMAT_IEEE_FLOAT : + bytespersec = wav_fmt->min.samplerate * wav_fmt->min.blockalign ; + if (wav_fmt->min.bytespersec != (unsigned) bytespersec) + psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->min.bytespersec, bytespersec) ; + else + psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->min.bytespersec) ; + + psf->bytewidth = BITWIDTH2BYTES (wav_fmt->min.bitwidth) ; + break ; + + case WAVE_FORMAT_ALAW : + case WAVE_FORMAT_MULAW : + if (wav_fmt->min.bytespersec != wav_fmt->min.samplerate * wav_fmt->min.blockalign) + psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->min.bytespersec, wav_fmt->min.samplerate * wav_fmt->min.blockalign) ; + else + psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->min.bytespersec) ; + + psf->bytewidth = 1 ; + if (fmtsize >= 18) + { bytesread += psf_binheader_readf (psf, "2", &(wav_fmt->size20.extrabytes)) ; + psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->size20.extrabytes) ; + } ; + break ; + + case WAVE_FORMAT_IMA_ADPCM : + if (wav_fmt->min.bitwidth != 4) + return SFE_WAV_ADPCM_NOT4BIT ; + if (wav_fmt->min.channels < 1 || wav_fmt->min.channels > 2) + return SFE_WAV_ADPCM_CHANNELS ; + + bytesread += psf_binheader_readf (psf, "22", &(wav_fmt->ima.extrabytes), &(wav_fmt->ima.samplesperblock)) ; + psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->ima.extrabytes) ; + if (wav_fmt->ima.samplesperblock < 1) + { psf_log_printf (psf, " Samples/Block : %d (should be > 0)\n", wav_fmt->ima.samplesperblock) ; + return SFE_WAV_ADPCM_SAMPLES ; + } + else + psf_log_printf (psf, " Samples/Block : %d\n", wav_fmt->ima.samplesperblock) ; + + bytespersec = (wav_fmt->ima.samplerate * wav_fmt->ima.blockalign) / wav_fmt->ima.samplesperblock ; + if (wav_fmt->ima.bytespersec != (unsigned) bytespersec) + psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->ima.bytespersec, bytespersec) ; + else + psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->ima.bytespersec) ; + + break ; + + case WAVE_FORMAT_MS_ADPCM : + if (wav_fmt->msadpcm.bitwidth != 4) + return SFE_WAV_ADPCM_NOT4BIT ; + if (wav_fmt->msadpcm.channels < 1 || wav_fmt->msadpcm.channels > 2) + return SFE_WAV_ADPCM_CHANNELS ; + + bytesread += psf_binheader_readf (psf, "222", &(wav_fmt->msadpcm.extrabytes), + &(wav_fmt->msadpcm.samplesperblock), &(wav_fmt->msadpcm.numcoeffs)) ; + + psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->msadpcm.extrabytes) ; + if (wav_fmt->ima.samplesperblock < 1) + { psf_log_printf (psf, " Samples/Block : %d (should be > 0)\n", wav_fmt->ima.samplesperblock) ; + return SFE_WAV_ADPCM_SAMPLES ; + } + else + psf_log_printf (psf, " Samples/Block : %d\n", wav_fmt->ima.samplesperblock) ; + + bytespersec = (wav_fmt->min.samplerate * wav_fmt->min.blockalign) / wav_fmt->msadpcm.samplesperblock ; + if (wav_fmt->min.bytespersec == (unsigned) bytespersec) + psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->min.bytespersec) ; + else if (wav_fmt->min.bytespersec == (wav_fmt->min.samplerate / wav_fmt->msadpcm.samplesperblock) * wav_fmt->min.blockalign) + psf_log_printf (psf, " Bytes/sec : %d (should be %d (MS BUG!))\n", wav_fmt->min.bytespersec, bytespersec) ; + else + psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->min.bytespersec, bytespersec) ; + + if (wav_fmt->msadpcm.numcoeffs > ARRAY_LEN (wav_fmt->msadpcm.coeffs)) + { psf_log_printf (psf, " No. of Coeffs : %d (should be <= %d)\n", wav_fmt->msadpcm.numcoeffs, ARRAY_LEN (wav_fmt->msadpcm.coeffs)) ; + wav_fmt->msadpcm.numcoeffs = ARRAY_LEN (wav_fmt->msadpcm.coeffs) ; + } + else + psf_log_printf (psf, " No. of Coeffs : %d\n", wav_fmt->msadpcm.numcoeffs) ; + + psf_log_printf (psf, " Index Coeffs1 Coeffs2\n") ; + for (k = 0 ; k < wav_fmt->msadpcm.numcoeffs ; k++) + { char buffer [128] ; + + bytesread += + psf_binheader_readf (psf, "22", &(wav_fmt->msadpcm.coeffs [k].coeff1), &(wav_fmt->msadpcm.coeffs [k].coeff2)) ; + snprintf (buffer, sizeof (buffer), " %2d %7d %7d\n", k, wav_fmt->msadpcm.coeffs [k].coeff1, wav_fmt->msadpcm.coeffs [k].coeff2) ; + psf_log_printf (psf, buffer) ; + } ; + break ; + + case WAVE_FORMAT_GSM610 : + if (wav_fmt->gsm610.channels != 1 || wav_fmt->gsm610.blockalign != 65) + return SFE_WAV_GSM610_FORMAT ; + + bytesread += + psf_binheader_readf (psf, "22", &(wav_fmt->gsm610.extrabytes), &(wav_fmt->gsm610.samplesperblock)) ; + + if (wav_fmt->gsm610.samplesperblock != 320) + return SFE_WAV_GSM610_FORMAT ; + + bytespersec = (wav_fmt->gsm610.samplerate * wav_fmt->gsm610.blockalign) / wav_fmt->gsm610.samplesperblock ; + if (wav_fmt->gsm610.bytespersec != (unsigned) bytespersec) + psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->gsm610.bytespersec, bytespersec) ; + else + psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->gsm610.bytespersec) ; + + psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->gsm610.extrabytes) ; + psf_log_printf (psf, " Samples/Block : %d\n", wav_fmt->gsm610.samplesperblock) ; + break ; + + case WAVE_FORMAT_EXTENSIBLE : + if (wav_fmt->ext.bytespersec != wav_fmt->ext.samplerate * wav_fmt->ext.blockalign) + psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->ext.bytespersec, wav_fmt->ext.samplerate * wav_fmt->ext.blockalign) ; + else + psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->ext.bytespersec) ; + + bytesread += + psf_binheader_readf (psf, "224", &(wav_fmt->ext.extrabytes), &(wav_fmt->ext.validbits), + &(wav_fmt->ext.channelmask)) ; + + psf_log_printf (psf, " Valid Bits : %d\n", wav_fmt->ext.validbits) ; + + if (wav_fmt->ext.channelmask == 0) + psf_log_printf (psf, " Channel Mask : 0x0 (should not be zero)\n") ; + else + { char buffer [512] ; + unsigned bit ; + + wpriv->wavex_channelmask = wav_fmt->ext.channelmask ; + + /* It's probably wise to ignore the channel mask if it is all zero */ + free (psf->channel_map) ; + + if ((psf->channel_map = calloc (psf->sf.channels, sizeof (psf->channel_map [0]))) == NULL) + return SFE_MALLOC_FAILED ; + + /* Terminate the buffer we're going to append_snprintf into. */ + buffer [0] = 0 ; + + for (bit = k = 0 ; bit < ARRAY_LEN (channel_mask_bits) && k < psf->sf.channels ; bit++) + { + if (wav_fmt->ext.channelmask & (1 << bit)) + { if (k > psf->sf.channels) + { psf_log_printf (psf, "*** More channel map bits than there are channels.\n") ; + break ; + } ; + + psf->channel_map [k++] = channel_mask_bits [bit].id ; + append_snprintf (buffer, sizeof (buffer), "%s, ", channel_mask_bits [bit].name) ; + } ; + } ; + + /* Remove trailing ", ". */ + bit = strlen (buffer) ; + if (bit >= 2) + { buffer [--bit] = 0 ; + buffer [--bit] = 0 ; + } ; + + if (k != psf->sf.channels) + { psf_log_printf (psf, " Channel Mask : 0x%X\n", wav_fmt->ext.channelmask) ; + psf_log_printf (psf, "*** Less channel map bits than there are channels.\n") ; + } + else + psf_log_printf (psf, " Channel Mask : 0x%X (%s)\n", wav_fmt->ext.channelmask, buffer) ; + } ; + + bytesread += psf_binheader_readf (psf, "422", &(wav_fmt->ext.esf.esf_field1), &(wav_fmt->ext.esf.esf_field2), &(wav_fmt->ext.esf.esf_field3)) ; + + /* compare the esf_fields with each known GUID? and print? */ + psf_log_printf (psf, " Subformat\n") ; + psf_log_printf (psf, " esf_field1 : 0x%X\n", wav_fmt->ext.esf.esf_field1) ; + psf_log_printf (psf, " esf_field2 : 0x%X\n", wav_fmt->ext.esf.esf_field2) ; + psf_log_printf (psf, " esf_field3 : 0x%X\n", wav_fmt->ext.esf.esf_field3) ; + psf_log_printf (psf, " esf_field4 : ") ; + for (k = 0 ; k < 8 ; k++) + { bytesread += psf_binheader_readf (psf, "1", &(wav_fmt->ext.esf.esf_field4 [k])) ; + psf_log_printf (psf, "0x%X ", wav_fmt->ext.esf.esf_field4 [k] & 0xFF) ; + } ; + psf_log_printf (psf, "\n") ; + psf->bytewidth = BITWIDTH2BYTES (wav_fmt->ext.bitwidth) ; + + /* Compare GUIDs for known ones. */ + if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_PCM)) + { psf->sf.format = SF_FORMAT_WAVEX | u_bitwidth_to_subformat (psf->bytewidth * 8) ; + psf_log_printf (psf, " format : pcm\n") ; + } + else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_MS_ADPCM)) + { psf->sf.format = (SF_FORMAT_WAVEX | SF_FORMAT_MS_ADPCM) ; + psf_log_printf (psf, " format : ms adpcm\n") ; + } + else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_IEEE_FLOAT)) + { psf->sf.format = SF_FORMAT_WAVEX | ((psf->bytewidth == 8) ? SF_FORMAT_DOUBLE : SF_FORMAT_FLOAT) ; + psf_log_printf (psf, " format : IEEE float\n") ; + } + else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_ALAW)) + { psf->sf.format = (SF_FORMAT_WAVEX | SF_FORMAT_ALAW) ; + psf_log_printf (psf, " format : A-law\n") ; + } + else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_MULAW)) + { psf->sf.format = (SF_FORMAT_WAVEX | SF_FORMAT_ULAW) ; + psf_log_printf (psf, " format : u-law\n") ; + } + else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_PCM)) + { psf->sf.format = SF_FORMAT_WAVEX | u_bitwidth_to_subformat (psf->bytewidth * 8) ; + psf_log_printf (psf, " format : pcm (Ambisonic B)\n") ; + wpriv->wavex_ambisonic = SF_AMBISONIC_B_FORMAT ; + } + else if (wavex_guid_equal (&wav_fmt->ext.esf, &MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_IEEE_FLOAT)) + { psf->sf.format = SF_FORMAT_WAVEX | ((psf->bytewidth == 8) ? SF_FORMAT_DOUBLE : SF_FORMAT_FLOAT) ; + psf_log_printf (psf, " format : IEEE float (Ambisonic B)\n") ; + wpriv->wavex_ambisonic = SF_AMBISONIC_B_FORMAT ; + } + else + return SFE_UNIMPLEMENTED ; + + break ; + + case WAVE_FORMAT_G721_ADPCM : + psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->g72x.bytespersec) ; + if (fmtsize >= 20) + { bytesread += psf_binheader_readf (psf, "22", &(wav_fmt->g72x.extrabytes), &(wav_fmt->g72x.auxblocksize)) ; + if (wav_fmt->g72x.extrabytes == 0) + psf_log_printf (psf, " Extra Bytes : %d (should be 2)\n", wav_fmt->g72x.extrabytes) ; + else + psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->g72x.extrabytes) ; + psf_log_printf (psf, " Aux Blk Size : %d\n", wav_fmt->g72x.auxblocksize) ; + } + else if (fmtsize == 18) + { bytesread += psf_binheader_readf (psf, "2", &(wav_fmt->g72x.extrabytes)) ; + psf_log_printf (psf, " Extra Bytes : %d%s\n", wav_fmt->g72x.extrabytes, wav_fmt->g72x.extrabytes != 0 ? " (should be 0)" : "") ; + } + else + psf_log_printf (psf, "*** 'fmt ' chunk should be bigger than this!\n") ; + break ; + + case WAVE_FORMAT_NMS_VBXADPCM : + if (wav_fmt->min.channels != 1 || wav_fmt->min.bitwidth < 2 || wav_fmt->min.bitwidth * 20 + 2 != wav_fmt->min.blockalign) + return SFE_WAV_NMS_FORMAT ; + + bytespersec = (wav_fmt->min.samplerate * wav_fmt->min.blockalign) / 160 ; + if (wav_fmt->min.bytespersec == (unsigned) bytespersec) + psf_log_printf (psf, " Bytes/sec : %d\n", wav_fmt->min.bytespersec) ; + else + psf_log_printf (psf, " Bytes/sec : %d (should be %d)\n", wav_fmt->min.bytespersec, bytespersec) ; + if (fmtsize >= 18) + { bytesread += psf_binheader_readf (psf, "2", &(wav_fmt->size20.extrabytes)) ; + psf_log_printf (psf, " Extra Bytes : %d\n", wav_fmt->size20.extrabytes) ; + } ; + break ; + + default : + psf_log_printf (psf, "*** No 'fmt ' chunk dumper for this format!\n") ; + return SFE_WAV_BAD_FMT ; + } ; + + if (bytesread > fmtsize) + { psf_log_printf (psf, "*** wavlike_read_fmt_chunk (bytesread > fmtsize)\n") ; + return SFE_WAV_BAD_FMT ; + } + else + psf_binheader_readf (psf, "j", fmtsize - bytesread) ; + + psf->blockwidth = wav_fmt->min.channels * psf->bytewidth ; + + return 0 ; +} /* wavlike_read_fmt_chunk */ + +void +wavlike_write_guid (SF_PRIVATE *psf, const EXT_SUBFORMAT * subformat) +{ + psf_binheader_writef (psf, "422b", BHW4 (subformat->esf_field1), + BHW2 (subformat->esf_field2), BHW2 (subformat->esf_field3), + BHWv (subformat->esf_field4), BHWz (8)) ; +} /* wavlike_write_guid */ + + +int +wavlike_gen_channel_mask (const int *chan_map, int channels) +{ int chan, mask = 0, bit = -1, last_bit = -1 ; + + if (chan_map == NULL) + return 0 ; + + for (chan = 0 ; chan < channels ; chan ++) + { int k ; + + for (k = bit + 1 ; k < ARRAY_LEN (channel_mask_bits) ; k++) + if (chan_map [chan] == channel_mask_bits [k].id) + { bit = k ; + break ; + } ; + + /* Check for bad sequence. */ + if (bit <= last_bit) + return 0 ; + + mask += 1 << bit ; + last_bit = bit ; + } ; + + return mask ; +} /* wavlike_gen_channel_mask */ + +void +wavlike_analyze (SF_PRIVATE *psf) +{ unsigned char buffer [4096] ; + AUDIO_DETECT ad ; + int format = 0 ; + + if (psf->is_pipe) + { psf_log_printf (psf, "*** Error : Reading from a pipe. Can't analyze data section to figure out real data format.\n\n") ; + return ; + } ; + + psf_log_printf (psf, "---------------------------------------------------\n" + "Format is known to be broken. Using detection code.\n") ; + + /* Code goes here. */ + ad.endianness = SF_ENDIAN_LITTLE ; + ad.channels = psf->sf.channels ; + + psf_fseek (psf, 3 * 4 * 50, SEEK_SET) ; + + while (psf_fread (buffer, 1, sizeof (buffer), psf) == sizeof (buffer)) + { format = audio_detect (psf, &ad, buffer, sizeof (buffer)) ; + if (format != 0) + break ; + } ; + + /* Seek to start of DATA section. */ + psf_fseek (psf, psf->dataoffset, SEEK_SET) ; + + if (format == 0) + { psf_log_printf (psf, "wavlike_analyze : detection failed.\n") ; + return ; + } ; + + switch (format) + { case SF_FORMAT_PCM_32 : + case SF_FORMAT_FLOAT : + psf_log_printf (psf, "wavlike_analyze : found format : 0x%X\n", format) ; + psf->sf.format = (psf->sf.format & ~SF_FORMAT_SUBMASK) + format ; + psf->bytewidth = 4 ; + psf->blockwidth = psf->sf.channels * psf->bytewidth ; + break ; + + case SF_FORMAT_PCM_24 : + psf_log_printf (psf, "wavlike_analyze : found format : 0x%X\n", format) ; + psf->sf.format = (psf->sf.format & ~SF_FORMAT_SUBMASK) + format ; + psf->bytewidth = 3 ; + psf->blockwidth = psf->sf.channels * psf->bytewidth ; + break ; + + default : + psf_log_printf (psf, "wavlike_analyze : unhandled format : 0x%X\n", format) ; + break ; + } ; + + return ; +} /* wavlike_analyze */ + +/*============================================================================== +*/ + +typedef struct +{ int ID ; + const char *name ; +} WAV_FORMAT_DESC ; + +#define STR(x) #x +#define FORMAT_TYPE(x) { x, STR (x) } + +static WAV_FORMAT_DESC wave_descs [] = +{ FORMAT_TYPE (WAVE_FORMAT_PCM), + FORMAT_TYPE (WAVE_FORMAT_MS_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_IEEE_FLOAT), + FORMAT_TYPE (WAVE_FORMAT_VSELP), + FORMAT_TYPE (WAVE_FORMAT_IBM_CVSD), + FORMAT_TYPE (WAVE_FORMAT_ALAW), + FORMAT_TYPE (WAVE_FORMAT_MULAW), + FORMAT_TYPE (WAVE_FORMAT_OKI_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_IMA_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_MEDIASPACE_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_SIERRA_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_G723_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_DIGISTD), + FORMAT_TYPE (WAVE_FORMAT_DIGIFIX), + FORMAT_TYPE (WAVE_FORMAT_DIALOGIC_OKI_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_MEDIAVISION_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_CU_CODEC), + FORMAT_TYPE (WAVE_FORMAT_YAMAHA_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_SONARC), + FORMAT_TYPE (WAVE_FORMAT_DSPGROUP_TRUESPEECH), + FORMAT_TYPE (WAVE_FORMAT_ECHOSC1), + FORMAT_TYPE (WAVE_FORMAT_AUDIOFILE_AF36), + FORMAT_TYPE (WAVE_FORMAT_APTX), + FORMAT_TYPE (WAVE_FORMAT_AUDIOFILE_AF10), + FORMAT_TYPE (WAVE_FORMAT_PROSODY_1612), + FORMAT_TYPE (WAVE_FORMAT_LRC), + FORMAT_TYPE (WAVE_FORMAT_DOLBY_AC2), + FORMAT_TYPE (WAVE_FORMAT_GSM610), + FORMAT_TYPE (WAVE_FORMAT_MSNAUDIO), + FORMAT_TYPE (WAVE_FORMAT_ANTEX_ADPCME), + FORMAT_TYPE (WAVE_FORMAT_CONTROL_RES_VQLPC), + FORMAT_TYPE (WAVE_FORMAT_DIGIREAL), + FORMAT_TYPE (WAVE_FORMAT_DIGIADPCM), + FORMAT_TYPE (WAVE_FORMAT_CONTROL_RES_CR10), + FORMAT_TYPE (WAVE_FORMAT_NMS_VBXADPCM), + FORMAT_TYPE (WAVE_FORMAT_ROLAND_RDAC), + FORMAT_TYPE (WAVE_FORMAT_ECHOSC3), + FORMAT_TYPE (WAVE_FORMAT_ROCKWELL_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_ROCKWELL_DIGITALK), + FORMAT_TYPE (WAVE_FORMAT_XEBEC), + FORMAT_TYPE (WAVE_FORMAT_G721_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_G728_CELP), + FORMAT_TYPE (WAVE_FORMAT_MSG723), + FORMAT_TYPE (WAVE_FORMAT_MPEG), + FORMAT_TYPE (WAVE_FORMAT_RT24), + FORMAT_TYPE (WAVE_FORMAT_PAC), + FORMAT_TYPE (WAVE_FORMAT_MPEGLAYER3), + FORMAT_TYPE (WAVE_FORMAT_LUCENT_G723), + FORMAT_TYPE (WAVE_FORMAT_CIRRUS), + FORMAT_TYPE (WAVE_FORMAT_ESPCM), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE), + FORMAT_TYPE (WAVE_FORMAT_CANOPUS_ATRAC), + FORMAT_TYPE (WAVE_FORMAT_G726_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_G722_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_DSAT), + FORMAT_TYPE (WAVE_FORMAT_DSAT_DISPLAY), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_BYTE_ALIGNED), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_AC8), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_AC10), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_AC16), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_AC20), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_RT24), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_RT29), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_RT29HW), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_VR12), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_VR18), + FORMAT_TYPE (WAVE_FORMAT_VOXWARE_TQ40), + FORMAT_TYPE (WAVE_FORMAT_SOFTSOUND), + FORMAT_TYPE (WAVE_FORMAT_VOXARE_TQ60), + FORMAT_TYPE (WAVE_FORMAT_MSRT24), + FORMAT_TYPE (WAVE_FORMAT_G729A), + FORMAT_TYPE (WAVE_FORMAT_MVI_MV12), + FORMAT_TYPE (WAVE_FORMAT_DF_G726), + FORMAT_TYPE (WAVE_FORMAT_DF_GSM610), + FORMAT_TYPE (WAVE_FORMAT_ONLIVE), + FORMAT_TYPE (WAVE_FORMAT_SBC24), + FORMAT_TYPE (WAVE_FORMAT_DOLBY_AC3_SPDIF), + FORMAT_TYPE (WAVE_FORMAT_ZYXEL_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_PHILIPS_LPCBB), + FORMAT_TYPE (WAVE_FORMAT_PACKED), + FORMAT_TYPE (WAVE_FORMAT_RHETOREX_ADPCM), + FORMAT_TYPE (IBM_FORMAT_MULAW), + FORMAT_TYPE (IBM_FORMAT_ALAW), + FORMAT_TYPE (IBM_FORMAT_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_VIVO_G723), + FORMAT_TYPE (WAVE_FORMAT_VIVO_SIREN), + FORMAT_TYPE (WAVE_FORMAT_DIGITAL_G723), + FORMAT_TYPE (WAVE_FORMAT_CREATIVE_ADPCM), + FORMAT_TYPE (WAVE_FORMAT_CREATIVE_FASTSPEECH8), + FORMAT_TYPE (WAVE_FORMAT_CREATIVE_FASTSPEECH10), + FORMAT_TYPE (WAVE_FORMAT_QUARTERDECK), + FORMAT_TYPE (WAVE_FORMAT_FM_TOWNS_SND), + FORMAT_TYPE (WAVE_FORMAT_BZV_DIGITAL), + FORMAT_TYPE (WAVE_FORMAT_VME_VMPCM), + FORMAT_TYPE (WAVE_FORMAT_OLIGSM), + FORMAT_TYPE (WAVE_FORMAT_OLIADPCM), + FORMAT_TYPE (WAVE_FORMAT_OLICELP), + FORMAT_TYPE (WAVE_FORMAT_OLISBC), + FORMAT_TYPE (WAVE_FORMAT_OLIOPR), + FORMAT_TYPE (WAVE_FORMAT_LH_CODEC), + FORMAT_TYPE (WAVE_FORMAT_NORRIS), + FORMAT_TYPE (WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS), + FORMAT_TYPE (WAVE_FORMAT_DVM), + FORMAT_TYPE (WAVE_FORMAT_INTERWAV_VSC112), + FORMAT_TYPE (WAVE_FORMAT_IPP_ITU_G_723_1), + FORMAT_TYPE (WAVE_FORMAT_EXTENSIBLE), +} ; + +char const* +wavlike_format_str (int k) +{ int lower, upper, mid ; + + lower = -1 ; + upper = sizeof (wave_descs) / sizeof (WAV_FORMAT_DESC) ; + + /* binary search */ + if ((wave_descs [0].ID <= k) && (k <= wave_descs [upper - 1].ID)) + { + while (lower + 1 < upper) + { mid = (upper + lower) / 2 ; + + if (k == wave_descs [mid].ID) + return wave_descs [mid].name ; + if (k < wave_descs [mid].ID) + upper = mid ; + else + lower = mid ; + } ; + } ; + + return "Unknown format" ; +} /* wavlike_format_str */ + +int +wavlike_srate2blocksize (int srate_chan_product) +{ if (srate_chan_product < 12000) + return 256 ; + if (srate_chan_product < 23000) + return 512 ; + if (srate_chan_product < 44000) + return 1024 ; + return 2048 ; +} /* srate2blocksize */ + +int +wavlike_read_bext_chunk (SF_PRIVATE *psf, uint32_t chunksize) +{ + SF_BROADCAST_INFO_16K * b ; + uint32_t bytes = 0 ; + + if (chunksize < WAV_BEXT_MIN_CHUNK_SIZE) + { psf_log_printf (psf, "bext : %u (should be >= %d)\n", chunksize, WAV_BEXT_MIN_CHUNK_SIZE) ; + psf_binheader_readf (psf, "j", chunksize) ; + return 0 ; + } ; + + if (chunksize > WAV_BEXT_MAX_CHUNK_SIZE) + { psf_log_printf (psf, "bext : %u (should be < %d)\n", chunksize, WAV_BEXT_MAX_CHUNK_SIZE) ; + psf_binheader_readf (psf, "j", chunksize) ; + return 0 ; + } ; + + if (chunksize >= sizeof (SF_BROADCAST_INFO_16K)) + { psf_log_printf (psf, "bext : %u too big to be handled\n", chunksize) ; + psf_binheader_readf (psf, "j", chunksize) ; + return 0 ; + } ; + + psf_log_printf (psf, "bext : %u\n", chunksize) ; + + if ((psf->broadcast_16k = broadcast_var_alloc ()) == NULL) + { psf->error = SFE_MALLOC_FAILED ; + return psf->error ; + } ; + + b = psf->broadcast_16k ; + + bytes += psf_binheader_readf (psf, "b", b->description, sizeof (b->description)) ; + bytes += psf_binheader_readf (psf, "b", b->originator, sizeof (b->originator)) ; + bytes += psf_binheader_readf (psf, "b", b->originator_reference, sizeof (b->originator_reference)) ; + bytes += psf_binheader_readf (psf, "b", b->origination_date, sizeof (b->origination_date)) ; + bytes += psf_binheader_readf (psf, "b", b->origination_time, sizeof (b->origination_time)) ; + bytes += psf_binheader_readf (psf, "442", &b->time_reference_low, &b->time_reference_high, &b->version) ; + bytes += psf_binheader_readf (psf, "b", &b->umid, sizeof (b->umid)) ; + bytes += psf_binheader_readf (psf, "22", &b->loudness_value, &b->loudness_range) ; + bytes += psf_binheader_readf (psf, "222", &b->max_true_peak_level, &b->max_momentary_loudness, &b->max_shortterm_loudness) ; + bytes += psf_binheader_readf (psf, "j", 180) ; + + if (chunksize > WAV_BEXT_MIN_CHUNK_SIZE) + { /* File has coding history data. */ + + b->coding_history_size = chunksize - WAV_BEXT_MIN_CHUNK_SIZE ; + + /* We do not parse the coding history */ + bytes += psf_binheader_readf (psf, "b", BHWv (b->coding_history), BHWz (b->coding_history_size)) ; + } ; + + if (bytes < chunksize) + psf_binheader_readf (psf, "j", BHWj (chunksize - bytes)) ; + + return 0 ; +} /* wavlike_read_bext_chunk */ + +int +wavlike_write_bext_chunk (SF_PRIVATE *psf) +{ SF_BROADCAST_INFO_16K *b ; + + if (psf->broadcast_16k == NULL) + return -1 ; + + b = psf->broadcast_16k ; + + psf_binheader_writef (psf, "m4", BHWm (bext_MARKER), BHW4 (WAV_BEXT_MIN_CHUNK_SIZE + b->coding_history_size)) ; + + /* + ** Note that it is very important that the field widths of the SF_BROADCAST_INFO + ** struct match those of the bext chunk fields. + */ + + psf_binheader_writef (psf, "b", BHWv (b->description), BHWz (sizeof (b->description))) ; + psf_binheader_writef (psf, "b", BHWv (b->originator), BHWz (sizeof (b->originator))) ; + psf_binheader_writef (psf, "b", BHWv (b->originator_reference), BHWz (sizeof (b->originator_reference))) ; + psf_binheader_writef (psf, "b", BHWv (b->origination_date), BHWz (sizeof (b->origination_date))) ; + psf_binheader_writef (psf, "b", BHWv (b->origination_time), BHWz (sizeof (b->origination_time))) ; + psf_binheader_writef (psf, "442", BHW4 (b->time_reference_low), BHW4 (b->time_reference_high), BHW2 (b->version)) ; + psf_binheader_writef (psf, "b", BHWv (b->umid), BHWz (sizeof (b->umid))) ; + psf_binheader_writef (psf, "22", BHW2 (b->loudness_value), BHW2 (b->loudness_range)) ; + psf_binheader_writef (psf, "222", BHW2 (b->max_true_peak_level), BHW2 (b->max_momentary_loudness), BHW2 (b->max_shortterm_loudness)) ; + psf_binheader_writef (psf, "z", BHWz (180)) ; + + if (b->coding_history_size > 0) + psf_binheader_writef (psf, "b", BHWv (b->coding_history), BHWz (b->coding_history_size)) ; + + return 0 ; +} /* wavlike_write_bext_chunk */ + +int +wavlike_read_cart_chunk (SF_PRIVATE *psf, uint32_t chunksize) +{ SF_CART_INFO_16K *c ; + uint32_t bytes = 0 ; + int k ; + + if (chunksize < WAV_CART_MIN_CHUNK_SIZE) + { psf_log_printf (psf, "cart : %u (should be >= %d)\n", chunksize, WAV_CART_MIN_CHUNK_SIZE) ; + psf_binheader_readf (psf, "j", chunksize) ; + return 0 ; + } ; + if (chunksize > WAV_CART_MAX_CHUNK_SIZE) + { psf_log_printf (psf, "cart : %u (should be < %d)\n", chunksize, WAV_CART_MAX_CHUNK_SIZE) ; + psf_binheader_readf (psf, "j", chunksize) ; + return 0 ; + } ; + + if (chunksize >= sizeof (SF_CART_INFO_16K)) + { psf_log_printf (psf, "cart : %u too big to be handled\n", chunksize) ; + psf_binheader_readf (psf, "j", chunksize) ; + return 0 ; + } ; + + psf_log_printf (psf, "cart : %u\n", chunksize) ; + + if ((psf->cart_16k = cart_var_alloc ()) == NULL) + { psf->error = SFE_MALLOC_FAILED ; + return psf->error ; + } ; + + c = psf->cart_16k ; + bytes += psf_binheader_readf (psf, "b", c->version, sizeof (c->version)) ; + bytes += psf_binheader_readf (psf, "b", c->title, sizeof (c->title)) ; + bytes += psf_binheader_readf (psf, "b", c->artist, sizeof (c->artist)) ; + bytes += psf_binheader_readf (psf, "b", c->cut_id, sizeof (c->cut_id)) ; + bytes += psf_binheader_readf (psf, "b", c->client_id, sizeof (c->client_id)) ; + bytes += psf_binheader_readf (psf, "b", c->category, sizeof (c->category)) ; + bytes += psf_binheader_readf (psf, "b", c->classification, sizeof (c->classification)) ; + bytes += psf_binheader_readf (psf, "b", c->out_cue, sizeof (c->out_cue)) ; + bytes += psf_binheader_readf (psf, "b", c->start_date, sizeof (c->start_date)) ; + bytes += psf_binheader_readf (psf, "b", c->start_time, sizeof (c->start_time)) ; + bytes += psf_binheader_readf (psf, "b", c->end_date, sizeof (c->end_date)) ; + bytes += psf_binheader_readf (psf, "b", c->end_time, sizeof (c->end_time)) ; + bytes += psf_binheader_readf (psf, "b", c->producer_app_id, sizeof (c->producer_app_id)) ; + bytes += psf_binheader_readf (psf, "b", c->producer_app_version, sizeof (c->producer_app_version)) ; + bytes += psf_binheader_readf (psf, "b", c->user_def, sizeof (c->user_def)) ; + bytes += psf_binheader_readf (psf, "e4", &c->level_reference, sizeof (c->level_reference)) ; + + for (k = 0 ; k < ARRAY_LEN (c->post_timers) ; k++) + bytes += psf_binheader_readf (psf, "b4", &c->post_timers [k].usage, make_size_t (4), &c->post_timers [k].value) ; + + bytes += psf_binheader_readf (psf, "b", c->reserved, sizeof (c->reserved)) ; + bytes += psf_binheader_readf (psf, "b", c->url, sizeof (c->url)) ; + + if (chunksize > WAV_CART_MIN_CHUNK_SIZE) + { /* File has tag text. */ + c->tag_text_size = chunksize - WAV_CART_MIN_CHUNK_SIZE ; + bytes += psf_binheader_readf (psf, "b", c->tag_text, make_size_t (c->tag_text_size)) ; + } ; + + return 0 ; +} /* wavlike_read_cart_chunk */ + +int +wavlike_write_cart_chunk (SF_PRIVATE *psf) +{ SF_CART_INFO_16K *c ; + int k ; + + if (psf->cart_16k == NULL) + return -1 ; + + c = psf->cart_16k ; + psf_binheader_writef (psf, "m4", BHWm (cart_MARKER), BHW4 (WAV_CART_MIN_CHUNK_SIZE + c->tag_text_size)) ; + /* + ** Note that it is very important that the field widths of the SF_CART_INFO + ** struct match those of the cart chunk fields. + */ + psf_binheader_writef (psf, "b", BHWv (c->version), BHWz (sizeof (c->version))) ; + psf_binheader_writef (psf, "b", BHWv (c->title), BHWz (sizeof (c->title))) ; + psf_binheader_writef (psf, "b", BHWv (c->artist), BHWz (sizeof (c->artist))) ; + psf_binheader_writef (psf, "b", BHWv (c->cut_id), BHWz (sizeof (c->cut_id))) ; + psf_binheader_writef (psf, "b", BHWv (c->client_id), BHWz (sizeof (c->client_id))) ; + psf_binheader_writef (psf, "b", BHWv (c->category), BHWz (sizeof (c->category))) ; + psf_binheader_writef (psf, "b", BHWv (c->classification), BHWz (sizeof (c->classification))) ; + psf_binheader_writef (psf, "b", BHWv (c->out_cue), BHWz (sizeof (c->out_cue))) ; + psf_binheader_writef (psf, "b", BHWv (c->start_date), BHWz (sizeof (c->start_date))) ; + psf_binheader_writef (psf, "b", BHWv (c->start_time), BHWz (sizeof (c->start_time))) ; + psf_binheader_writef (psf, "b", BHWv (c->end_date), BHWz (sizeof (c->end_date))) ; + psf_binheader_writef (psf, "b", BHWv (c->end_time), BHWz (sizeof (c->end_time))) ; + psf_binheader_writef (psf, "b", BHWv (c->producer_app_id), BHWz (sizeof (c->producer_app_id))) ; + psf_binheader_writef (psf, "b", BHWv (c->producer_app_version), BHWz (sizeof (c->producer_app_version))) ; + psf_binheader_writef (psf, "b", BHWv (c->user_def), BHWz (sizeof (c->user_def))) ; + psf_binheader_writef (psf, "e4", BHW4 (c->level_reference)) ; + + for (k = 0 ; k < ARRAY_LEN (c->post_timers) ; k++) + psf_binheader_writef (psf, "b4", BHWv (c->post_timers [k].usage), BHWz (4), BHW4 (c->post_timers [k].value)) ; + + psf_binheader_writef (psf, "z", BHWz (sizeof (c->reserved))) ; // just write zeros, we don't have any other use for it + psf_binheader_writef (psf, "b", BHWv (c->url), BHWz (sizeof (c->url))) ; + + if (c->tag_text_size > 0) + psf_binheader_writef (psf, "b", BHWv (c->tag_text), BHWz (c->tag_text_size)) ; + + return 0 ; +} /* wavlike_write_cart_chunk */ + +int +wavlike_subchunk_parse (SF_PRIVATE *psf, int chunk, uint32_t chunk_length) +{ sf_count_t current_pos ; + char buffer [2048] ; + uint32_t chunk_size, bytesread = 0 ; + + current_pos = psf_fseek (psf, 0, SEEK_CUR) ; + + if (chunk_length <= 8) + { /* This case is for broken files generated by PEAK. */ + psf_log_printf (psf, "%M : %u (weird length)\n", chunk, chunk_length) ; + psf_binheader_readf (psf, "mj", &chunk, chunk_length - 4) ; + psf_log_printf (psf, " %M\n", chunk) ; + return 0 ; + } ; + + if (current_pos + chunk_length > psf->filelength) + { psf_log_printf (psf, "%M : %u (should be %d)\n", chunk, chunk_length, (int) (psf->filelength - current_pos)) ; + chunk_length = psf->filelength - current_pos ; + } + else + psf_log_printf (psf, "%M : %u\n", chunk, chunk_length) ; + + while (bytesread < chunk_length) + { uint32_t thisread ; + + if ((thisread = psf_binheader_readf (psf, "m", &chunk)) == 0) + break ; + bytesread += thisread ; + + switch (chunk) + { case adtl_MARKER : + case INFO_MARKER : + /* These markers don't contain anything, not even a chunk lebgth. */ + psf_log_printf (psf, " %M\n", chunk) ; + continue ; + + case exif_MARKER : + psf_log_printf (psf, " %M\n", chunk) ; + if (chunk_length > bytesread) + bytesread += exif_subchunk_parse (psf, chunk_length - bytesread) ; + continue ; + + case data_MARKER : + psf_log_printf (psf, " %M inside a LIST block??? Backing out.\n", chunk) ; + /* Jump back four bytes and return to caller. */ + psf_binheader_readf (psf, "j", -4) ; + return 0 ; + + case 0 : + /* + ** Four zero bytes where a marker was expected. Assume this means + ** the rest of the chunk is garbage. + */ + psf_log_printf (psf, " *** Found weird-ass zero marker. Jumping to end of chunk.\n") ; + if (bytesread < chunk_length) + bytesread += psf_binheader_readf (psf, "j", chunk_length - bytesread) ; + psf_log_printf (psf, " *** Offset is now : 0x%X\n", psf_fseek (psf, 0, SEEK_CUR)) ; + return 0 ; + + default : + break ; + } ; + + switch (chunk) + { case ISFT_MARKER : + case ICOP_MARKER : + case IARL_MARKER : + case IART_MARKER : + case ICMT_MARKER : + case ICRD_MARKER : + case IENG_MARKER : + case IGNR_MARKER : + case INAM_MARKER : + case IPRD_MARKER : + case ISBJ_MARKER : + case ISRC_MARKER : + case IAUT_MARKER : + case ITRK_MARKER : + bytesread += psf_binheader_readf (psf, "4", &chunk_size) ; + chunk_size += (chunk_size & 1) ; + if (chunk_size >= SIGNED_SIZEOF (buffer) || chunk_size >= chunk_length) + { psf_log_printf (psf, " *** %M : %u (too big)\n", chunk, chunk_size) ; + goto cleanup_subchunk_parse ; + } ; + + bytesread += psf_binheader_readf (psf, "b", buffer, chunk_size) ; + buffer [chunk_size] = 0 ; + psf_log_printf (psf, " %M : %s\n", chunk, buffer) ; + break ; + + case labl_MARKER : + { int mark_id ; + + bytesread += psf_binheader_readf (psf, "44", &chunk_size, &mark_id) ; + chunk_size -= 4 ; + chunk_size += (chunk_size & 1) ; + if (chunk_size < 1 || chunk_size >= SIGNED_SIZEOF (buffer) || chunk_size >= chunk_length) + { psf_log_printf (psf, " *** %M : %u (too big)\n", chunk, chunk_size) ; + goto cleanup_subchunk_parse ; + } ; + + bytesread += psf_binheader_readf (psf, "b", buffer, chunk_size) ; + buffer [chunk_size] = 0 ; + + if (mark_id < 10) /* avoid swamping log buffer with labels */ + psf_log_printf (psf, " %M : %u : %s\n", chunk, mark_id, buffer) ; + else if (mark_id == 10) + psf_log_printf (psf, " (Skipping)\n") ; + + if (psf->cues) + { unsigned int i = 0 ; + + /* find id to store label */ + while (i < psf->cues->cue_count && psf->cues->cue_points [i].indx != mark_id) + i++ ; + + if (i < psf->cues->cue_count) + strncpy (psf->cues->cue_points [i].name, buffer, 256) ; + } ; + } ; + break ; + + case DISP_MARKER : + case ltxt_MARKER : + case note_MARKER : + bytesread += psf_binheader_readf (psf, "4", &chunk_size) ; + chunk_size += (chunk_size & 1) ; + if (chunk_size >= SIGNED_SIZEOF (buffer) || chunk_size >= chunk_length) + { psf_log_printf (psf, " *** %M : %u (too big)\n", chunk, chunk_size) ; + goto cleanup_subchunk_parse ; + } ; + + psf_log_printf (psf, " %M : %u\n", chunk, chunk_size) ; + goto cleanup_subchunk_parse ; + + default : + bytesread += psf_binheader_readf (psf, "4", &chunk_size) ; + chunk_size += (chunk_size & 1) ; + psf_log_printf (psf, " *** %M : %u\n", chunk, chunk_size) ; + if (bytesread + chunk_size > chunk_length) + { bytesread += psf_binheader_readf (psf, "j", chunk_length - bytesread + 4) ; + continue ; + } + else + bytesread += psf_binheader_readf (psf, "j", chunk_size) ; + + if (chunk_size >= chunk_length) + return 0 ; + break ; + } ; + + switch (chunk) + { case ISFT_MARKER : + psf_store_string (psf, SF_STR_SOFTWARE, buffer) ; + break ; + case ICOP_MARKER : + psf_store_string (psf, SF_STR_COPYRIGHT, buffer) ; + break ; + case INAM_MARKER : + psf_store_string (psf, SF_STR_TITLE, buffer) ; + break ; + case IART_MARKER : + psf_store_string (psf, SF_STR_ARTIST, buffer) ; + break ; + case ICMT_MARKER : + psf_store_string (psf, SF_STR_COMMENT, buffer) ; + break ; + case ICRD_MARKER : + psf_store_string (psf, SF_STR_DATE, buffer) ; + break ; + case IGNR_MARKER : + psf_store_string (psf, SF_STR_GENRE, buffer) ; + break ; + case IPRD_MARKER : + psf_store_string (psf, SF_STR_ALBUM, buffer) ; + break ; + case ITRK_MARKER : + psf_store_string (psf, SF_STR_TRACKNUMBER, buffer) ; + break ; + } ; + } ; + +cleanup_subchunk_parse : + + if (chunk_length > bytesread) + bytesread += psf_binheader_readf (psf, "j", chunk_length - bytesread) ; + + return 0 ; +} /* wavlike_subchunk_parse */ + +void +wavlike_write_strings (SF_PRIVATE *psf, int location) +{ int k, prev_head_index, saved_head_index ; + + if (psf_location_string_count (psf, location) == 0) + return ; + + prev_head_index = psf->header.indx + 4 ; + + psf_binheader_writef (psf, "m4m", BHWm (LIST_MARKER), BHW4 (0xBADBAD), BHWm (INFO_MARKER)) ; + + for (k = 0 ; k < SF_MAX_STRINGS ; k++) + { if (psf->strings.data [k].type == 0) + break ; + if (psf->strings.data [k].type < 0 || psf->strings.data [k].flags != location) + continue ; + + switch (psf->strings.data [k].type) + { case SF_STR_SOFTWARE : + psf_binheader_writef (psf, "ms", BHWm (ISFT_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + case SF_STR_TITLE : + psf_binheader_writef (psf, "ms", BHWm (INAM_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + case SF_STR_COPYRIGHT : + psf_binheader_writef (psf, "ms", BHWm (ICOP_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + case SF_STR_ARTIST : + psf_binheader_writef (psf, "ms", BHWm (IART_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + case SF_STR_COMMENT : + psf_binheader_writef (psf, "ms", BHWm (ICMT_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + case SF_STR_DATE : + psf_binheader_writef (psf, "ms", BHWm (ICRD_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + case SF_STR_GENRE : + psf_binheader_writef (psf, "ms", BHWm (IGNR_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + case SF_STR_ALBUM : + psf_binheader_writef (psf, "ms", BHWm (IPRD_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + case SF_STR_TRACKNUMBER : + psf_binheader_writef (psf, "ms", BHWm (ITRK_MARKER), BHWs (psf->strings.storage + psf->strings.data [k].offset)) ; + break ; + + default : + break ; + } ; + } ; + + saved_head_index = psf->header.indx ; + psf->header.indx = prev_head_index ; + psf_binheader_writef (psf, "4", BHW4 (saved_head_index - prev_head_index - 4)) ; + psf->header.indx = saved_head_index ; + +} /* wavlike_write_strings */ + +int +wavlike_read_peak_chunk (SF_PRIVATE * psf, size_t chunk_size) +{ char buffer [256] ; + uint32_t uk ; + + if (chunk_size != WAVLIKE_PEAK_CHUNK_SIZE (psf->sf.channels)) + { psf_binheader_readf (psf, "j", chunk_size) ; + psf_log_printf (psf, "*** File PEAK chunk size doesn't fit with number of channels (%d).\n", psf->sf.channels) ; + return SFE_WAV_BAD_PEAK ; + } ; + + if ((psf->peak_info = peak_info_calloc (psf->sf.channels)) == NULL) + return SFE_MALLOC_FAILED ; + + /* read in rest of PEAK chunk. */ + psf_binheader_readf (psf, "44", & (psf->peak_info->version), & (psf->peak_info->timestamp)) ; + + if (psf->peak_info->version != 1) + psf_log_printf (psf, " version : %d *** (should be version 1)\n", psf->peak_info->version) ; + else + psf_log_printf (psf, " version : %d\n", psf->peak_info->version) ; + + psf_log_printf (psf, " time stamp : %d\n", psf->peak_info->timestamp) ; + psf_log_printf (psf, " Ch Position Value\n") ; + + for (uk = 0 ; uk < (uint32_t) psf->sf.channels ; uk++) + { float value ; + uint32_t position ; + + psf_binheader_readf (psf, "f4", &value, &position) ; + psf->peak_info->peaks [uk].value = value ; + psf->peak_info->peaks [uk].position = position ; + + snprintf (buffer, sizeof (buffer), " %2d %-12" PRId64 " %g\n", + uk, psf->peak_info->peaks [uk].position, psf->peak_info->peaks [uk].value) ; + buffer [sizeof (buffer) - 1] = 0 ; + psf_log_printf (psf, "%s", buffer) ; + } ; + + return 0 ; +} /* wavlike_read_peak_chunk */ + +void +wavlike_write_peak_chunk (SF_PRIVATE * psf) +{ int k ; + + if (psf->peak_info == NULL) + return ; + + psf_binheader_writef (psf, "m4", BHWm (PEAK_MARKER), BHW4 (WAVLIKE_PEAK_CHUNK_SIZE (psf->sf.channels))) ; + psf_binheader_writef (psf, "44", BHW4 (1), BHW4 (time (NULL))) ; + for (k = 0 ; k < psf->sf.channels ; k++) + psf_binheader_writef (psf, "ft8", BHWf (psf->peak_info->peaks [k].value), BHW8 (psf->peak_info->peaks [k].position)) ; +} /* wavlike_write_peak_chunk */ + +/*============================================================================== +*/ + +static int +exif_fill_and_sink (SF_PRIVATE *psf, char* buf, size_t bufsz, size_t toread) +{ + size_t bytesread = 0 ; + + buf [0] = 0 ; + bufsz -= 1 ; + if (toread < bufsz) + bufsz = toread ; + bytesread = psf_binheader_readf (psf, "b", buf, bufsz) ; + buf [bufsz] = 0 ; + + if (bytesread == bufsz && toread > bufsz) + bytesread += psf_binheader_readf (psf, "j", toread - bufsz) ; + + return bytesread ; +} /* exif_fill_and_sink */ + +/* +** Exif specification for audio files, at JEITA CP-3451 Exif 2.2 section 5 +** (Exif Audio File Specification) http://www.exif.org/Exif2-2.PDF +*/ +static int +exif_subchunk_parse (SF_PRIVATE *psf, uint32_t length) +{ uint32_t marker, dword, vmajor = -1, vminor = -1, bytesread = 0 ; + char buf [4096] ; + int thisread ; + + while (bytesread < length) + { + if ((thisread = psf_binheader_readf (psf, "m", &marker)) == 0) + break ; + bytesread += thisread ; + + switch (marker) + { + case 0 : /* camera padding? */ + break ; + + case ever_MARKER : + bytesread += psf_binheader_readf (psf, "j4", 4, &dword) ; + vmajor = 10 * (((dword >> 24) & 0xff) - '0') + (((dword >> 16) & 0xff) - '0') ; + vminor = 10 * (((dword >> 8) & 0xff) - '0') + ((dword & 0xff) - '0') ; + psf_log_printf (psf, " EXIF Version : %u.%02u\n", vmajor, vminor) ; + break ; + + case olym_MARKER : + bytesread += psf_binheader_readf (psf, "4", &dword) ; + psf_log_printf (psf, "%M : %u\n", marker, dword) ; + if (dword > length || bytesread + dword > length) + break ; + dword += (dword & 1) ; + bytesread += psf_binheader_readf (psf, "j", dword) ; + break ; + + case emnt_MARKER : /* design information: null-terminated string */ + case emdl_MARKER : /* model name ; null-terminated string */ + case ecor_MARKER : /* manufacturer: null-terminated string */ + case etim_MARKER : /* creation time: null-terminated string in the format "hour:minute:second.subsecond" */ + case erel_MARKER : /* relation info: null-terminated string (filename) */ + case eucm_MARKER : /* user comment: 4-byte size follows, then possibly unicode data */ + bytesread += psf_binheader_readf (psf, "4", &dword) ; + bytesread += sizeof (dword) ; + dword += (dword & 1) ; + + if (dword >= sizeof (buf)) + { psf_log_printf (psf, "*** Marker '%M' is too big %u\n\n", marker, dword) ; + return bytesread ; + } ; + + bytesread += exif_fill_and_sink (psf, buf, sizeof (buf), dword) ; + + /* BAD - don't know what's going on here -- maybe a bug in the camera */ + /* field should be NULL-terminated but there's no room for it with the reported number */ + /* example output: emdl : 8 (EX-Z1050) */ + if (marker == emdl_MARKER && dword == strlen (buf) /* should be >= strlen+1*/) + { psf_log_printf (psf, " *** field size too small for string (sinking 2 bytes)\n") ; + bytesread += psf_binheader_readf (psf, "j", 2) ; + } ; + + psf_log_printf (psf, " %M : %u (%s)\n", marker, dword, buf) ; + if (dword > length) + return bytesread ; + break ; + + default : + psf_log_printf (psf, " *** %M (%u): -- ignored --\n", marker, marker) ; + break ; + } ; + } ; + + return bytesread ; +} /* exif_subchunk_parse */ + +void +wavlike_write_custom_chunks (SF_PRIVATE * psf) +{ uint32_t k ; + + for (k = 0 ; k < psf->wchunks.used ; k++) + psf_binheader_writef (psf, "m4b", BHWm (psf->wchunks.chunks [k].mark32), BHW4 (psf->wchunks.chunks [k].len), + BHWv (psf->wchunks.chunks [k].data), BHWz (psf->wchunks.chunks [k].len)) ; + +} /* wavlike_write_custom_chunks */ diff --git a/lib-src/libsndfile/src/wav_w64.h b/lib-src/libsndfile/src/wavlike.h similarity index 74% rename from lib-src/libsndfile/src/wav_w64.h rename to lib-src/libsndfile/src/wavlike.h index 9b2914abb..4cde1e93f 100644 --- a/lib-src/libsndfile/src/wav_w64.h +++ b/lib-src/libsndfile/src/wavlike.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2016 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -19,8 +19,51 @@ /* This file contains definitions commong to WAV and W64 files. */ -#ifndef WAV_W64_H_INCLUDED -#define WAV_W64_H_INCLUDED +#ifndef WAVLIKE_H_INCLUDED +#define WAVLIKE_H_INCLUDED + +/*------------------------------------------------------------------------------ +** Chunk markers. +*/ + +#define adtl_MARKER MAKE_MARKER ('a', 'd', 't', 'l') +#define bext_MARKER MAKE_MARKER ('b', 'e', 'x', 't') +#define cart_MARKER MAKE_MARKER ('c', 'a', 'r', 't') +#define data_MARKER MAKE_MARKER ('d', 'a', 't', 'a') +#define labl_MARKER MAKE_MARKER ('l', 'a', 'b', 'l') +#define ltxt_MARKER MAKE_MARKER ('l', 't', 'x', 't') +#define note_MARKER MAKE_MARKER ('n', 'o', 't', 'e') +#define DISP_MARKER MAKE_MARKER ('D', 'I', 'S', 'P') +#define INFO_MARKER MAKE_MARKER ('I', 'N', 'F', 'O') +#define LIST_MARKER MAKE_MARKER ('L', 'I', 'S', 'T') +#define PAD_MARKER MAKE_MARKER ('P', 'A', 'D', ' ') +#define PEAK_MARKER MAKE_MARKER ('P', 'E', 'A', 'K') + +#define ISFT_MARKER MAKE_MARKER ('I', 'S', 'F', 'T') +#define ICRD_MARKER MAKE_MARKER ('I', 'C', 'R', 'D') +#define ICOP_MARKER MAKE_MARKER ('I', 'C', 'O', 'P') +#define IARL_MARKER MAKE_MARKER ('I', 'A', 'R', 'L') +#define IART_MARKER MAKE_MARKER ('I', 'A', 'R', 'T') +#define INAM_MARKER MAKE_MARKER ('I', 'N', 'A', 'M') +#define IENG_MARKER MAKE_MARKER ('I', 'E', 'N', 'G') +#define IGNR_MARKER MAKE_MARKER ('I', 'G', 'N', 'R') +#define ICOP_MARKER MAKE_MARKER ('I', 'C', 'O', 'P') +#define IPRD_MARKER MAKE_MARKER ('I', 'P', 'R', 'D') +#define ISRC_MARKER MAKE_MARKER ('I', 'S', 'R', 'C') +#define ISBJ_MARKER MAKE_MARKER ('I', 'S', 'B', 'J') +#define ICMT_MARKER MAKE_MARKER ('I', 'C', 'M', 'T') +#define IAUT_MARKER MAKE_MARKER ('I', 'A', 'U', 'T') +#define ITRK_MARKER MAKE_MARKER ('I', 'T', 'R', 'K') + +#define exif_MARKER MAKE_MARKER ('e', 'x', 'i', 'f') +#define ever_MARKER MAKE_MARKER ('e', 'v', 'e', 'r') +#define etim_MARKER MAKE_MARKER ('e', 't', 'i', 'm') +#define ecor_MARKER MAKE_MARKER ('e', 'c', 'o', 'r') +#define emdl_MARKER MAKE_MARKER ('e', 'm', 'd', 'l') +#define emnt_MARKER MAKE_MARKER ('e', 'm', 'n', 't') +#define erel_MARKER MAKE_MARKER ('e', 'r', 'e', 'l') +#define eucm_MARKER MAKE_MARKER ('e', 'u', 'c', 'm') +#define olym_MARKER MAKE_MARKER ('o', 'l', 'y', 'm') /*------------------------------------------------------------------------------ ** List of known WAV format tags @@ -28,9 +71,9 @@ enum { - /* keep sorted for wav_w64_format_str() */ + /* keep sorted for wavlike_format_str() */ WAVE_FORMAT_UNKNOWN = 0x0000, /* Microsoft Corporation */ - WAVE_FORMAT_PCM = 0x0001, /* Microsoft PCM format */ + WAVE_FORMAT_PCM = 0x0001, /* Microsoft PCM format */ WAVE_FORMAT_MS_ADPCM = 0x0002, /* Microsoft ADPCM */ WAVE_FORMAT_IEEE_FLOAT = 0x0003, /* Micrososft 32 bit float format */ WAVE_FORMAT_VSELP = 0x0004, /* Compaq Computer Corporation */ @@ -224,7 +267,7 @@ typedef struct { unsigned int esf_field1 ; unsigned short esf_field2 ; unsigned short esf_field3 ; - char esf_field4 [8] ; + unsigned char esf_field4 [8] ; } EXT_SUBFORMAT ; typedef struct @@ -264,32 +307,52 @@ typedef struct /* Set to true when 'fmt ' chunk is ambiguous.*/ int fmt_is_broken ; WAV_FMT wav_fmt ; -} WAV_PRIVATE ; -#define WAV_W64_GSM610_BLOCKSIZE 65 -#define WAV_W64_GSM610_SAMPLES 320 + /* + ** Set to true when RF64 should be converted back to RIFF when writing the + ** header. + */ + int rf64_downgrade ; +} WAVLIKE_PRIVATE ; + +#define WAVLIKE_GSM610_BLOCKSIZE 65 +#define WAVLIKE_GSM610_SAMPLES 320 + +#define WAVLIKE_PEAK_CHUNK_SIZE(ch) (2 * sizeof (int) + ch * (sizeof (float) + sizeof (int))) /*------------------------------------------------------------------------------------ ** Functions defined in wav_ms_adpcm.c */ -#define MSADPCM_ADAPT_COEFF_COUNT 7 +#define WAVLIKE_MSADPCM_ADAPT_COEFF_COUNT 7 -void msadpcm_write_adapt_coeffs (SF_PRIVATE *psf) ; +void wavlike_msadpcm_write_adapt_coeffs (SF_PRIVATE *psf) ; /*------------------------------------------------------------------------------------ -** Functions defined in wav_w64.c +** Functions defined in wavlike.c */ -int wav_w64_srate2blocksize (int srate_chan_product) ; -char const* wav_w64_format_str (int k) ; -int wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize) ; -void wavex_write_guid (SF_PRIVATE *psf, const EXT_SUBFORMAT * subformat) ; -void wav_w64_analyze (SF_PRIVATE *psf) ; -int wavex_gen_channel_mask (const int *chan_map, int channels) ; +char const* wavlike_format_str (int k) ; -int wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunksize) ; -int wav_write_bext_chunk (SF_PRIVATE *psf) ; +int wavlike_srate2blocksize (int srate_chan_product) ; +int wavlike_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize) ; +void wavlike_write_guid (SF_PRIVATE *psf, const EXT_SUBFORMAT * subformat) ; +void wavlike_analyze (SF_PRIVATE *psf) ; +int wavlike_gen_channel_mask (const int *chan_map, int channels) ; + +int wavlike_read_bext_chunk (SF_PRIVATE *psf, uint32_t chunksize) ; +int wavlike_write_bext_chunk (SF_PRIVATE *psf) ; + +int wavlike_read_cart_chunk (SF_PRIVATE *psf, uint32_t chunksize) ; +int wavlike_write_cart_chunk (SF_PRIVATE *psf) ; + +int wavlike_subchunk_parse (SF_PRIVATE *psf, int chunk, uint32_t length) ; +void wavlike_write_strings (SF_PRIVATE *psf, int location) ; + +int wavlike_read_peak_chunk (SF_PRIVATE * psf, size_t chunk_size) ; +void wavlike_write_peak_chunk (SF_PRIVATE * psf) ; + +void wavlike_write_custom_chunks (SF_PRIVATE * psf) ; #endif diff --git a/lib-src/libsndfile/src/windows.c b/lib-src/libsndfile/src/windows.c index 387afddaf..2ef3002fd 100644 --- a/lib-src/libsndfile/src/windows.c +++ b/lib-src/libsndfile/src/windows.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2009-2011 Erik de Castro Lopo +** Copyright (C) 2009-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -40,12 +40,11 @@ sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) { SF_PRIVATE *psf ; char utf8name [512] ; - if ((psf = calloc (1, sizeof (SF_PRIVATE))) == NULL) + if ((psf = psf_allocate ()) == NULL) { sf_errno = SFE_MALLOC_FAILED ; return NULL ; } ; - memset (psf, 0, sizeof (SF_PRIVATE)) ; psf_init_files (psf) ; if (WideCharToMultiByte (CP_UTF8, 0, wpath, -1, utf8name, sizeof (utf8name), NULL, NULL) == 0) diff --git a/lib-src/libsndfile/src/wve.c b/lib-src/libsndfile/src/wve.c index c13e7ab9b..4b9fc8aa7 100644 --- a/lib-src/libsndfile/src/wve.c +++ b/lib-src/libsndfile/src/wve.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2017 Erik de Castro Lopo ** Copyright (C) 2007 Reuben Thomas ** ** This program is free software; you can redistribute it and/or modify @@ -168,15 +168,15 @@ wve_write_header (SF_PRIVATE *psf, int calc_length) } ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; /* Write header. */ datalen = psf->datalength ; - psf_binheader_writef (psf, "Emmmm", ALAW_MARKER, SOUN_MARKER, DFIL_MARKER, ESSN_MARKER) ; - psf_binheader_writef (psf, "E2422222", PSION_VERSION, datalen, 0, 0, 0, 0, 0) ; - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_binheader_writef (psf, "Emmmm", BHWm (ALAW_MARKER), BHWm (SOUN_MARKER), BHWm (DFIL_MARKER), BHWm (ESSN_MARKER)) ; + psf_binheader_writef (psf, "E2422222", BHW2 (PSION_VERSION), BHW4 (datalen), BHW2 (0), BHW2 (0), BHW2 (0), BHW2 (0), BHW2 (0)) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->sf.channels != 1) return SFE_CHANNEL_COUNT ; @@ -184,7 +184,7 @@ wve_write_header (SF_PRIVATE *psf, int calc_length) if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; diff --git a/lib-src/libsndfile/src/xi.c b/lib-src/libsndfile/src/xi.c index ee60a4bd4..999538903 100644 --- a/lib-src/libsndfile/src/xi.c +++ b/lib-src/libsndfile/src/xi.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2003-2011 Erik de Castro Lopo +** Copyright (C) 2003-2017 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -92,7 +92,7 @@ xi_open (SF_PRIVATE *psf) /* Set up default instrument and software name. */ memcpy (pxi->filename, "Default Name ", sizeof (pxi->filename)) ; - memcpy (pxi->software, PACKAGE "-" VERSION " ", sizeof (pxi->software)) ; + memcpy (pxi->software, PACKAGE_NAME "-" PACKAGE_VERSION " ", sizeof (pxi->software)) ; memset (pxi->sample_name, 0, sizeof (pxi->sample_name)) ; snprintf (pxi->sample_name, sizeof (pxi->sample_name), "%s", "Sample #1") ; @@ -216,7 +216,8 @@ dpcm_init (SF_PRIVATE *psf) static sf_count_t dpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int total, bufferlen, len ; if ((pxi = psf->codec_data) == NULL) @@ -248,18 +249,18 @@ dpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) if ((SF_CODEC (psf->sf.format)) == SF_FORMAT_DPCM_16) { total = offset ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (total > 0) { len = (total > bufferlen) ? bufferlen : total ; - total -= dpcm_read_dles2s (psf, psf->u.sbuf, len) ; + total -= dpcm_read_dles2s (psf, ubuf.sbuf, len) ; } ; } else { total = offset ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (total > 0) { len = (total > bufferlen) ? bufferlen : total ; - total -= dpcm_read_dsc2s (psf, psf->u.sbuf, len) ; + total -= dpcm_read_dsc2s (psf, ubuf.sbuf, len) ; } ; } ; @@ -279,49 +280,49 @@ xi_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) current = psf_ftell (psf) ; /* Reset the current header length to zero. */ - psf->header [0] = 0 ; - psf->headindex = 0 ; + psf->header.ptr [0] = 0 ; + psf->header.indx = 0 ; psf_fseek (psf, 0, SEEK_SET) ; string = "Extended Instrument: " ; - psf_binheader_writef (psf, "b", string, strlen (string)) ; - psf_binheader_writef (psf, "b1", pxi->filename, sizeof (pxi->filename), 0x1A) ; + psf_binheader_writef (psf, "b", BHWv (string), BHWz (strlen (string))) ; + psf_binheader_writef (psf, "b1", BHWv (pxi->filename), BHWz (sizeof (pxi->filename)), BHW1 (0x1A)) ; /* Write software version and two byte XI version. */ - psf_binheader_writef (psf, "eb2", pxi->software, sizeof (pxi->software), (1 << 8) + 2) ; + psf_binheader_writef (psf, "eb2", BHWv (pxi->software), BHWz (sizeof (pxi->software)), BHW2 ((1 << 8) + 2)) ; /* ** Jump note numbers (96), volume envelope (48), pan envelope (48), ** volume points (1), pan points (1) */ - psf_binheader_writef (psf, "z", (size_t) (96 + 48 + 48 + 1 + 1)) ; + psf_binheader_writef (psf, "z", BHWz ((size_t) (96 + 48 + 48 + 1 + 1))) ; /* Jump volume loop (3 bytes), pan loop (3), envelope flags (3), vibrato (3) ** fade out (2), 22 unknown bytes, and then write sample_count (2 bytes). */ - psf_binheader_writef (psf, "ez2z2", (size_t) (4 * 3), 0x1234, make_size_t (22), 1) ; + psf_binheader_writef (psf, "ez2z2", BHWz ((size_t) (4 * 3)), BHW2 (0x1234), BHWz (22), BHW2 (1)) ; pxi->loop_begin = 0 ; pxi->loop_end = 0 ; - psf_binheader_writef (psf, "et844", psf->sf.frames, pxi->loop_begin, pxi->loop_end) ; + psf_binheader_writef (psf, "et844", BHW8 (psf->sf.frames), BHW4 (pxi->loop_begin), BHW4 (pxi->loop_end)) ; /* volume, fine tune, flags, pan, note, namelen */ - psf_binheader_writef (psf, "111111", 128, 0, pxi->sample_flags, 128, 0, strlen (pxi->sample_name)) ; + psf_binheader_writef (psf, "111111", BHW1 (128), BHW1 (0), BHW1 (pxi->sample_flags), BHW1 (128), BHW1 (0), BHW1 (strlen (pxi->sample_name))) ; - psf_binheader_writef (psf, "b", pxi->sample_name, sizeof (pxi->sample_name)) ; + psf_binheader_writef (psf, "b", BHWv (pxi->sample_name), BHWz (sizeof (pxi->sample_name))) ; /* Header construction complete so write it out. */ - psf_fwrite (psf->header, psf->headindex, 1, psf) ; + psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ; if (psf->error) return psf->error ; - psf->dataoffset = psf->headindex ; + psf->dataoffset = psf->header.indx ; if (current > 0) psf_fseek (psf, current, SEEK_SET) ; @@ -351,11 +352,19 @@ xi_read_header (SF_PRIVATE *psf) return SFE_XI_BAD_HEADER ; buffer [22] = 0 ; + for (k = 21 ; k >= 0 && buffer [k] == ' ' ; k --) + buffer [k] = 0 ; + psf_log_printf (psf, "Extended Instrument : %s\n", buffer) ; + psf_store_string (psf, SF_STR_TITLE, buffer) ; psf_binheader_readf (psf, "be2", buffer, 20, &version) ; buffer [19] = 0 ; + for (k = 18 ; k >= 0 && buffer [k] == ' ' ; k --) + buffer [k] = 0 ; + psf_log_printf (psf, "Software : %s\nVersion : %d.%02d\n", buffer, version / 256, version % 256) ; + psf_store_string (psf, SF_STR_SOFTWARE, buffer) ; /* Jump note numbers (96), volume envelope (48), pan envelope (48), ** volume points (1), pan points (1) @@ -387,6 +396,7 @@ xi_read_header (SF_PRIVATE *psf) if (psf->instrument == NULL && (psf->instrument = psf_instrument_alloc ()) == NULL) return SFE_MALLOC_FAILED ; + psf->instrument->basenote = 0 ; /* Log all data for each sample. */ for (k = 0 ; k < sample_count ; k++) { psf_binheader_readf (psf, "e444", &(sample_sizes [k]), &loop_begin, &loop_end) ; @@ -417,6 +427,14 @@ xi_read_header (SF_PRIVATE *psf) psf_log_printf (psf, " pan : %u\n note : %d\n namelen : %d\n", buffer [3] & 0xFF, buffer [4], buffer [5]) ; + psf->instrument->basenote = buffer [4] ; + if (buffer [2] & 1) + { psf->instrument->loop_count = 1 ; + psf->instrument->loops [0].mode = (buffer [2] & 2) ? SF_LOOP_ALTERNATING : SF_LOOP_FORWARD ; + psf->instrument->loops [0].start = loop_begin ; + psf->instrument->loops [0].end = loop_end ; + } ; + if (k != 0) continue ; @@ -469,7 +487,6 @@ xi_read_header (SF_PRIVATE *psf) if (! psf->sf.frames && psf->blockwidth) psf->sf.frames = (psf->filelength - psf->dataoffset) / psf->blockwidth ; - psf->instrument->basenote = 0 ; psf->instrument->gain = 1 ; psf->instrument->velocity_lo = psf->instrument->key_lo = 0 ; psf->instrument->velocity_hi = psf->instrument->key_hi = 127 ; @@ -492,20 +509,21 @@ static void dles2d_array (XI_PRIVATE *pxi, short *src, int count, double *dest, static sf_count_t dpcm_read_dsc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, readcount ; sf_count_t total = 0 ; if ((pxi = psf->codec_data) == NULL) return 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; - dsc2s_array (pxi, psf->u.scbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; + dsc2s_array (pxi, ubuf.scbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -517,20 +535,21 @@ dpcm_read_dsc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t dpcm_read_dsc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, readcount ; sf_count_t total = 0 ; if ((pxi = psf->codec_data) == NULL) return 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; - dsc2i_array (pxi, psf->u.scbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; + dsc2i_array (pxi, ubuf.scbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -542,7 +561,8 @@ dpcm_read_dsc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t dpcm_read_dsc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; @@ -552,13 +572,13 @@ dpcm_read_dsc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; - dsc2f_array (pxi, psf->u.scbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; + dsc2f_array (pxi, ubuf.scbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -570,7 +590,8 @@ dpcm_read_dsc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t dpcm_read_dsc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; @@ -580,13 +601,13 @@ dpcm_read_dsc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; - dsc2d_array (pxi, psf->u.scbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; + dsc2d_array (pxi, ubuf.scbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -601,20 +622,21 @@ dpcm_read_dsc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) static sf_count_t dpcm_read_dles2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, readcount ; sf_count_t total = 0 ; if ((pxi = psf->codec_data) == NULL) return 0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - dles2s_array (pxi, psf->u.sbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + dles2s_array (pxi, ubuf.sbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -626,20 +648,21 @@ dpcm_read_dles2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) static sf_count_t dpcm_read_dles2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, readcount ; sf_count_t total = 0 ; if ((pxi = psf->codec_data) == NULL) return 0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - dles2i_array (pxi, psf->u.sbuf, readcount, ptr + total) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + dles2i_array (pxi, ubuf.sbuf, readcount, ptr + total) ; total += readcount ; if (readcount < bufferlen) break ; @@ -651,7 +674,8 @@ dpcm_read_dles2i (SF_PRIVATE *psf, int *ptr, sf_count_t len) static sf_count_t dpcm_read_dles2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, readcount ; sf_count_t total = 0 ; float normfact ; @@ -661,13 +685,13 @@ dpcm_read_dles2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - dles2f_array (pxi, psf->u.sbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + dles2f_array (pxi, ubuf.sbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -679,7 +703,8 @@ dpcm_read_dles2f (SF_PRIVATE *psf, float *ptr, sf_count_t len) static sf_count_t dpcm_read_dles2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, readcount ; sf_count_t total = 0 ; double normfact ; @@ -689,13 +714,13 @@ dpcm_read_dles2d (SF_PRIVATE *psf, double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ; - dles2d_array (pxi, psf->u.sbuf, readcount, ptr + total, normfact) ; + readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ; + dles2d_array (pxi, ubuf.sbuf, readcount, ptr + total, normfact) ; total += readcount ; if (readcount < bufferlen) break ; @@ -721,20 +746,21 @@ static void d2dles_array (XI_PRIVATE *pxi, const double *src, short *dest, int c static sf_count_t dpcm_write_s2dsc (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, writecount ; sf_count_t total = 0 ; if ((pxi = psf->codec_data) == NULL) return 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2dsc_array (pxi, ptr + total, psf->u.scbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; + s2dsc_array (pxi, ptr + total, ubuf.scbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -746,20 +772,21 @@ dpcm_write_s2dsc (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t dpcm_write_i2dsc (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, writecount ; sf_count_t total = 0 ; if ((pxi = psf->codec_data) == NULL) return 0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2dsc_array (pxi, ptr + total, psf->u.scbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; + i2dsc_array (pxi, ptr + total, ubuf.scbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -771,7 +798,8 @@ dpcm_write_i2dsc (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t dpcm_write_f2dsc (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, writecount ; sf_count_t total = 0 ; float normfact ; @@ -781,13 +809,13 @@ dpcm_write_f2dsc (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7F) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - f2dsc_array (pxi, ptr + total, psf->u.scbuf, bufferlen, normfact) ; - writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; + f2dsc_array (pxi, ptr + total, ubuf.scbuf, bufferlen, normfact) ; + writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -799,7 +827,8 @@ dpcm_write_f2dsc (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t dpcm_write_d2dsc (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, writecount ; sf_count_t total = 0 ; double normfact ; @@ -809,13 +838,13 @@ dpcm_write_d2dsc (SF_PRIVATE *psf, const double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7F) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.ucbuf) ; + bufferlen = ARRAY_LEN (ubuf.ucbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - d2dsc_array (pxi, ptr + total, psf->u.scbuf, bufferlen, normfact) ; - writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ; + d2dsc_array (pxi, ptr + total, ubuf.scbuf, bufferlen, normfact) ; + writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -828,20 +857,21 @@ dpcm_write_d2dsc (SF_PRIVATE *psf, const double *ptr, sf_count_t len) static sf_count_t dpcm_write_s2dles (SF_PRIVATE *psf, const short *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, writecount ; sf_count_t total = 0 ; if ((pxi = psf->codec_data) == NULL) return 0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - s2dles_array (pxi, ptr + total, psf->u.sbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + s2dles_array (pxi, ptr + total, ubuf.sbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -853,20 +883,21 @@ dpcm_write_s2dles (SF_PRIVATE *psf, const short *ptr, sf_count_t len) static sf_count_t dpcm_write_i2dles (SF_PRIVATE *psf, const int *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, writecount ; sf_count_t total = 0 ; if ((pxi = psf->codec_data) == NULL) return 0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - i2dles_array (pxi, ptr + total, psf->u.sbuf, bufferlen) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + i2dles_array (pxi, ptr + total, ubuf.sbuf, bufferlen) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -878,7 +909,8 @@ dpcm_write_i2dles (SF_PRIVATE *psf, const int *ptr, sf_count_t len) static sf_count_t dpcm_write_f2dles (SF_PRIVATE *psf, const float *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, writecount ; sf_count_t total = 0 ; float normfact ; @@ -888,13 +920,13 @@ dpcm_write_f2dles (SF_PRIVATE *psf, const float *ptr, sf_count_t len) normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - f2dles_array (pxi, ptr + total, psf->u.sbuf, bufferlen, normfact) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + f2dles_array (pxi, ptr + total, ubuf.sbuf, bufferlen, normfact) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -906,7 +938,8 @@ dpcm_write_f2dles (SF_PRIVATE *psf, const float *ptr, sf_count_t len) static sf_count_t dpcm_write_d2dles (SF_PRIVATE *psf, const double *ptr, sf_count_t len) -{ XI_PRIVATE *pxi ; +{ BUF_UNION ubuf ; + XI_PRIVATE *pxi ; int bufferlen, writecount ; sf_count_t total = 0 ; double normfact ; @@ -916,13 +949,13 @@ dpcm_write_d2dles (SF_PRIVATE *psf, const double *ptr, sf_count_t len) normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ; - bufferlen = ARRAY_LEN (psf->u.sbuf) ; + bufferlen = ARRAY_LEN (ubuf.sbuf) ; while (len > 0) { if (len < bufferlen) bufferlen = (int) len ; - d2dles_array (pxi, ptr + total, psf->u.sbuf, bufferlen, normfact) ; - writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ; + d2dles_array (pxi, ptr + total, ubuf.sbuf, bufferlen, normfact) ; + writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ; total += writecount ; if (writecount < bufferlen) break ; @@ -945,10 +978,10 @@ dsc2s_array (XI_PRIVATE *pxi, signed char *src, int count, short *dest) for (k = 0 ; k < count ; k++) { last_val += src [k] ; - dest [k] = last_val << 8 ; + dest [k] = arith_shift_left (last_val, 8) ; } ; - pxi->last_16 = last_val << 8 ; + pxi->last_16 = arith_shift_left (last_val, 8) ; } /* dsc2s_array */ static void @@ -960,10 +993,10 @@ dsc2i_array (XI_PRIVATE *pxi, signed char *src, int count, int *dest) for (k = 0 ; k < count ; k++) { last_val += src [k] ; - dest [k] = last_val << 24 ; + dest [k] = arith_shift_left (last_val, 24) ; } ; - pxi->last_16 = last_val << 8 ; + pxi->last_16 = arith_shift_left (last_val, 8) ; } /* dsc2i_array */ static void @@ -978,7 +1011,7 @@ dsc2f_array (XI_PRIVATE *pxi, signed char *src, int count, float *dest, float no dest [k] = last_val * normfact ; } ; - pxi->last_16 = last_val << 8 ; + pxi->last_16 = arith_shift_left (last_val, 8) ; } /* dsc2f_array */ static void @@ -993,7 +1026,7 @@ dsc2d_array (XI_PRIVATE *pxi, signed char *src, int count, double *dest, double dest [k] = last_val * normfact ; } ; - pxi->last_16 = last_val << 8 ; + pxi->last_16 = arith_shift_left (last_val, 8) ; } /* dsc2d_array */ /*------------------------------------------------------------------------------ @@ -1012,7 +1045,7 @@ s2dsc_array (XI_PRIVATE *pxi, const short *src, signed char *dest, int count) last_val = current ; } ; - pxi->last_16 = last_val << 8 ; + pxi->last_16 = arith_shift_left (last_val, 8) ; } /* s2dsc_array */ static void @@ -1028,7 +1061,7 @@ i2dsc_array (XI_PRIVATE *pxi, const int *src, signed char *dest, int count) last_val = current ; } ; - pxi->last_16 = last_val << 8 ; + pxi->last_16 = arith_shift_left (last_val, 8) ; } /* i2dsc_array */ static void @@ -1044,7 +1077,7 @@ f2dsc_array (XI_PRIVATE *pxi, const float *src, signed char *dest, int count, fl last_val = current ; } ; - pxi->last_16 = last_val << 8 ; + pxi->last_16 = arith_shift_left (last_val, 8) ; } /* f2dsc_array */ static void @@ -1060,7 +1093,7 @@ d2dsc_array (XI_PRIVATE *pxi, const double *src, signed char *dest, int count, d last_val = current ; } ; - pxi->last_16 = last_val << 8 ; + pxi->last_16 = arith_shift_left (last_val, 8) ; } /* d2dsc_array */ /*============================================================================== @@ -1074,7 +1107,7 @@ dles2s_array (XI_PRIVATE *pxi, short *src, int count, short *dest) last_val = pxi->last_16 ; for (k = 0 ; k < count ; k++) - { last_val += LES2H_SHORT (src [k]) ; + { last_val += LE2H_16 (src [k]) ; dest [k] = last_val ; } ; @@ -1089,8 +1122,8 @@ dles2i_array (XI_PRIVATE *pxi, short *src, int count, int *dest) last_val = pxi->last_16 ; for (k = 0 ; k < count ; k++) - { last_val += LES2H_SHORT (src [k]) ; - dest [k] = last_val << 16 ; + { last_val += LE2H_16 (src [k]) ; + dest [k] = arith_shift_left (last_val, 16) ; } ; pxi->last_16 = last_val ; @@ -1104,7 +1137,7 @@ dles2f_array (XI_PRIVATE *pxi, short *src, int count, float *dest, float normfac last_val = pxi->last_16 ; for (k = 0 ; k < count ; k++) - { last_val += LES2H_SHORT (src [k]) ; + { last_val += LE2H_16 (src [k]) ; dest [k] = last_val * normfact ; } ; @@ -1119,7 +1152,7 @@ dles2d_array (XI_PRIVATE *pxi, short *src, int count, double *dest, double normf last_val = pxi->last_16 ; for (k = 0 ; k < count ; k++) - { last_val += LES2H_SHORT (src [k]) ; + { last_val += LE2H_16 (src [k]) ; dest [k] = last_val * normfact ; } ; @@ -1138,7 +1171,7 @@ s2dles_array (XI_PRIVATE *pxi, const short *src, short *dest, int count) for (k = 0 ; k < count ; k++) { diff = src [k] - last_val ; - dest [k] = LES2H_SHORT (diff) ; + dest [k] = LE2H_16 (diff) ; last_val = src [k] ; } ; @@ -1154,7 +1187,7 @@ i2dles_array (XI_PRIVATE *pxi, const int *src, short *dest, int count) for (k = 0 ; k < count ; k++) { diff = (src [k] >> 16) - last_val ; - dest [k] = LES2H_SHORT (diff) ; + dest [k] = LE2H_16 (diff) ; last_val = src [k] >> 16 ; } ; @@ -1171,7 +1204,7 @@ f2dles_array (XI_PRIVATE *pxi, const float *src, short *dest, int count, float n for (k = 0 ; k < count ; k++) { current = lrintf (src [k] * normfact) ; diff = current - last_val ; - dest [k] = LES2H_SHORT (diff) ; + dest [k] = LE2H_16 (diff) ; last_val = current ; } ; @@ -1188,7 +1221,7 @@ d2dles_array (XI_PRIVATE *pxi, const double *src, short *dest, int count, double for (k = 0 ; k < count ; k++) { current = lrint (src [k] * normfact) ; diff = current - last_val ; - dest [k] = LES2H_SHORT (diff) ; + dest [k] = LE2H_16 (diff) ; last_val = current ; } ; diff --git a/lib-src/libsndfile/tests/Makefile.am b/lib-src/libsndfile/tests/Makefile.am deleted file mode 100644 index 645ca1031..000000000 --- a/lib-src/libsndfile/tests/Makefile.am +++ /dev/null @@ -1,206 +0,0 @@ -## Process this file with automake to produce Makefile.in - -if ENABLE_TEST_COVERAGE -CPP_TEST = -else -CPP_TEST = cpp_test -endif - -AM_CPPFLAGS = -I$(top_srcdir)/src - -noinst_PROGRAMS = sfversion floating_point_test write_read_test \ - lossy_comp_test error_test ulaw_test alaw_test dwvw_test \ - peak_chunk_test command_test stdin_test stdout_test stdio_test \ - pcm_test headerless_test pipe_test benchmark header_test misc_test \ - raw_test string_test multi_file_test dither_test \ - scale_clip_test win32_test fix_this aiff_rw_test virtual_io_test \ - locale_test largefile_test win32_ordinal_test ogg_test vorbis_test \ - checksum_test external_libs_test rdwr_test $(CPP_TEST) - -noinst_HEADERS = dft_cmp.h utils.h generate.h - -autogen_sources = write_read_test.tpl write_read_test.def \ - pcm_test.tpl pcm_test.def \ - header_test.tpl header_test.def \ - utils.tpl utils.def \ - scale_clip_test.tpl scale_clip_test.def \ - pipe_test.tpl pipe_test.def \ - rdwr_test.tpl rdwr_test.def \ - floating_point_test.tpl floating_point_test.def \ - benchmark.tpl benchmark.def - -EXTRA_DIST = $(autogen_sources) - -CLEANFILES = *~ - -#=============================================================================== - -sfversion_SOURCES = sfversion.c -sfversion_LDADD = $(top_builddir)/src/libsndfile.la - -write_read_test_SOURCES = utils.c generate.c write_read_test.c -write_read_test_LDADD = $(top_builddir)/src/libsndfile.la - -lossy_comp_test_SOURCES = utils.c lossy_comp_test.c -lossy_comp_test_LDADD = $(top_builddir)/src/libsndfile.la - -fix_this_SOURCES = utils.c fix_this.c -fix_this_LDADD = $(top_builddir)/src/libsndfile.la - -error_test_SOURCES = error_test.c utils.c -error_test_LDADD = $(top_builddir)/src/libsndfile.la - -ulaw_test_SOURCES = utils.c ulaw_test.c -ulaw_test_LDADD = $(top_builddir)/src/libsndfile.la - -alaw_test_SOURCES = utils.c alaw_test.c -alaw_test_LDADD = $(top_builddir)/src/libsndfile.la - -aiff_rw_test_SOURCES = utils.c aiff_rw_test.c -aiff_rw_test_LDADD = $(top_builddir)/src/libsndfile.la - -command_test_SOURCES = command_test.c utils.c -command_test_LDADD = $(top_builddir)/src/libsndfile.la - -locale_test_SOURCES = locale_test.c utils.c -locale_test_LDADD = $(top_builddir)/src/libsndfile.la - -largefile_test_SOURCES = largefile_test.c utils.c -largefile_test_LDADD = $(top_builddir)/src/libsndfile.la - -pcm_test_SOURCES = pcm_test.c utils.c -pcm_test_LDADD = $(top_builddir)/src/libsndfile.la - -headerless_test_SOURCES = utils.c headerless_test.c -headerless_test_LDADD = $(top_builddir)/src/libsndfile.la - -stdin_test_SOURCES = stdin_test.c utils.c -stdin_test_LDADD = $(top_builddir)/src/libsndfile.la - -stdout_test_SOURCES = stdout_test.c -stdout_test_LDADD = $(top_builddir)/src/libsndfile.la - -stdio_test_SOURCES = stdio_test.c utils.c -stdio_test_LDADD = $(top_builddir)/src/libsndfile.la - -pipe_test_SOURCES = pipe_test.c utils.c -pipe_test_LDADD = $(top_builddir)/src/libsndfile.la - -benchmark_SOURCES = benchmark.c -benchmark_LDADD = $(top_builddir)/src/libsndfile.la - -header_test_SOURCES = header_test.c utils.c -header_test_LDADD = $(top_builddir)/src/libsndfile.la - -misc_test_SOURCES = misc_test.c utils.c -misc_test_LDADD = $(top_builddir)/src/libsndfile.la - -raw_test_SOURCES = raw_test.c utils.c -raw_test_LDADD = $(top_builddir)/src/libsndfile.la - -string_test_SOURCES = string_test.c utils.c -string_test_LDADD = $(top_builddir)/src/libsndfile.la - -dither_test_SOURCES = dither_test.c utils.c -dither_test_LDADD = $(top_builddir)/src/libsndfile.la - -multi_file_test_SOURCES = multi_file_test.c utils.c -multi_file_test_LDADD = $(top_builddir)/src/libsndfile.la - -virtual_io_test_SOURCES = virtual_io_test.c utils.c -virtual_io_test_LDADD = $(top_builddir)/src/libsndfile.la - -ogg_test_SOURCES = ogg_test.c utils.c -ogg_test_LDADD = $(top_builddir)/src/libsndfile.la - -vorbis_test_SOURCES = vorbis_test.c utils.c -vorbis_test_LDADD = $(top_builddir)/src/libsndfile.la - -rdwr_test_SOURCES = rdwr_test.c utils.c -rdwr_test_LDADD = $(top_builddir)/src/libsndfile.la - -win32_test_SOURCES = win32_test.c -# Link lib here so that generating the testsuite tarball works correctly. -win32_test_LDADD = $(top_builddir)/src/libsndfile.la - -win32_ordinal_test_SOURCES = win32_ordinal_test.c utils.c -win32_ordinal_test_LDADD = $(top_builddir)/src/libsndfile.la - -external_libs_test_SOURCES = external_libs_test.c utils.c -external_libs_test_LDADD = $(top_builddir)/src/libsndfile.la - -cpp_test_SOURCES = cpp_test.cc utils.c -cpp_test_LDADD = $(top_builddir)/src/libsndfile.la - -checksum_test_SOURCES = checksum_test.c utils.c -checksum_test_LDADD = $(top_builddir)/src/libsndfile.la - -# Lite remove start -dwvw_test_SOURCES = utils.c dwvw_test.c -dwvw_test_LDADD = $(top_builddir)/src/libsndfile.la - -floating_point_test_SOURCES = utils.c dft_cmp.c floating_point_test.c -floating_point_test_LDADD = $(top_builddir)/src/libsndfile.la - -peak_chunk_test_SOURCES = peak_chunk_test.c utils.c -peak_chunk_test_LDADD = $(top_builddir)/src/libsndfile.la - -scale_clip_test_SOURCES = scale_clip_test.c utils.c -scale_clip_test_LDADD = $(top_builddir)/src/libsndfile.la -# Lite remove end - -#=============================================================================== - -write_read_test.c: write_read_test.def write_read_test.tpl - autogen --writable write_read_test.def - -pcm_test.c: pcm_test.def pcm_test.tpl - autogen --writable pcm_test.def - -header_test.c: header_test.def header_test.tpl - autogen --writable header_test.def - -utils.c utils.h : utils.def utils.tpl - autogen --writable utils.def - -scale_clip_test.c: scale_clip_test.def scale_clip_test.tpl - autogen --writable scale_clip_test.def - -pipe_test.c: pipe_test.def pipe_test.tpl - autogen --writable pipe_test.def - -rdwr_test.c: rdwr_test.def rdwr_test.tpl - autogen --writable rdwr_test.def - -floating_point_test.c: floating_point_test.def floating_point_test.tpl - autogen --writable floating_point_test.def - -benchmark.c: benchmark.def benchmark.tpl - autogen --writable benchmark.def - -genfiles : write_read_test.c pcm_test.c header_test.c utils.c \ - scale_clip_test.c pipe_test.c floating_point_test.c rdwr_test.c \ - benchmark.c - -#=============================================================================== -# If we're cross compiling from Linux to Windows and running the test suite -# under Wine, we need a symbolic link to the generated libsndfile DLL. - -if LINUX_MINGW_CROSS_TEST - -$(noinst_PROGRAMS) : libsndfile-1.dll - -libsndfile-1.dll : - ln -s $(top_builddir)/src/.libs/$@ $@ - -clean-local : - -rm -f libsndfile-1.dll - -endif - -#=============================================================================== - -check: $(noinst_PROGRAMS) test_wrapper.sh - sh test_wrapper.sh - - diff --git a/lib-src/libsndfile/tests/Makefile.in b/lib-src/libsndfile/tests/Makefile.in deleted file mode 100644 index d474d7984..000000000 --- a/lib-src/libsndfile/tests/Makefile.in +++ /dev/null @@ -1,1174 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -noinst_PROGRAMS = sfversion$(EXEEXT) floating_point_test$(EXEEXT) \ - write_read_test$(EXEEXT) lossy_comp_test$(EXEEXT) \ - error_test$(EXEEXT) ulaw_test$(EXEEXT) alaw_test$(EXEEXT) \ - dwvw_test$(EXEEXT) peak_chunk_test$(EXEEXT) \ - command_test$(EXEEXT) stdin_test$(EXEEXT) stdout_test$(EXEEXT) \ - stdio_test$(EXEEXT) pcm_test$(EXEEXT) headerless_test$(EXEEXT) \ - pipe_test$(EXEEXT) benchmark$(EXEEXT) header_test$(EXEEXT) \ - misc_test$(EXEEXT) raw_test$(EXEEXT) string_test$(EXEEXT) \ - multi_file_test$(EXEEXT) dither_test$(EXEEXT) \ - scale_clip_test$(EXEEXT) win32_test$(EXEEXT) fix_this$(EXEEXT) \ - aiff_rw_test$(EXEEXT) virtual_io_test$(EXEEXT) \ - locale_test$(EXEEXT) largefile_test$(EXEEXT) \ - win32_ordinal_test$(EXEEXT) ogg_test$(EXEEXT) \ - vorbis_test$(EXEEXT) checksum_test$(EXEEXT) \ - external_libs_test$(EXEEXT) rdwr_test$(EXEEXT) $(am__EXEEXT_1) -subdir = tests -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/test_wrapper.sh.in \ - $(srcdir)/pedantic-header-test.sh.in $(top_srcdir)/Cfg/depcomp \ - $(noinst_HEADERS) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \ - $(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \ - $(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \ - $(top_srcdir)/M4/extra_pkg.m4 \ - $(top_srcdir)/M4/flexible_array.m4 \ - $(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \ - $(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \ - $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \ - $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \ - $(top_srcdir)/M4/mkoctfile_version.m4 \ - $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/config.h -CONFIG_CLEAN_FILES = test_wrapper.sh pedantic-header-test.sh -CONFIG_CLEAN_VPATH_FILES = -@ENABLE_TEST_COVERAGE_FALSE@am__EXEEXT_1 = cpp_test$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) -am_aiff_rw_test_OBJECTS = utils.$(OBJEXT) aiff_rw_test.$(OBJEXT) -aiff_rw_test_OBJECTS = $(am_aiff_rw_test_OBJECTS) -aiff_rw_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am_alaw_test_OBJECTS = utils.$(OBJEXT) alaw_test.$(OBJEXT) -alaw_test_OBJECTS = $(am_alaw_test_OBJECTS) -alaw_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_benchmark_OBJECTS = benchmark.$(OBJEXT) -benchmark_OBJECTS = $(am_benchmark_OBJECTS) -benchmark_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_checksum_test_OBJECTS = checksum_test.$(OBJEXT) utils.$(OBJEXT) -checksum_test_OBJECTS = $(am_checksum_test_OBJECTS) -checksum_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_command_test_OBJECTS = command_test.$(OBJEXT) utils.$(OBJEXT) -command_test_OBJECTS = $(am_command_test_OBJECTS) -command_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_cpp_test_OBJECTS = cpp_test.$(OBJEXT) utils.$(OBJEXT) -cpp_test_OBJECTS = $(am_cpp_test_OBJECTS) -cpp_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_dither_test_OBJECTS = dither_test.$(OBJEXT) utils.$(OBJEXT) -dither_test_OBJECTS = $(am_dither_test_OBJECTS) -dither_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_dwvw_test_OBJECTS = utils.$(OBJEXT) dwvw_test.$(OBJEXT) -dwvw_test_OBJECTS = $(am_dwvw_test_OBJECTS) -dwvw_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_error_test_OBJECTS = error_test.$(OBJEXT) utils.$(OBJEXT) -error_test_OBJECTS = $(am_error_test_OBJECTS) -error_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_external_libs_test_OBJECTS = external_libs_test.$(OBJEXT) \ - utils.$(OBJEXT) -external_libs_test_OBJECTS = $(am_external_libs_test_OBJECTS) -external_libs_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_fix_this_OBJECTS = utils.$(OBJEXT) fix_this.$(OBJEXT) -fix_this_OBJECTS = $(am_fix_this_OBJECTS) -fix_this_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_floating_point_test_OBJECTS = utils.$(OBJEXT) dft_cmp.$(OBJEXT) \ - floating_point_test.$(OBJEXT) -floating_point_test_OBJECTS = $(am_floating_point_test_OBJECTS) -floating_point_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_header_test_OBJECTS = header_test.$(OBJEXT) utils.$(OBJEXT) -header_test_OBJECTS = $(am_header_test_OBJECTS) -header_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_headerless_test_OBJECTS = utils.$(OBJEXT) headerless_test.$(OBJEXT) -headerless_test_OBJECTS = $(am_headerless_test_OBJECTS) -headerless_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_largefile_test_OBJECTS = largefile_test.$(OBJEXT) utils.$(OBJEXT) -largefile_test_OBJECTS = $(am_largefile_test_OBJECTS) -largefile_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_locale_test_OBJECTS = locale_test.$(OBJEXT) utils.$(OBJEXT) -locale_test_OBJECTS = $(am_locale_test_OBJECTS) -locale_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_lossy_comp_test_OBJECTS = utils.$(OBJEXT) lossy_comp_test.$(OBJEXT) -lossy_comp_test_OBJECTS = $(am_lossy_comp_test_OBJECTS) -lossy_comp_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_misc_test_OBJECTS = misc_test.$(OBJEXT) utils.$(OBJEXT) -misc_test_OBJECTS = $(am_misc_test_OBJECTS) -misc_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_multi_file_test_OBJECTS = multi_file_test.$(OBJEXT) utils.$(OBJEXT) -multi_file_test_OBJECTS = $(am_multi_file_test_OBJECTS) -multi_file_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_ogg_test_OBJECTS = ogg_test.$(OBJEXT) utils.$(OBJEXT) -ogg_test_OBJECTS = $(am_ogg_test_OBJECTS) -ogg_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_pcm_test_OBJECTS = pcm_test.$(OBJEXT) utils.$(OBJEXT) -pcm_test_OBJECTS = $(am_pcm_test_OBJECTS) -pcm_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_peak_chunk_test_OBJECTS = peak_chunk_test.$(OBJEXT) utils.$(OBJEXT) -peak_chunk_test_OBJECTS = $(am_peak_chunk_test_OBJECTS) -peak_chunk_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_pipe_test_OBJECTS = pipe_test.$(OBJEXT) utils.$(OBJEXT) -pipe_test_OBJECTS = $(am_pipe_test_OBJECTS) -pipe_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_raw_test_OBJECTS = raw_test.$(OBJEXT) utils.$(OBJEXT) -raw_test_OBJECTS = $(am_raw_test_OBJECTS) -raw_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_rdwr_test_OBJECTS = rdwr_test.$(OBJEXT) utils.$(OBJEXT) -rdwr_test_OBJECTS = $(am_rdwr_test_OBJECTS) -rdwr_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_scale_clip_test_OBJECTS = scale_clip_test.$(OBJEXT) utils.$(OBJEXT) -scale_clip_test_OBJECTS = $(am_scale_clip_test_OBJECTS) -scale_clip_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_sfversion_OBJECTS = sfversion.$(OBJEXT) -sfversion_OBJECTS = $(am_sfversion_OBJECTS) -sfversion_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_stdin_test_OBJECTS = stdin_test.$(OBJEXT) utils.$(OBJEXT) -stdin_test_OBJECTS = $(am_stdin_test_OBJECTS) -stdin_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_stdio_test_OBJECTS = stdio_test.$(OBJEXT) utils.$(OBJEXT) -stdio_test_OBJECTS = $(am_stdio_test_OBJECTS) -stdio_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_stdout_test_OBJECTS = stdout_test.$(OBJEXT) -stdout_test_OBJECTS = $(am_stdout_test_OBJECTS) -stdout_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_string_test_OBJECTS = string_test.$(OBJEXT) utils.$(OBJEXT) -string_test_OBJECTS = $(am_string_test_OBJECTS) -string_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_ulaw_test_OBJECTS = utils.$(OBJEXT) ulaw_test.$(OBJEXT) -ulaw_test_OBJECTS = $(am_ulaw_test_OBJECTS) -ulaw_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_virtual_io_test_OBJECTS = virtual_io_test.$(OBJEXT) utils.$(OBJEXT) -virtual_io_test_OBJECTS = $(am_virtual_io_test_OBJECTS) -virtual_io_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_vorbis_test_OBJECTS = vorbis_test.$(OBJEXT) utils.$(OBJEXT) -vorbis_test_OBJECTS = $(am_vorbis_test_OBJECTS) -vorbis_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_win32_ordinal_test_OBJECTS = win32_ordinal_test.$(OBJEXT) \ - utils.$(OBJEXT) -win32_ordinal_test_OBJECTS = $(am_win32_ordinal_test_OBJECTS) -win32_ordinal_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_win32_test_OBJECTS = win32_test.$(OBJEXT) -win32_test_OBJECTS = $(am_win32_test_OBJECTS) -win32_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -am_write_read_test_OBJECTS = utils.$(OBJEXT) generate.$(OBJEXT) \ - write_read_test.$(OBJEXT) -write_read_test_OBJECTS = $(am_write_read_test_OBJECTS) -write_read_test_DEPENDENCIES = $(top_builddir)/src/libsndfile.la -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -depcomp = $(SHELL) $(top_srcdir)/Cfg/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_@AM_V@) -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = -SOURCES = $(aiff_rw_test_SOURCES) $(alaw_test_SOURCES) \ - $(benchmark_SOURCES) $(checksum_test_SOURCES) \ - $(command_test_SOURCES) $(cpp_test_SOURCES) \ - $(dither_test_SOURCES) $(dwvw_test_SOURCES) \ - $(error_test_SOURCES) $(external_libs_test_SOURCES) \ - $(fix_this_SOURCES) $(floating_point_test_SOURCES) \ - $(header_test_SOURCES) $(headerless_test_SOURCES) \ - $(largefile_test_SOURCES) $(locale_test_SOURCES) \ - $(lossy_comp_test_SOURCES) $(misc_test_SOURCES) \ - $(multi_file_test_SOURCES) $(ogg_test_SOURCES) \ - $(pcm_test_SOURCES) $(peak_chunk_test_SOURCES) \ - $(pipe_test_SOURCES) $(raw_test_SOURCES) $(rdwr_test_SOURCES) \ - $(scale_clip_test_SOURCES) $(sfversion_SOURCES) \ - $(stdin_test_SOURCES) $(stdio_test_SOURCES) \ - $(stdout_test_SOURCES) $(string_test_SOURCES) \ - $(ulaw_test_SOURCES) $(virtual_io_test_SOURCES) \ - $(vorbis_test_SOURCES) $(win32_ordinal_test_SOURCES) \ - $(win32_test_SOURCES) $(write_read_test_SOURCES) -DIST_SOURCES = $(aiff_rw_test_SOURCES) $(alaw_test_SOURCES) \ - $(benchmark_SOURCES) $(checksum_test_SOURCES) \ - $(command_test_SOURCES) $(cpp_test_SOURCES) \ - $(dither_test_SOURCES) $(dwvw_test_SOURCES) \ - $(error_test_SOURCES) $(external_libs_test_SOURCES) \ - $(fix_this_SOURCES) $(floating_point_test_SOURCES) \ - $(header_test_SOURCES) $(headerless_test_SOURCES) \ - $(largefile_test_SOURCES) $(locale_test_SOURCES) \ - $(lossy_comp_test_SOURCES) $(misc_test_SOURCES) \ - $(multi_file_test_SOURCES) $(ogg_test_SOURCES) \ - $(pcm_test_SOURCES) $(peak_chunk_test_SOURCES) \ - $(pipe_test_SOURCES) $(raw_test_SOURCES) $(rdwr_test_SOURCES) \ - $(scale_clip_test_SOURCES) $(sfversion_SOURCES) \ - $(stdin_test_SOURCES) $(stdio_test_SOURCES) \ - $(stdout_test_SOURCES) $(string_test_SOURCES) \ - $(ulaw_test_SOURCES) $(virtual_io_test_SOURCES) \ - $(vorbis_test_SOURCES) $(win32_ordinal_test_SOURCES) \ - $(win32_test_SOURCES) $(write_read_test_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -HEADERS = $(noinst_HEADERS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLEAN_VERSION = @CLEAN_VERSION@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@ -EXTERNAL_LIBS = @EXTERNAL_LIBS@ -FGREP = @FGREP@ -FLAC_CFLAGS = @FLAC_CFLAGS@ -FLAC_LIBS = @FLAC_LIBS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GETCONF = @GETCONF@ -GREP = @GREP@ -HAVE_AUTOGEN = @HAVE_AUTOGEN@ -HAVE_MKOCTFILE = @HAVE_MKOCTFILE@ -HAVE_OCTAVE = @HAVE_OCTAVE@ -HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@ -HAVE_WINE = @HAVE_WINE@ -HOST_TRIPLET = @HOST_TRIPLET@ -HTML_BGCOLOUR = @HTML_BGCOLOUR@ -HTML_FGCOLOUR = @HTML_FGCOLOUR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKOCTFILE = @MKOCTFILE@ -MKOCTFILE_VERSION = @MKOCTFILE_VERSION@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OCTAVE = @OCTAVE@ -OCTAVE_CONFIG = @OCTAVE_CONFIG@ -OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@ -OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@ -OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ -OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -RC = @RC@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SF_COUNT_MAX = @SF_COUNT_MAX@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ -SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@ -SNDIO_LIBS = @SNDIO_LIBS@ -SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ -SQLITE3_LIBS = @SQLITE3_LIBS@ -STRIP = @STRIP@ -TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@ -VERSION = @VERSION@ -VORBISENC_CFLAGS = @VORBISENC_CFLAGS@ -VORBISENC_LIBS = @VORBISENC_LIBS@ -VORBIS_CFLAGS = @VORBIS_CFLAGS@ -VORBIS_LIBS = @VORBIS_LIBS@ -WIN_RC_VERSION = @WIN_RC_VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -htmldocdir = @htmldocdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -@ENABLE_TEST_COVERAGE_FALSE@CPP_TEST = cpp_test -@ENABLE_TEST_COVERAGE_TRUE@CPP_TEST = -AM_CPPFLAGS = -I$(top_srcdir)/src -noinst_HEADERS = dft_cmp.h utils.h generate.h -autogen_sources = write_read_test.tpl write_read_test.def \ - pcm_test.tpl pcm_test.def \ - header_test.tpl header_test.def \ - utils.tpl utils.def \ - scale_clip_test.tpl scale_clip_test.def \ - pipe_test.tpl pipe_test.def \ - rdwr_test.tpl rdwr_test.def \ - floating_point_test.tpl floating_point_test.def \ - benchmark.tpl benchmark.def - -EXTRA_DIST = $(autogen_sources) -CLEANFILES = *~ - -#=============================================================================== -sfversion_SOURCES = sfversion.c -sfversion_LDADD = $(top_builddir)/src/libsndfile.la -write_read_test_SOURCES = utils.c generate.c write_read_test.c -write_read_test_LDADD = $(top_builddir)/src/libsndfile.la -lossy_comp_test_SOURCES = utils.c lossy_comp_test.c -lossy_comp_test_LDADD = $(top_builddir)/src/libsndfile.la -fix_this_SOURCES = utils.c fix_this.c -fix_this_LDADD = $(top_builddir)/src/libsndfile.la -error_test_SOURCES = error_test.c utils.c -error_test_LDADD = $(top_builddir)/src/libsndfile.la -ulaw_test_SOURCES = utils.c ulaw_test.c -ulaw_test_LDADD = $(top_builddir)/src/libsndfile.la -alaw_test_SOURCES = utils.c alaw_test.c -alaw_test_LDADD = $(top_builddir)/src/libsndfile.la -aiff_rw_test_SOURCES = utils.c aiff_rw_test.c -aiff_rw_test_LDADD = $(top_builddir)/src/libsndfile.la -command_test_SOURCES = command_test.c utils.c -command_test_LDADD = $(top_builddir)/src/libsndfile.la -locale_test_SOURCES = locale_test.c utils.c -locale_test_LDADD = $(top_builddir)/src/libsndfile.la -largefile_test_SOURCES = largefile_test.c utils.c -largefile_test_LDADD = $(top_builddir)/src/libsndfile.la -pcm_test_SOURCES = pcm_test.c utils.c -pcm_test_LDADD = $(top_builddir)/src/libsndfile.la -headerless_test_SOURCES = utils.c headerless_test.c -headerless_test_LDADD = $(top_builddir)/src/libsndfile.la -stdin_test_SOURCES = stdin_test.c utils.c -stdin_test_LDADD = $(top_builddir)/src/libsndfile.la -stdout_test_SOURCES = stdout_test.c -stdout_test_LDADD = $(top_builddir)/src/libsndfile.la -stdio_test_SOURCES = stdio_test.c utils.c -stdio_test_LDADD = $(top_builddir)/src/libsndfile.la -pipe_test_SOURCES = pipe_test.c utils.c -pipe_test_LDADD = $(top_builddir)/src/libsndfile.la -benchmark_SOURCES = benchmark.c -benchmark_LDADD = $(top_builddir)/src/libsndfile.la -header_test_SOURCES = header_test.c utils.c -header_test_LDADD = $(top_builddir)/src/libsndfile.la -misc_test_SOURCES = misc_test.c utils.c -misc_test_LDADD = $(top_builddir)/src/libsndfile.la -raw_test_SOURCES = raw_test.c utils.c -raw_test_LDADD = $(top_builddir)/src/libsndfile.la -string_test_SOURCES = string_test.c utils.c -string_test_LDADD = $(top_builddir)/src/libsndfile.la -dither_test_SOURCES = dither_test.c utils.c -dither_test_LDADD = $(top_builddir)/src/libsndfile.la -multi_file_test_SOURCES = multi_file_test.c utils.c -multi_file_test_LDADD = $(top_builddir)/src/libsndfile.la -virtual_io_test_SOURCES = virtual_io_test.c utils.c -virtual_io_test_LDADD = $(top_builddir)/src/libsndfile.la -ogg_test_SOURCES = ogg_test.c utils.c -ogg_test_LDADD = $(top_builddir)/src/libsndfile.la -vorbis_test_SOURCES = vorbis_test.c utils.c -vorbis_test_LDADD = $(top_builddir)/src/libsndfile.la -rdwr_test_SOURCES = rdwr_test.c utils.c -rdwr_test_LDADD = $(top_builddir)/src/libsndfile.la -win32_test_SOURCES = win32_test.c -# Link lib here so that generating the testsuite tarball works correctly. -win32_test_LDADD = $(top_builddir)/src/libsndfile.la -win32_ordinal_test_SOURCES = win32_ordinal_test.c utils.c -win32_ordinal_test_LDADD = $(top_builddir)/src/libsndfile.la -external_libs_test_SOURCES = external_libs_test.c utils.c -external_libs_test_LDADD = $(top_builddir)/src/libsndfile.la -cpp_test_SOURCES = cpp_test.cc utils.c -cpp_test_LDADD = $(top_builddir)/src/libsndfile.la -checksum_test_SOURCES = checksum_test.c utils.c -checksum_test_LDADD = $(top_builddir)/src/libsndfile.la - -# Lite remove start -dwvw_test_SOURCES = utils.c dwvw_test.c -dwvw_test_LDADD = $(top_builddir)/src/libsndfile.la -floating_point_test_SOURCES = utils.c dft_cmp.c floating_point_test.c -floating_point_test_LDADD = $(top_builddir)/src/libsndfile.la -peak_chunk_test_SOURCES = peak_chunk_test.c utils.c -peak_chunk_test_LDADD = $(top_builddir)/src/libsndfile.la -scale_clip_test_SOURCES = scale_clip_test.c utils.c -scale_clip_test_LDADD = $(top_builddir)/src/libsndfile.la -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .cc .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -test_wrapper.sh: $(top_builddir)/config.status $(srcdir)/test_wrapper.sh.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -pedantic-header-test.sh: $(top_builddir)/config.status $(srcdir)/pedantic-header-test.sh.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -aiff_rw_test$(EXEEXT): $(aiff_rw_test_OBJECTS) $(aiff_rw_test_DEPENDENCIES) $(EXTRA_aiff_rw_test_DEPENDENCIES) - @rm -f aiff_rw_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(aiff_rw_test_OBJECTS) $(aiff_rw_test_LDADD) $(LIBS) - -alaw_test$(EXEEXT): $(alaw_test_OBJECTS) $(alaw_test_DEPENDENCIES) $(EXTRA_alaw_test_DEPENDENCIES) - @rm -f alaw_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(alaw_test_OBJECTS) $(alaw_test_LDADD) $(LIBS) - -benchmark$(EXEEXT): $(benchmark_OBJECTS) $(benchmark_DEPENDENCIES) $(EXTRA_benchmark_DEPENDENCIES) - @rm -f benchmark$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(benchmark_OBJECTS) $(benchmark_LDADD) $(LIBS) - -checksum_test$(EXEEXT): $(checksum_test_OBJECTS) $(checksum_test_DEPENDENCIES) $(EXTRA_checksum_test_DEPENDENCIES) - @rm -f checksum_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(checksum_test_OBJECTS) $(checksum_test_LDADD) $(LIBS) - -command_test$(EXEEXT): $(command_test_OBJECTS) $(command_test_DEPENDENCIES) $(EXTRA_command_test_DEPENDENCIES) - @rm -f command_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(command_test_OBJECTS) $(command_test_LDADD) $(LIBS) - -cpp_test$(EXEEXT): $(cpp_test_OBJECTS) $(cpp_test_DEPENDENCIES) $(EXTRA_cpp_test_DEPENDENCIES) - @rm -f cpp_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(cpp_test_OBJECTS) $(cpp_test_LDADD) $(LIBS) - -dither_test$(EXEEXT): $(dither_test_OBJECTS) $(dither_test_DEPENDENCIES) $(EXTRA_dither_test_DEPENDENCIES) - @rm -f dither_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dither_test_OBJECTS) $(dither_test_LDADD) $(LIBS) - -dwvw_test$(EXEEXT): $(dwvw_test_OBJECTS) $(dwvw_test_DEPENDENCIES) $(EXTRA_dwvw_test_DEPENDENCIES) - @rm -f dwvw_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dwvw_test_OBJECTS) $(dwvw_test_LDADD) $(LIBS) - -error_test$(EXEEXT): $(error_test_OBJECTS) $(error_test_DEPENDENCIES) $(EXTRA_error_test_DEPENDENCIES) - @rm -f error_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(error_test_OBJECTS) $(error_test_LDADD) $(LIBS) - -external_libs_test$(EXEEXT): $(external_libs_test_OBJECTS) $(external_libs_test_DEPENDENCIES) $(EXTRA_external_libs_test_DEPENDENCIES) - @rm -f external_libs_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(external_libs_test_OBJECTS) $(external_libs_test_LDADD) $(LIBS) - -fix_this$(EXEEXT): $(fix_this_OBJECTS) $(fix_this_DEPENDENCIES) $(EXTRA_fix_this_DEPENDENCIES) - @rm -f fix_this$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(fix_this_OBJECTS) $(fix_this_LDADD) $(LIBS) - -floating_point_test$(EXEEXT): $(floating_point_test_OBJECTS) $(floating_point_test_DEPENDENCIES) $(EXTRA_floating_point_test_DEPENDENCIES) - @rm -f floating_point_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(floating_point_test_OBJECTS) $(floating_point_test_LDADD) $(LIBS) - -header_test$(EXEEXT): $(header_test_OBJECTS) $(header_test_DEPENDENCIES) $(EXTRA_header_test_DEPENDENCIES) - @rm -f header_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(header_test_OBJECTS) $(header_test_LDADD) $(LIBS) - -headerless_test$(EXEEXT): $(headerless_test_OBJECTS) $(headerless_test_DEPENDENCIES) $(EXTRA_headerless_test_DEPENDENCIES) - @rm -f headerless_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(headerless_test_OBJECTS) $(headerless_test_LDADD) $(LIBS) - -largefile_test$(EXEEXT): $(largefile_test_OBJECTS) $(largefile_test_DEPENDENCIES) $(EXTRA_largefile_test_DEPENDENCIES) - @rm -f largefile_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(largefile_test_OBJECTS) $(largefile_test_LDADD) $(LIBS) - -locale_test$(EXEEXT): $(locale_test_OBJECTS) $(locale_test_DEPENDENCIES) $(EXTRA_locale_test_DEPENDENCIES) - @rm -f locale_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(locale_test_OBJECTS) $(locale_test_LDADD) $(LIBS) - -lossy_comp_test$(EXEEXT): $(lossy_comp_test_OBJECTS) $(lossy_comp_test_DEPENDENCIES) $(EXTRA_lossy_comp_test_DEPENDENCIES) - @rm -f lossy_comp_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(lossy_comp_test_OBJECTS) $(lossy_comp_test_LDADD) $(LIBS) - -misc_test$(EXEEXT): $(misc_test_OBJECTS) $(misc_test_DEPENDENCIES) $(EXTRA_misc_test_DEPENDENCIES) - @rm -f misc_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(misc_test_OBJECTS) $(misc_test_LDADD) $(LIBS) - -multi_file_test$(EXEEXT): $(multi_file_test_OBJECTS) $(multi_file_test_DEPENDENCIES) $(EXTRA_multi_file_test_DEPENDENCIES) - @rm -f multi_file_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(multi_file_test_OBJECTS) $(multi_file_test_LDADD) $(LIBS) - -ogg_test$(EXEEXT): $(ogg_test_OBJECTS) $(ogg_test_DEPENDENCIES) $(EXTRA_ogg_test_DEPENDENCIES) - @rm -f ogg_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ogg_test_OBJECTS) $(ogg_test_LDADD) $(LIBS) - -pcm_test$(EXEEXT): $(pcm_test_OBJECTS) $(pcm_test_DEPENDENCIES) $(EXTRA_pcm_test_DEPENDENCIES) - @rm -f pcm_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pcm_test_OBJECTS) $(pcm_test_LDADD) $(LIBS) - -peak_chunk_test$(EXEEXT): $(peak_chunk_test_OBJECTS) $(peak_chunk_test_DEPENDENCIES) $(EXTRA_peak_chunk_test_DEPENDENCIES) - @rm -f peak_chunk_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(peak_chunk_test_OBJECTS) $(peak_chunk_test_LDADD) $(LIBS) - -pipe_test$(EXEEXT): $(pipe_test_OBJECTS) $(pipe_test_DEPENDENCIES) $(EXTRA_pipe_test_DEPENDENCIES) - @rm -f pipe_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pipe_test_OBJECTS) $(pipe_test_LDADD) $(LIBS) - -raw_test$(EXEEXT): $(raw_test_OBJECTS) $(raw_test_DEPENDENCIES) $(EXTRA_raw_test_DEPENDENCIES) - @rm -f raw_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(raw_test_OBJECTS) $(raw_test_LDADD) $(LIBS) - -rdwr_test$(EXEEXT): $(rdwr_test_OBJECTS) $(rdwr_test_DEPENDENCIES) $(EXTRA_rdwr_test_DEPENDENCIES) - @rm -f rdwr_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(rdwr_test_OBJECTS) $(rdwr_test_LDADD) $(LIBS) - -scale_clip_test$(EXEEXT): $(scale_clip_test_OBJECTS) $(scale_clip_test_DEPENDENCIES) $(EXTRA_scale_clip_test_DEPENDENCIES) - @rm -f scale_clip_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(scale_clip_test_OBJECTS) $(scale_clip_test_LDADD) $(LIBS) - -sfversion$(EXEEXT): $(sfversion_OBJECTS) $(sfversion_DEPENDENCIES) $(EXTRA_sfversion_DEPENDENCIES) - @rm -f sfversion$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(sfversion_OBJECTS) $(sfversion_LDADD) $(LIBS) - -stdin_test$(EXEEXT): $(stdin_test_OBJECTS) $(stdin_test_DEPENDENCIES) $(EXTRA_stdin_test_DEPENDENCIES) - @rm -f stdin_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(stdin_test_OBJECTS) $(stdin_test_LDADD) $(LIBS) - -stdio_test$(EXEEXT): $(stdio_test_OBJECTS) $(stdio_test_DEPENDENCIES) $(EXTRA_stdio_test_DEPENDENCIES) - @rm -f stdio_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(stdio_test_OBJECTS) $(stdio_test_LDADD) $(LIBS) - -stdout_test$(EXEEXT): $(stdout_test_OBJECTS) $(stdout_test_DEPENDENCIES) $(EXTRA_stdout_test_DEPENDENCIES) - @rm -f stdout_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(stdout_test_OBJECTS) $(stdout_test_LDADD) $(LIBS) - -string_test$(EXEEXT): $(string_test_OBJECTS) $(string_test_DEPENDENCIES) $(EXTRA_string_test_DEPENDENCIES) - @rm -f string_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(string_test_OBJECTS) $(string_test_LDADD) $(LIBS) - -ulaw_test$(EXEEXT): $(ulaw_test_OBJECTS) $(ulaw_test_DEPENDENCIES) $(EXTRA_ulaw_test_DEPENDENCIES) - @rm -f ulaw_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ulaw_test_OBJECTS) $(ulaw_test_LDADD) $(LIBS) - -virtual_io_test$(EXEEXT): $(virtual_io_test_OBJECTS) $(virtual_io_test_DEPENDENCIES) $(EXTRA_virtual_io_test_DEPENDENCIES) - @rm -f virtual_io_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(virtual_io_test_OBJECTS) $(virtual_io_test_LDADD) $(LIBS) - -vorbis_test$(EXEEXT): $(vorbis_test_OBJECTS) $(vorbis_test_DEPENDENCIES) $(EXTRA_vorbis_test_DEPENDENCIES) - @rm -f vorbis_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(vorbis_test_OBJECTS) $(vorbis_test_LDADD) $(LIBS) - -win32_ordinal_test$(EXEEXT): $(win32_ordinal_test_OBJECTS) $(win32_ordinal_test_DEPENDENCIES) $(EXTRA_win32_ordinal_test_DEPENDENCIES) - @rm -f win32_ordinal_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(win32_ordinal_test_OBJECTS) $(win32_ordinal_test_LDADD) $(LIBS) - -win32_test$(EXEEXT): $(win32_test_OBJECTS) $(win32_test_DEPENDENCIES) $(EXTRA_win32_test_DEPENDENCIES) - @rm -f win32_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(win32_test_OBJECTS) $(win32_test_LDADD) $(LIBS) - -write_read_test$(EXEEXT): $(write_read_test_OBJECTS) $(write_read_test_DEPENDENCIES) $(EXTRA_write_read_test_DEPENDENCIES) - @rm -f write_read_test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(write_read_test_OBJECTS) $(write_read_test_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aiff_rw_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alaw_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/benchmark.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checksum_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpp_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dft_cmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dwvw_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/external_libs_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fix_this.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floating_point_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/headerless_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/largefile_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locale_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lossy_comp_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multi_file_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peak_chunk_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdwr_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale_clip_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfversion.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdin_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdout_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ulaw_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual_io_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vorbis_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32_ordinal_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_read_test.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -.cc.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - -.cc.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) $(HEADERS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -@LINUX_MINGW_CROSS_TEST_FALSE@clean-local: -clean: clean-am - -clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-local clean-noinstPROGRAMS cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - -# Lite remove end - -#=============================================================================== - -write_read_test.c: write_read_test.def write_read_test.tpl - autogen --writable write_read_test.def - -pcm_test.c: pcm_test.def pcm_test.tpl - autogen --writable pcm_test.def - -header_test.c: header_test.def header_test.tpl - autogen --writable header_test.def - -utils.c utils.h : utils.def utils.tpl - autogen --writable utils.def - -scale_clip_test.c: scale_clip_test.def scale_clip_test.tpl - autogen --writable scale_clip_test.def - -pipe_test.c: pipe_test.def pipe_test.tpl - autogen --writable pipe_test.def - -rdwr_test.c: rdwr_test.def rdwr_test.tpl - autogen --writable rdwr_test.def - -floating_point_test.c: floating_point_test.def floating_point_test.tpl - autogen --writable floating_point_test.def - -benchmark.c: benchmark.def benchmark.tpl - autogen --writable benchmark.def - -genfiles : write_read_test.c pcm_test.c header_test.c utils.c \ - scale_clip_test.c pipe_test.c floating_point_test.c rdwr_test.c \ - benchmark.c - -#=============================================================================== -# If we're cross compiling from Linux to Windows and running the test suite -# under Wine, we need a symbolic link to the generated libsndfile DLL. - -@LINUX_MINGW_CROSS_TEST_TRUE@$(noinst_PROGRAMS) : libsndfile-1.dll - -@LINUX_MINGW_CROSS_TEST_TRUE@libsndfile-1.dll : -@LINUX_MINGW_CROSS_TEST_TRUE@ ln -s $(top_builddir)/src/.libs/$@ $@ - -@LINUX_MINGW_CROSS_TEST_TRUE@clean-local : -@LINUX_MINGW_CROSS_TEST_TRUE@ -rm -f libsndfile-1.dll - -#=============================================================================== - -check: $(noinst_PROGRAMS) test_wrapper.sh - sh test_wrapper.sh - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libsndfile/tests/aiff_rw_test.c b/lib-src/libsndfile/tests/aiff_rw_test.c index 273818d69..54eec4ba9 100644 --- a/lib-src/libsndfile/tests/aiff_rw_test.c +++ b/lib-src/libsndfile/tests/aiff_rw_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2003-2011 Erik de Castro Lopo +** Copyright (C) 2003-2017 Erik de Castro Lopo ** ** 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 @@ -16,16 +16,23 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "sfconfig.h" -#include -#include -#include -#include -#include +#include +#include +#include +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif +#include +#include -#include -#include "utils.h" +#include + +#include "utils.h" static unsigned char aifc_data [] = @@ -152,8 +159,8 @@ rw_test (const char *filename) } ; if (sfinfo_rd.frames != sfinfo_rw.frames) - { printf ("\n\nLine %d : frame count mismatch (rd %ld != rw %ld).\n\n", __LINE__, - SF_COUNT_TO_LONG (sfinfo_rd.frames), SF_COUNT_TO_LONG (sfinfo_rw.frames)) ; + { printf ("\n\nLine %d : frame count mismatch (rd %" PRId64 " != rw %" PRId64 ").\n\n", __LINE__, + sfinfo_rd.frames, sfinfo_rw.frames) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/alaw_test.c b/lib-src/libsndfile/tests/alaw_test.c index e25101d9d..b928083cd 100644 --- a/lib-src/libsndfile/tests/alaw_test.c +++ b/lib-src/libsndfile/tests/alaw_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2012 Erik de Castro Lopo ** ** 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 @@ -24,6 +24,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -189,48 +191,48 @@ unsigned char alaw_encode (int sample) 7, 7, 7, 7, 7, 7, 7, 7 } ; - int sign, exponent, mantissa ; - unsigned char Alawbyte ; + int sign, exponent, mantissa ; + unsigned char Alawbyte ; - /* Get the sample into sign-magnitude. */ - sign = ((~sample) >> 8) & 0x80 ; /* set aside the sign */ - if (sign == 0) + /* Get the sample into sign-magnitude. */ + sign = ((~sample) >> 8) & 0x80 ; /* set aside the sign */ + if (sign == 0) sample = -sample ; /* get magnitude */ - if (sample > ACLIP) + if (sample > ACLIP) sample = ACLIP ; /* clip the magnitude */ - /* Convert from 16 bit linear to ulaw. */ - if (sample >= 256) + /* Convert from 16 bit linear to ulaw. */ + if (sample >= 256) { exponent = exp_lut [(sample >> 8) & 0x7F] ; - mantissa = ( sample >> ( exponent + 3 ) ) & 0x0F ; + mantissa = (sample >> (exponent + 3)) & 0x0F ; Alawbyte = ((exponent << 4) | mantissa) ; } - else + else Alawbyte = (sample >> 4) ; Alawbyte ^= (sign ^ 0x55) ; - return Alawbyte ; + return Alawbyte ; } /* alaw_encode */ static int alaw_decode (unsigned int Alawbyte) { static int exp_lut [8] = { 0, 264, 528, 1056, 2112, 4224, 8448, 16896 } ; - int sign, exponent, mantissa, sample ; + int sign, exponent, mantissa, sample ; - Alawbyte ^= 0x55 ; - sign = (Alawbyte & 0x80) ; - Alawbyte &= 0x7f ; /* get magnitude */ - if (Alawbyte >= 16) - { exponent = (Alawbyte >> 4 ) & 0x07 ; + Alawbyte ^= 0x55 ; + sign = (Alawbyte & 0x80) ; + Alawbyte &= 0x7f ; /* get magnitude */ + if (Alawbyte >= 16) + { exponent = (Alawbyte >> 4) & 0x07 ; mantissa = Alawbyte & 0x0F ; - sample = exp_lut [exponent] + (mantissa << ( exponent + 3 )) ; + sample = exp_lut [exponent] + (mantissa << (exponent + 3)) ; } - else + else sample = (Alawbyte << 4) + 8 ; - if (sign == 0) + if (sign == 0) sample = -sample ; - return sample ; + return sample ; } /* alaw_decode */ diff --git a/lib-src/libsndfile/tests/benchmark-0.0.28 b/lib-src/libsndfile/tests/benchmark-0.0.28 new file mode 100644 index 000000000..2d2b06f9b --- /dev/null +++ b/lib-src/libsndfile/tests/benchmark-0.0.28 @@ -0,0 +1,40 @@ +erikd@coltrane > tests/benchmark +Benchmarking libsndfile-0.0.28 +------------------------------ +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 30660117 samples per sec + Raw read PCM_16 : 62788982 samples per sec + +Native endian I/O : + Write short to PCM_16 : 83.37% of raw write + Read short from PCM_16 : 83.17% of raw read + Write int to PCM_24 : 30.78% of raw write + Read int from PCM_24 : 32.96% of raw read + Write int to PCM_32 : 42.05% of raw write + Read int from PCM_32 : 41.11% of raw read + Write float to PCM_16 : 17.75% of raw write + Read float from PCM_16 : 43.27% of raw read + Write float to PCM_24 : 15.30% of raw write + Read float from PCM_24 : 28.09% of raw read + Write float to PCM_32 : 14.55% of raw write + Read float from PCM_32 : 34.65% of raw read + Write float to FLOAT : 28.98% of raw write + Read float from FLOAT : 56.71% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 43.39% of raw write + Read short from PCM_16 : 49.12% of raw read + Write int to PCM_24 : 29.65% of raw write + Read int from PCM_24 : 33.66% of raw read + Write int to PCM_32 : 19.62% of raw write + Read int from PCM_32 : 21.97% of raw read + Write float to PCM_16 : 17.63% of raw write + Read float from PCM_16 : 31.43% of raw read + Write float to PCM_24 : 14.91% of raw write + Read float from PCM_24 : 27.99% of raw read + Write float to PCM_32 : 13.69% of raw write + Read float from PCM_32 : 22.23% of raw read + Write float to FLOAT : 19.25% of raw write + Read float from FLOAT : 25.66% of raw read + diff --git a/lib-src/libsndfile/tests/benchmark-1.0.0 b/lib-src/libsndfile/tests/benchmark-1.0.0 new file mode 100644 index 000000000..292283641 --- /dev/null +++ b/lib-src/libsndfile/tests/benchmark-1.0.0 @@ -0,0 +1,35 @@ +Benchmarking libsndfile-1.0.0 +----------------------------- +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 31084269 samples per sec + Raw read PCM_16 : 63597065 samples per sec + +Native endian I/O : + Write short to PCM_16 : 83.19% of raw write + Read short from PCM_16 : 82.93% of raw read + Write int to PCM_24 : 31.12% of raw write + Read int from PCM_24 : 37.90% of raw read + Write float to PCM_16 : 37.00% of raw write + Read float from PCM_16 : 45.53% of raw read + Write float to PCM_24 : 29.08% of raw write + Read float from PCM_24 : 28.48% of raw read + Write float to PCM_32 : 22.08% of raw write + Read float from PCM_32 : 31.21% of raw read + Write float to FLOAT : 28.70% of raw write + Read float from FLOAT : 56.32% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 22.08% of raw write + Read short from PCM_16 : 23.20% of raw read + Write int to PCM_24 : 30.96% of raw write + Read int from PCM_24 : 37.76% of raw read + Write float to PCM_16 : 35.82% of raw write + Read float from PCM_16 : 22.61% of raw read + Write float to PCM_24 : 27.70% of raw write + Read float from PCM_24 : 28.37% of raw read + Write float to PCM_32 : 20.77% of raw write + Read float from PCM_32 : 23.46% of raw read + Write float to FLOAT : 15.03% of raw write + Read float from FLOAT : 15.43% of raw read + diff --git a/lib-src/libsndfile/tests/benchmark-1.0.0rc2 b/lib-src/libsndfile/tests/benchmark-1.0.0rc2 new file mode 100644 index 000000000..770224672 --- /dev/null +++ b/lib-src/libsndfile/tests/benchmark-1.0.0rc2 @@ -0,0 +1,31 @@ +Benchmarking libsndfile-1.0.0rc2 +-------------------------------- +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 31638069 samples per sec + Raw read PCM_16 : 62788982 samples per sec + +Native endian I/O : + Write short to PCM_16 : 82.37% of raw write + Read short from PCM_16 : 82.17% of raw read + Write int to PCM_24 : 30.80% of raw write + Read int from PCM_24 : 37.95% of raw read + Write float to PCM_16 : 36.22% of raw write + Read float from PCM_16 : 23.32% of raw read + Write float to PCM_24 : 28.41% of raw write + Read float from PCM_24 : 28.41% of raw read + Write float to FLOAT : 28.41% of raw write + Read float from FLOAT : 57.50% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 21.73% of raw write + Read short from PCM_16 : 23.37% of raw read + Write int to PCM_24 : 31.02% of raw write + Read int from PCM_24 : 38.24% of raw read + Write float to PCM_16 : 35.51% of raw write + Read float from PCM_16 : 19.16% of raw read + Write float to PCM_24 : 27.37% of raw write + Read float from PCM_24 : 28.74% of raw read + Write float to FLOAT : 15.11% of raw write + Read float from FLOAT : 15.60% of raw read + diff --git a/lib-src/libsndfile/tests/benchmark-1.0.18pre16-hendrix b/lib-src/libsndfile/tests/benchmark-1.0.18pre16-hendrix new file mode 100644 index 000000000..951bc56d2 --- /dev/null +++ b/lib-src/libsndfile/tests/benchmark-1.0.18pre16-hendrix @@ -0,0 +1,38 @@ +Benchmarking libsndfile-1.0.18pre15 +----------------------------------- +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 103189885 samples per sec + Raw read PCM_16 : 660854036 samples per sec + +Native endian I/O : + Write short to PCM_16 : 95.08% of raw write + Read short from PCM_16 : 96.39% of raw read + Write int to PCM_24 : 54.55% of raw write + Read int from PCM_24 : 28.50% of raw read + Write int to PCM_32 : 46.97% of raw write + Read int from PCM_32 : 39.98% of raw read + Write float to PCM_16 : 60.85% of raw write + Read float from PCM_16 : 27.79% of raw read + Write float to PCM_24 : 46.23% of raw write + Read float from PCM_24 : 22.62% of raw read + Write float to PCM_32 : 35.38% of raw write + Read float from PCM_32 : 24.18% of raw read + Write float to FLOAT : 47.73% of raw write + Read float from FLOAT : 40.62% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 79.98% of raw write + Read short from PCM_16 : 49.27% of raw read + Write int to PCM_24 : 53.80% of raw write + Read int from PCM_24 : 28.50% of raw read + Write int to PCM_32 : 41.68% of raw write + Read int from PCM_32 : 25.89% of raw read + Write float to PCM_16 : 61.03% of raw write + Read float from PCM_16 : 27.74% of raw read + Write float to PCM_24 : 45.10% of raw write + Read float from PCM_24 : 22.43% of raw read + Write float to PCM_32 : 35.24% of raw write + Read float from PCM_32 : 22.37% of raw read + Write float to FLOAT : 42.01% of raw write + Read float from FLOAT : 28.98% of raw read diff --git a/lib-src/libsndfile/tests/benchmark-1.0.18pre16-mingus b/lib-src/libsndfile/tests/benchmark-1.0.18pre16-mingus new file mode 100644 index 000000000..fa0584e14 --- /dev/null +++ b/lib-src/libsndfile/tests/benchmark-1.0.18pre16-mingus @@ -0,0 +1,38 @@ +Benchmarking libsndfile-1.0.18pre15 +----------------------------------- +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 178237074 samples per sec + Raw read PCM_16 : 368885269 samples per sec + +Native endian I/O : + Write short to PCM_16 : 98.84% of raw write + Read short from PCM_16 : 147.10% of raw read + Write int to PCM_24 : 33.74% of raw write + Read int from PCM_24 : 30.82% of raw read + Write int to PCM_32 : 48.34% of raw write + Read int from PCM_32 : 62.43% of raw read + Write float to PCM_16 : 41.86% of raw write + Read float from PCM_16 : 36.73% of raw read + Write float to PCM_24 : 28.38% of raw write + Read float from PCM_24 : 19.50% of raw read + Write float to PCM_32 : 23.68% of raw write + Read float from PCM_32 : 28.76% of raw read + Write float to FLOAT : 47.21% of raw write + Read float from FLOAT : 60.85% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 54.94% of raw write + Read short from PCM_16 : 59.03% of raw read + Write int to PCM_24 : 33.40% of raw write + Read int from PCM_24 : 31.98% of raw read + Write int to PCM_32 : 30.89% of raw write + Read int from PCM_32 : 33.68% of raw read + Write float to PCM_16 : 41.61% of raw write + Read float from PCM_16 : 26.76% of raw read + Write float to PCM_24 : 25.75% of raw write + Read float from PCM_24 : 19.84% of raw read + Write float to PCM_32 : 21.29% of raw write + Read float from PCM_32 : 21.78% of raw read + Write float to FLOAT : 30.82% of raw write + Read float from FLOAT : 35.04% of raw read diff --git a/lib-src/libsndfile/tests/benchmark-1.0.6pre10-coltrane b/lib-src/libsndfile/tests/benchmark-1.0.6pre10-coltrane new file mode 100644 index 000000000..12f71a8a7 --- /dev/null +++ b/lib-src/libsndfile/tests/benchmark-1.0.6pre10-coltrane @@ -0,0 +1,39 @@ +Benchmarking libsndfile-1.0.6pre10 +---------------------------------- +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 28845961 samples per sec + Raw read PCM_16 : 63471874 samples per sec + +Native endian I/O : + Write short to PCM_16 : 86.21% of raw write + Read short from PCM_16 : 82.60% of raw read + Write int to PCM_24 : 34.89% of raw write + Read int from PCM_24 : 37.26% of raw read + Write int to PCM_32 : 43.36% of raw write + Read int from PCM_32 : 41.30% of raw read + Write float to PCM_16 : 43.02% of raw write + Read float from PCM_16 : 43.99% of raw read + Write float to PCM_24 : 32.72% of raw write + Read float from PCM_24 : 28.21% of raw read + Write float to PCM_32 : 25.92% of raw write + Read float from PCM_32 : 30.98% of raw read + Write float to FLOAT : 46.65% of raw write + Read float from FLOAT : 56.66% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 54.53% of raw write + Read short from PCM_16 : 56.32% of raw read + Write int to PCM_24 : 35.28% of raw write + Read int from PCM_24 : 37.33% of raw read + Write int to PCM_32 : 26.21% of raw write + Read int from PCM_32 : 23.51% of raw read + Write float to PCM_16 : 41.39% of raw write + Read float from PCM_16 : 23.56% of raw read + Write float to PCM_24 : 30.86% of raw write + Read float from PCM_24 : 28.27% of raw read + Write float to PCM_32 : 23.83% of raw write + Read float from PCM_32 : 20.54% of raw read + Write float to FLOAT : 27.26% of raw write + Read float from FLOAT : 29.04% of raw read + diff --git a/lib-src/libsndfile/tests/benchmark-1.0.6pre10-miles b/lib-src/libsndfile/tests/benchmark-1.0.6pre10-miles new file mode 100644 index 000000000..fffdb8463 --- /dev/null +++ b/lib-src/libsndfile/tests/benchmark-1.0.6pre10-miles @@ -0,0 +1,39 @@ +Benchmarking libsndfile-1.0.6pre10 +---------------------------------- +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 40092612 samples per sec + Raw read PCM_16 : 42382563 samples per sec + +Native endian I/O : + Write short to PCM_16 : 61.90% of raw write + Read short from PCM_16 : 100.20% of raw read + Write int to PCM_24 : 28.69% of raw write + Read int from PCM_24 : 33.62% of raw read + Write int to PCM_32 : 31.14% of raw write + Read int from PCM_32 : 51.04% of raw read + Write float to PCM_16 : 25.57% of raw write + Read float from PCM_16 : 28.17% of raw read + Write float to PCM_24 : 23.59% of raw write + Read float from PCM_24 : 24.14% of raw read + Write float to PCM_32 : 18.00% of raw write + Read float from PCM_32 : 22.59% of raw read + Write float to FLOAT : 31.32% of raw write + Read float from FLOAT : 51.54% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 42.81% of raw write + Read short from PCM_16 : 54.58% of raw read + Write int to PCM_24 : 29.28% of raw write + Read int from PCM_24 : 33.43% of raw read + Write int to PCM_32 : 22.21% of raw write + Read int from PCM_32 : 27.24% of raw read + Write float to PCM_16 : 25.76% of raw write + Read float from PCM_16 : 26.84% of raw read + Write float to PCM_24 : 23.71% of raw write + Read float from PCM_24 : 24.10% of raw read + Write float to PCM_32 : 18.47% of raw write + Read float from PCM_32 : 21.45% of raw read + Write float to FLOAT : 22.46% of raw write + Read float from FLOAT : 29.72% of raw read + diff --git a/lib-src/libsndfile/tests/benchmark-latest-coltrane b/lib-src/libsndfile/tests/benchmark-latest-coltrane new file mode 100644 index 000000000..97ce29a8a --- /dev/null +++ b/lib-src/libsndfile/tests/benchmark-latest-coltrane @@ -0,0 +1,75 @@ +erikd@coltrane > cat tests/benchmark-0.0.28 +Benchmarking libsndfile-0.0.28 +------------------------------ +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 31022959 samples per sec + Raw read PCM_16 : 63471874 samples per sec + +Native endian I/O : + Write short to PCM_16 : 83.19% of raw write + Read short from PCM_16 : 82.28% of raw read + Write int to PCM_24 : 30.81% of raw write + Read int from PCM_24 : 32.92% of raw read + Write float to PCM_16 : 17.70% of raw write + Read float from PCM_16 : 43.64% of raw read + Write float to PCM_24 : 15.09% of raw write + Read float from PCM_24 : 27.79% of raw read + Write float to PCM_32 : 14.32% of raw write + Read float from PCM_32 : 34.42% of raw read + Write float to FLOAT : 28.64% of raw write + Read float from FLOAT : 56.77% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 44.04% of raw write + Read short from PCM_16 : 49.46% of raw read + Write int to PCM_24 : 28.92% of raw write + Read int from PCM_24 : 33.10% of raw read + Write float to PCM_16 : 17.30% of raw write + Read float from PCM_16 : 31.46% of raw read + Write float to PCM_24 : 14.62% of raw write + Read float from PCM_24 : 27.64% of raw read + Write float to PCM_32 : 13.65% of raw write + Read float from PCM_32 : 22.41% of raw read + Write float to FLOAT : 19.13% of raw write + Read float from FLOAT : 26.21% of raw read + +erikd@coltrane > tests/benchmark +Benchmarking libsndfile-1.0.0 +----------------------------- +Each test takes a little over 5 seconds. + + Raw write PCM_16 : 29884416 samples per sec + Raw read PCM_16 : 63347175 samples per sec + +Native endian I/O : + Write short to PCM_16 : 88.24% of raw write + Read short from PCM_16 : 82.76% of raw read + Write int to PCM_24 : 34.95% of raw write + Read int from PCM_24 : 37.17% of raw read + Write int to PCM_32 : 43.86% of raw write + Read int from PCM_32 : 41.22% of raw read + Write float to PCM_16 : 42.07% of raw write + Read float from PCM_16 : 44.25% of raw read + Write float to PCM_24 : 32.43% of raw write + Read float from PCM_24 : 28.93% of raw read + Write float to PCM_32 : 25.60% of raw write + Read float from PCM_32 : 31.10% of raw read + Write float to FLOAT : 45.55% of raw write + Read float from FLOAT : 57.41% of raw read + +Endian swapped I/O : + Write short to PCM_16 : 43.46% of raw write + Read short from PCM_16 : 43.99% of raw read + Write int to PCM_24 : 35.09% of raw write + Read int from PCM_24 : 37.34% of raw read + Write int to PCM_32 : 24.05% of raw write + Read int from PCM_32 : 19.74% of raw read + Write float to PCM_16 : 40.25% of raw write + Read float from PCM_16 : 32.15% of raw read + Write float to PCM_24 : 31.02% of raw write + Read float from PCM_24 : 28.82% of raw read + Write float to PCM_32 : 23.54% of raw write + Read float from PCM_32 : 23.65% of raw read + Write float to FLOAT : 24.87% of raw write + Read float from FLOAT : 20.28% of raw read diff --git a/lib-src/libsndfile/tests/benchmark.c b/lib-src/libsndfile/tests/benchmark.c deleted file mode 100644 index f33bfee43..000000000 --- a/lib-src/libsndfile/tests/benchmark.c +++ /dev/null @@ -1,545 +0,0 @@ -/* -** Copyright (C) 2002-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#if (HAVE_DECL_S_IRGRP == 0) -#include -#endif - -#include -#include -#include -#include -#include - -#include - -#ifndef M_PI -#define M_PI 3.14159265358979323846264338 -#endif - -/* -** Neat solution to the Win32/OS2 binary file flage requirement. -** If O_BINARY isn't already defined by the inclusion of the system -** headers, set it to zero. -*/ -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -#define WRITE_FLAGS (O_WRONLY | O_CREAT | O_TRUNC | O_BINARY) -#define READ_FLAGS (O_RDONLY | O_BINARY) - -#if (defined (WIN32) || defined (_WIN32) || defined (__OS2__)) - #define WRITE_PERMS 0777 -#else - #define WRITE_PERMS (S_IRUSR | S_IWUSR | S_IRGRP) -#endif - -#define BUFFER_SIZE (1<<18) -#define BLOCK_COUNT (30) -#define TEST_DURATION (5) /* 5 Seconds. */ - -typedef struct -{ double write_rate ; - double read_rate ; -} PERF_STATS ; - -static void *data = NULL ; - -static void calc_raw_performance (PERF_STATS *stats) ; - -static void calc_short_performance (int format, double read_rate, double write_rate) ; -static void calc_int_performance (int format, double read_rate, double write_rate) ; -static void calc_float_performance (int format, double read_rate, double write_rate) ; - - -static int cpu_is_big_endian (void) ; - -static const char* get_subtype_str (int subtype) ; - -int -main (int argc, char *argv []) -{ PERF_STATS stats ; - char buffer [256] = "Benchmarking " ; - int format_major ; - - if (! (data = malloc (BUFFER_SIZE * sizeof (double)))) - { perror ("Error : malloc failed") ; - exit (1) ; - } ; - - sf_command (NULL, SFC_GET_LIB_VERSION, buffer + strlen (buffer), sizeof (buffer) - strlen (buffer)) ; - - puts (buffer) ; - memset (buffer, '-', strlen (buffer)) ; - puts (buffer) ; - printf ("Each test takes a little over %d seconds.\n\n", TEST_DURATION) ; - - calc_raw_performance (&stats) ; - - if (argc < 2 || strcmp ("--native-only", argv [1]) == 0) - { puts ("\nNative endian I/O :") ; - format_major = cpu_is_big_endian () ? SF_FORMAT_AIFF : SF_FORMAT_WAV ; - - calc_short_performance (format_major | SF_FORMAT_PCM_16, stats.read_rate, stats.write_rate) ; - calc_int_performance (format_major | SF_FORMAT_PCM_24, stats.read_rate, stats.write_rate) ; - calc_int_performance (format_major | SF_FORMAT_PCM_32, stats.read_rate, stats.write_rate) ; - calc_float_performance (format_major | SF_FORMAT_PCM_16, stats.read_rate, stats.write_rate) ; - calc_float_performance (format_major | SF_FORMAT_PCM_24, stats.read_rate, stats.write_rate) ; - calc_float_performance (format_major | SF_FORMAT_PCM_32, stats.read_rate, stats.write_rate) ; - calc_float_performance (format_major | SF_FORMAT_FLOAT , stats.read_rate, stats.write_rate) ; - } ; - - if (argc < 2 || strcmp ("--swap-only", argv [1]) == 0) - { puts ("\nEndian swapped I/O :") ; - format_major = cpu_is_big_endian () ? SF_FORMAT_WAV : SF_FORMAT_AIFF ; - - calc_short_performance (format_major | SF_FORMAT_PCM_16, stats.read_rate, stats.write_rate) ; - calc_int_performance (format_major | SF_FORMAT_PCM_24, stats.read_rate, stats.write_rate) ; - calc_int_performance (format_major | SF_FORMAT_PCM_32, stats.read_rate, stats.write_rate) ; - calc_float_performance (format_major | SF_FORMAT_PCM_16, stats.read_rate, stats.write_rate) ; - calc_float_performance (format_major | SF_FORMAT_PCM_24, stats.read_rate, stats.write_rate) ; - calc_float_performance (format_major | SF_FORMAT_PCM_32, stats.read_rate, stats.write_rate) ; - calc_float_performance (format_major | SF_FORMAT_FLOAT , stats.read_rate, stats.write_rate) ; - } ; - - puts ("") ; - - free (data) ; - - return 0 ; -} /* main */ - -/*============================================================================== -*/ - -static void -calc_raw_performance (PERF_STATS *stats) -{ clock_t start_clock, clock_time ; - int fd, k, byte_count, retval, op_count ; - const char *filename ; - - filename = "benchmark.dat" ; - - byte_count = BUFFER_SIZE * sizeof (short) ; - - /* Collect write stats */ - printf (" Raw write PCM_16 : ") ; - fflush (stdout) ; - - clock_time = 0 ; - op_count = 0 ; - start_clock = clock () ; - - while (clock_time < (CLOCKS_PER_SEC * TEST_DURATION)) - { if ((fd = open (filename, WRITE_FLAGS, WRITE_PERMS)) < 0) - { printf ("Error : not able to open file : %s\n", filename) ; - perror ("") ; - exit (1) ; - } ; - - for (k = 0 ; k < BLOCK_COUNT ; k++) - { if ((retval = write (fd, data, byte_count)) != byte_count) - { printf ("Error : write returned %d (should have been %d)\n", retval, byte_count) ; - exit (1) ; - } ; - } ; - - close (fd) ; - - clock_time = clock () - start_clock ; - op_count ++ ; - } ; - - stats->write_rate = (1.0 * BUFFER_SIZE) * BLOCK_COUNT * op_count ; - stats->write_rate *= (1.0 * CLOCKS_PER_SEC) / clock_time ; - printf ("%10.0f samples per sec\n", stats->write_rate) ; - - /* Collect read stats */ - printf (" Raw read PCM_16 : ") ; - fflush (stdout) ; - - clock_time = 0 ; - op_count = 0 ; - start_clock = clock () ; - - while (clock_time < (CLOCKS_PER_SEC * TEST_DURATION)) - { if ((fd = open (filename, READ_FLAGS)) < 0) - { printf ("Error : not able to open file : %s\n", filename) ; - perror ("") ; - exit (1) ; - } ; - - for (k = 0 ; k < BLOCK_COUNT ; k++) - { if ((retval = read (fd, data, byte_count)) != byte_count) - { printf ("Error : write returned %d (should have been %d)\n", retval, byte_count) ; - exit (1) ; - } ; - } ; - - close (fd) ; - - clock_time = clock () - start_clock ; - op_count ++ ; - } ; - - stats->read_rate = (1.0 * BUFFER_SIZE) * BLOCK_COUNT * op_count ; - stats->read_rate *= (1.0 * CLOCKS_PER_SEC) / clock_time ; - printf ("%10.0f samples per sec\n", stats->read_rate) ; - - unlink (filename) ; -} /* calc_raw_performance */ - -/*------------------------------------------------------------------------------ -*/ - -static void -calc_short_performance (int format, double read_rate, double write_rate) -{ SNDFILE *file ; - SF_INFO sfinfo ; - clock_t start_clock, clock_time ; - double performance ; - int k, item_count, retval, op_count ; - const char* subtype ; - short *short_data ; - const char *filename ; - - filename = "benchmark.dat" ; - subtype = get_subtype_str (format & SF_FORMAT_SUBMASK) ; - - short_data = data ; - item_count = BUFFER_SIZE ; - for (k = 0 ; k < item_count ; k++) - short_data [k] = 32700.0 * sin (2 * M_PI * k / 32000.0) ; - - /* Collect write stats */ - printf (" Write %-5s to %s : ", "short", subtype) ; - fflush (stdout) ; - - sfinfo.channels = 1 ; - sfinfo.format = format ; - sfinfo.frames = 1 ; - sfinfo.samplerate = 32000 ; - - clock_time = 0 ; - op_count = 0 ; - start_clock = clock () ; - - while (clock_time < (CLOCKS_PER_SEC * TEST_DURATION)) - { if (! (file = sf_open (filename, SFM_WRITE, &sfinfo))) - { printf ("Error : not able to open file : %s\n", filename) ; - perror ("") ; - exit (1) ; - } ; - - /* Turn off the addition of a PEAK chunk. */ - sf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_FALSE) ; - - for (k = 0 ; k < BLOCK_COUNT ; k++) - { if ((retval = sf_write_short (file, short_data, item_count)) != item_count) - { printf ("Error : sf_write_short returned %d (should have been %d)\n", retval, item_count) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - clock_time = clock () - start_clock ; - op_count ++ ; - } ; - - performance = (1.0 * BUFFER_SIZE) * BLOCK_COUNT * op_count ; - performance *= (1.0 * CLOCKS_PER_SEC) / clock_time ; - printf ("%6.2f%% of raw write\n", 100.0 * performance / write_rate) ; - - /* Collect read stats */ - printf (" Read %-5s from %s : ", "short", subtype) ; - fflush (stdout) ; - - clock_time = 0 ; - op_count = 0 ; - start_clock = clock () ; - - while (clock_time < (CLOCKS_PER_SEC * TEST_DURATION)) - { if (! (file = sf_open (filename, SFM_READ, &sfinfo))) - { printf ("Error : not able to open file : %s\n", filename) ; - perror ("") ; - exit (1) ; - } ; - - for (k = 0 ; k < BLOCK_COUNT ; k++) - { if ((retval = sf_read_short (file, short_data, item_count)) != item_count) - { printf ("Error : write returned %d (should have been %d)\n", retval, item_count) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - clock_time = clock () - start_clock ; - op_count ++ ; - } ; - - performance = (1.0 * item_count) * BLOCK_COUNT * op_count ; - performance *= (1.0 * CLOCKS_PER_SEC) / clock_time ; - printf ("%6.2f%% of raw read\n", 100.0 * performance / read_rate) ; - - unlink (filename) ; - -} /* calc_short_performance */ -static void -calc_int_performance (int format, double read_rate, double write_rate) -{ SNDFILE *file ; - SF_INFO sfinfo ; - clock_t start_clock, clock_time ; - double performance ; - int k, item_count, retval, op_count ; - const char* subtype ; - int *int_data ; - const char *filename ; - - filename = "benchmark.dat" ; - subtype = get_subtype_str (format & SF_FORMAT_SUBMASK) ; - - int_data = data ; - item_count = BUFFER_SIZE ; - for (k = 0 ; k < item_count ; k++) - int_data [k] = 32700.0 * (1<<16) * sin (2 * M_PI * k / 32000.0) ; - - /* Collect write stats */ - printf (" Write %-5s to %s : ", "int", subtype) ; - fflush (stdout) ; - - sfinfo.channels = 1 ; - sfinfo.format = format ; - sfinfo.frames = 1 ; - sfinfo.samplerate = 32000 ; - - clock_time = 0 ; - op_count = 0 ; - start_clock = clock () ; - - while (clock_time < (CLOCKS_PER_SEC * TEST_DURATION)) - { if (! (file = sf_open (filename, SFM_WRITE, &sfinfo))) - { printf ("Error : not able to open file : %s\n", filename) ; - perror ("") ; - exit (1) ; - } ; - - /* Turn off the addition of a PEAK chunk. */ - sf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_FALSE) ; - - for (k = 0 ; k < BLOCK_COUNT ; k++) - { if ((retval = sf_write_int (file, int_data, item_count)) != item_count) - { printf ("Error : sf_write_short returned %d (should have been %d)\n", retval, item_count) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - clock_time = clock () - start_clock ; - op_count ++ ; - } ; - - performance = (1.0 * BUFFER_SIZE) * BLOCK_COUNT * op_count ; - performance *= (1.0 * CLOCKS_PER_SEC) / clock_time ; - printf ("%6.2f%% of raw write\n", 100.0 * performance / write_rate) ; - - /* Collect read stats */ - printf (" Read %-5s from %s : ", "int", subtype) ; - fflush (stdout) ; - - clock_time = 0 ; - op_count = 0 ; - start_clock = clock () ; - - while (clock_time < (CLOCKS_PER_SEC * TEST_DURATION)) - { if (! (file = sf_open (filename, SFM_READ, &sfinfo))) - { printf ("Error : not able to open file : %s\n", filename) ; - perror ("") ; - exit (1) ; - } ; - - for (k = 0 ; k < BLOCK_COUNT ; k++) - { if ((retval = sf_read_int (file, int_data, item_count)) != item_count) - { printf ("Error : write returned %d (should have been %d)\n", retval, item_count) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - clock_time = clock () - start_clock ; - op_count ++ ; - } ; - - performance = (1.0 * item_count) * BLOCK_COUNT * op_count ; - performance *= (1.0 * CLOCKS_PER_SEC) / clock_time ; - printf ("%6.2f%% of raw read\n", 100.0 * performance / read_rate) ; - - unlink (filename) ; - -} /* calc_int_performance */ -static void -calc_float_performance (int format, double read_rate, double write_rate) -{ SNDFILE *file ; - SF_INFO sfinfo ; - clock_t start_clock, clock_time ; - double performance ; - int k, item_count, retval, op_count ; - const char* subtype ; - float *float_data ; - const char *filename ; - - filename = "benchmark.dat" ; - subtype = get_subtype_str (format & SF_FORMAT_SUBMASK) ; - - float_data = data ; - item_count = BUFFER_SIZE ; - for (k = 0 ; k < item_count ; k++) - float_data [k] = 1.0 * sin (2 * M_PI * k / 32000.0) ; - - /* Collect write stats */ - printf (" Write %-5s to %s : ", "float", subtype) ; - fflush (stdout) ; - - sfinfo.channels = 1 ; - sfinfo.format = format ; - sfinfo.frames = 1 ; - sfinfo.samplerate = 32000 ; - - clock_time = 0 ; - op_count = 0 ; - start_clock = clock () ; - - while (clock_time < (CLOCKS_PER_SEC * TEST_DURATION)) - { if (! (file = sf_open (filename, SFM_WRITE, &sfinfo))) - { printf ("Error : not able to open file : %s\n", filename) ; - perror ("") ; - exit (1) ; - } ; - - /* Turn off the addition of a PEAK chunk. */ - sf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_FALSE) ; - - for (k = 0 ; k < BLOCK_COUNT ; k++) - { if ((retval = sf_write_float (file, float_data, item_count)) != item_count) - { printf ("Error : sf_write_short returned %d (should have been %d)\n", retval, item_count) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - clock_time = clock () - start_clock ; - op_count ++ ; - } ; - - performance = (1.0 * BUFFER_SIZE) * BLOCK_COUNT * op_count ; - performance *= (1.0 * CLOCKS_PER_SEC) / clock_time ; - printf ("%6.2f%% of raw write\n", 100.0 * performance / write_rate) ; - - /* Collect read stats */ - printf (" Read %-5s from %s : ", "float", subtype) ; - fflush (stdout) ; - - clock_time = 0 ; - op_count = 0 ; - start_clock = clock () ; - - while (clock_time < (CLOCKS_PER_SEC * TEST_DURATION)) - { if (! (file = sf_open (filename, SFM_READ, &sfinfo))) - { printf ("Error : not able to open file : %s\n", filename) ; - perror ("") ; - exit (1) ; - } ; - - for (k = 0 ; k < BLOCK_COUNT ; k++) - { if ((retval = sf_read_float (file, float_data, item_count)) != item_count) - { printf ("Error : write returned %d (should have been %d)\n", retval, item_count) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - clock_time = clock () - start_clock ; - op_count ++ ; - } ; - - performance = (1.0 * item_count) * BLOCK_COUNT * op_count ; - performance *= (1.0 * CLOCKS_PER_SEC) / clock_time ; - printf ("%6.2f%% of raw read\n", 100.0 * performance / read_rate) ; - - unlink (filename) ; - -} /* calc_float_performance */ - - -/*============================================================================== -*/ - -static int -cpu_is_big_endian (void) -{ unsigned char *cptr ; - int endtest ; - - endtest = 0x12345678 ; - - cptr = (unsigned char*) (&endtest) ; - - if (cptr [0] == 0x12 && cptr [1] == 0x34 && cptr [3] == 0x78) - return SF_TRUE ; - - return SF_FALSE ; -} /* cpu_is_big_endian */ - -static const char* -get_subtype_str (int subtype) -{ switch (subtype) - { case SF_FORMAT_PCM_16 : - return "PCM_16" ; - - case SF_FORMAT_PCM_24 : - return "PCM_24" ; - - case SF_FORMAT_PCM_32 : - return "PCM_32" ; - - case SF_FORMAT_FLOAT : - return "FLOAT " ; - - case SF_FORMAT_DOUBLE : - return "DOUBLE" ; - - default : break ; - } ; - - return "UNKNOWN" ; -} /* get_subtype_str */ - diff --git a/lib-src/libsndfile/tests/benchmark.def b/lib-src/libsndfile/tests/benchmark.def index f2db29ae2..382bf3b1a 100644 --- a/lib-src/libsndfile/tests/benchmark.def +++ b/lib-src/libsndfile/tests/benchmark.def @@ -1,16 +1,16 @@ autogen definitions benchmark.tpl; -data_type = { +data_type = { type_name = short ; multiplier = "32700.0" ; }; -data_type = { +data_type = { type_name = int ; - multiplier = "32700.0 * (1<<16)" ; + multiplier = "32700.0 * (1 << 16)" ; }; -data_type = { +data_type = { type_name = float ; multiplier = "1.0" ; }; diff --git a/lib-src/libsndfile/tests/benchmark.tpl b/lib-src/libsndfile/tests/benchmark.tpl index 2a3c79054..14b22e2e2 100644 --- a/lib-src/libsndfile/tests/benchmark.tpl +++ b/lib-src/libsndfile/tests/benchmark.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2012 Erik de Castro Lopo ** ** 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 @@ -60,7 +60,7 @@ #define WRITE_PERMS (S_IRUSR | S_IWUSR | S_IRGRP) #endif -#define BUFFER_SIZE (1<<18) +#define BUFFER_SIZE (1 << 18) #define BLOCK_COUNT (30) #define TEST_DURATION (5) /* 5 Seconds. */ diff --git a/lib-src/libsndfile/tests/channel_test.c b/lib-src/libsndfile/tests/channel_test.c new file mode 100644 index 000000000..a69cd32db --- /dev/null +++ b/lib-src/libsndfile/tests/channel_test.c @@ -0,0 +1,138 @@ +/* +** Copyright (C) 2001-2015 Erik de Castro Lopo +** +** 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-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include +#include +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include + +#include + +#include "utils.h" + +#define BUFFER_LEN (1 << 10) +#define LOG_BUFFER_SIZE 1024 + +static void channel_test (void) ; +static double max_diff (const float *a, const float *b, unsigned int len, unsigned int * position) ; + +int +main (void) // int argc, char *argv []) +{ channel_test () ; + return 0 ; +} /* main */ + +/*============================================================================================ +** Here are the test functions. +*/ + +static void +channel_test (void) +{ static float float_data [1024] ; + static float read_float [1024] ; + static int read_int [1024] ; + static short read_short [1024] ; + unsigned int ch, k, position = 0 ; + + gen_windowed_sine_float (float_data, ARRAY_LEN (float_data), 0.9) ; + + for (ch = 1 ; ch <= 8 ; ch++) + { SNDFILE *file ; + SF_INFO wsfinfo, rsfinfo ; + sf_count_t wframes = ARRAY_LEN (float_data) / ch ; + double maxdiff ; + char filename [256] ; + + snprintf (filename, sizeof (filename), "chan_%d.wav", ch) ; + print_test_name (__func__, filename) ; + + sf_info_setup (&wsfinfo, SF_FORMAT_WAV | SF_FORMAT_FLOAT, 48000, ch) ; + sf_info_clear (&rsfinfo) ; + + /* Write the test file. */ + file = test_open_file_or_die (filename, SFM_WRITE, &wsfinfo, SF_FALSE, __LINE__) ; + test_writef_float_or_die (file, 0, float_data, wframes, __LINE__) ; + sf_close (file) ; + + /* Read it as float and test. */ + file = test_open_file_or_die (filename, SFM_READ, &rsfinfo, SF_FALSE, __LINE__) ; + exit_if_true (rsfinfo.frames == 0, + "\n\nLine %d : Frames in file %" PRId64 ".\n\n", __LINE__, rsfinfo.frames) ; + exit_if_true (wframes != rsfinfo.frames, + "\n\nLine %d : Wrote %" PRId64 ", read %" PRId64 " frames.\n\n", __LINE__, wframes, rsfinfo.frames) ; + + sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; + + test_readf_float_or_die (file, 0, read_float, rsfinfo.frames, __LINE__) ; + compare_float_or_die (float_data, read_float, ch * rsfinfo.frames, __LINE__) ; + + /* Read it as short and test. */ + test_seek_or_die (file, 0, SEEK_SET, 0, ch, __LINE__) ; + test_readf_short_or_die (file, 0, read_short, rsfinfo.frames, __LINE__) ; + + for (k = 0 ; k < ARRAY_LEN (read_float) ; k++) + read_float [k] = read_short [k] * (0.9 / 0x8000) ; + + maxdiff = max_diff (float_data, read_float, ch * rsfinfo.frames, &position) ; + exit_if_true (maxdiff > 0.5, "\n\nLine %d : Max diff is %f at index %u\n\n", __LINE__, maxdiff, position) ; + + /* Read it as int and test. */ + test_seek_or_die (file, 0, SEEK_SET, 0, ch, __LINE__) ; + test_readf_int_or_die (file, 0, read_int, rsfinfo.frames, __LINE__) ; + + for (k = 0 ; k < ARRAY_LEN (read_float) ; k++) + read_float [k] = read_int [k] * (0.9 / 0x80000000) ; + + maxdiff = max_diff (float_data, read_float, ch * rsfinfo.frames, &position) ; + exit_if_true (maxdiff > 0.5, "\n\nLine %d : Max diff is %f at index %u\n\n", __LINE__, maxdiff, position) ; + + sf_close (file) ; + unlink (filename) ; + printf ("ok\n") ; + } ; + + return ; +} /* channel_test */ + +static double +max_diff (const float *a, const float *b, unsigned int len, unsigned int * position) +{ double mdiff = 0.0, diff ; + unsigned int k ; + + for (k = 0 ; k < len ; k++) + { diff = fabs (a [k] - b [k]) ; + if (diff > mdiff) + { mdiff = diff ; + *position = k ; + } ; + } ; + + return mdiff ; +} /* max_diff */ diff --git a/lib-src/libsndfile/tests/checksum_test.c b/lib-src/libsndfile/tests/checksum_test.c index 544da9340..4b37b3d37 100644 --- a/lib-src/libsndfile/tests/checksum_test.c +++ b/lib-src/libsndfile/tests/checksum_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2017 Erik de Castro Lopo ** ** 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 @@ -44,19 +44,19 @@ checksum_orig [] = { { SF_FORMAT_RAW | SF_FORMAT_ULAW, "checksum.ulaw", "cksum_ulaw.pcm16", - 0x33aefae029e0c888LL, 0x595cd6e47edd0cffLL + 0xbd99d34ccbe2fLL, 0xda82168ed82e9LL }, { SF_FORMAT_RAW | SF_FORMAT_ALAW, "checksum.alaw", "cksum_alaw.pcm16", - 0x48c798da3572d468LL, 0x6837d74869af5bb6LL + 0x0004afddc0fcf4bdLL, 0x2e7320230b88LL }, { SF_FORMAT_RAW | SF_FORMAT_GSM610, "checksum.gsm", "cksum_gsm.pcm16", - 0x1b1f64ff2acf858fLL, 0x504179dbadd4bce6LL + 0xa06a3faaaf684LL, 0x2d7ff668efeb9LL }, { SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM, "checksum.vox", "cksum_vox.pcm16", - 0xf1147fb3a298f4dfLL, 0xfc9c0cb8b12cb0abLL + 0x7c9d7afdb96a1LL, 0xe540df74a4b14LL }, } ; @@ -87,6 +87,7 @@ checksum_test (const CHECKSUM * cksum) print_test_name (__func__, cksum->enc_name) ; + memset (&info, 0, sizeof (info)) ; info.format = cksum->enc_fmt ; info.channels = 1 ; info.samplerate = SAMPLE_RATE ; diff --git a/lib-src/libsndfile/tests/chunk_test.c b/lib-src/libsndfile/tests/chunk_test.c new file mode 100644 index 000000000..ed3406434 --- /dev/null +++ b/lib-src/libsndfile/tests/chunk_test.c @@ -0,0 +1,446 @@ +/* +** Copyright (C) 2003-2016 Erik de Castro Lopo +** +** 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-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include + +#include "sfendian.h" +#include "utils.h" + +#define BUFFER_LEN (1 << 10) +#define LOG_BUFFER_SIZE 1024 + +static void chunk_test (const char *filename, int format) ; +static void wav_subchunk_test (size_t chunk_size) ; +static void large_free_test (const char *filename, int format, size_t chunk_size) ; + +int +main (int argc, char *argv []) +{ int do_all = 0 ; + int test_count = 0, k ; + + if (argc != 2) + { printf ("Usage : %s \n", argv [0]) ; + printf (" Where is one of the following:\n") ; + printf (" wav - test adding chunks to WAV files\n") ; + printf (" aiff - test adding chunks to AIFF files\n") ; + printf (" caf - test adding chunks to CAF files\n") ; + printf (" rf64 - test adding chunks to RF64 files\n") ; + printf (" all - perform all tests\n") ; + exit (1) ; + } ; + + do_all = ! strcmp (argv [1], "all") ; + + if (do_all || ! strcmp (argv [1], "wav")) + { chunk_test ("chunks_pcm16.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ; + chunk_test ("chunks_pcm16.rifx", SF_ENDIAN_BIG | SF_FORMAT_WAV | SF_FORMAT_PCM_16) ; + chunk_test ("chunks_pcm16.wavex", SF_FORMAT_WAVEX | SF_FORMAT_PCM_16) ; + + for (k = 100 ; k < 10000 ; k *= 4) + wav_subchunk_test (k) ; + + test_count++ ; + } ; + + if (do_all || ! strcmp (argv [1], "aiff")) + { chunk_test ("chunks_pcm16.aiff", SF_FORMAT_AIFF | SF_FORMAT_PCM_16) ; + test_count++ ; + } ; + + if (do_all || ! strcmp (argv [1], "caf")) + { chunk_test ("chunks_pcm16.caf", SF_FORMAT_CAF | SF_FORMAT_PCM_16) ; + chunk_test ("chunks_alac.caf", SF_FORMAT_CAF | SF_FORMAT_ALAC_16) ; + large_free_test ("large_free.caf", SF_FORMAT_CAF | SF_FORMAT_PCM_16, 100) ; + large_free_test ("large_free.caf", SF_FORMAT_CAF | SF_FORMAT_PCM_16, 20000) ; + test_count++ ; + } ; + + if (do_all || ! strcmp (argv [1], "rf64")) + { chunk_test ("chunks_pcm16.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ; + test_count++ ; + } ; + + if (test_count == 0) + { printf ("Mono : ************************************\n") ; + printf ("Mono : * No '%s' test defined.\n", argv [1]) ; + printf ("Mono : ************************************\n") ; + return 1 ; + } ; + + return 0 ; +} /* main */ + + +/*============================================================================================ +** Here are the test functions. +*/ + +static void +chunk_test_helper (const char *filename, int format, const char * testdata) +{ SNDFILE *file ; + SF_INFO sfinfo ; + SF_CHUNK_INFO chunk_info ; + SF_CHUNK_ITERATOR * iterator ; + uint32_t length_before ; + int err, allow_fd ; + + switch (format & SF_FORMAT_SUBMASK) + { case SF_FORMAT_ALAC_16 : + allow_fd = SF_FALSE ; + break ; + default : + allow_fd = SF_TRUE ; + break ; + } ; + + sfinfo.samplerate = 44100 ; + sfinfo.channels = 1 ; + sfinfo.frames = 0 ; + sfinfo.format = format ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; + + /* Set up the chunk to write. */ + memset (&chunk_info, 0, sizeof (chunk_info)) ; + snprintf (chunk_info.id, sizeof (chunk_info.id), "Test") ; + chunk_info.id_size = 4 ; + chunk_info.data = strdup (testdata) ; + chunk_info.datalen = strlen (chunk_info.data) ; + + length_before = chunk_info.datalen ; + + err = sf_set_chunk (file, &chunk_info) ; + exit_if_true ( + err != SF_ERR_NO_ERROR, + "\n\nLine %d : sf_set_chunk returned for testdata '%s' : %s\n\n", __LINE__, testdata, sf_error_number (err) + ) ; + + memset (chunk_info.data, 0, chunk_info.datalen) ; + free (chunk_info.data) ; + + sf_close (file) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; + + memset (&chunk_info, 0, sizeof (chunk_info)) ; + snprintf (chunk_info.id, sizeof (chunk_info.id), "Test") ; + chunk_info.id_size = 4 ; + + iterator = sf_get_chunk_iterator (file, &chunk_info) ; + err = sf_get_chunk_size (iterator, &chunk_info) ; + exit_if_true ( + err != SF_ERR_NO_ERROR, + "\n\nLine %d : sf_get_chunk_size returned for testdata '%s' : %s\n\n", __LINE__, testdata, sf_error_number (err) + ) ; + + exit_if_true ( + length_before > chunk_info.datalen || chunk_info.datalen - length_before > 4, + "\n\nLine %d : testdata '%s' : Bad chunk length %u (previous length %u)\n\n", __LINE__, testdata, chunk_info.datalen, length_before + ) ; + + chunk_info.data = malloc (chunk_info.datalen) ; + err = sf_get_chunk_data (iterator, &chunk_info) ; + exit_if_true ( + err != SF_ERR_NO_ERROR, + "\n\nLine %d : sf_get_chunk_size returned for testdata '%s' : %s\n\n", __LINE__, testdata, sf_error_number (err) + ) ; + + exit_if_true ( + memcmp (testdata, chunk_info.data, length_before), + "\n\nLine %d : Data compare failed.\n %s\n %s\n\n", __LINE__, testdata, (char*) chunk_info.data + ) ; + + free (chunk_info.data) ; + + sf_close (file) ; + unlink (filename) ; +} /* chunk_test_helper */ + +static void +multichunk_test_helper (const char *filename, int format, const char * testdata [], size_t testdata_len) +{ SNDFILE *file ; + SF_INFO sfinfo ; + SF_CHUNK_INFO chunk_info ; + SF_CHUNK_ITERATOR * iterator ; + uint32_t length_before [16] ; + int err, allow_fd ; + size_t i ; + + + exit_if_true ( + ARRAY_LEN (length_before) < testdata_len, + "\n\nLine %d : Bad array length.\n\n", __LINE__ + ) ; + + + sfinfo.samplerate = 44100 ; + sfinfo.channels = 1 ; + sfinfo.frames = 0 ; + sfinfo.format = format ; + + switch (format & SF_FORMAT_SUBMASK) + { case SF_FORMAT_ALAC_16 : + allow_fd = SF_FALSE ; + break ; + default : + allow_fd = SF_TRUE ; + break ; + } ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; + + /* Set up the chunk to write. */ + for (i = 0 ; i < testdata_len ; i++) + { memset (&chunk_info, 0, sizeof (chunk_info)) ; + snprintf (chunk_info.id, sizeof (chunk_info.id), "Test") ; + chunk_info.id_size = 4 ; + + chunk_info.data = strdup (testdata [i]) ; + chunk_info.datalen = strlen (chunk_info.data) ; + + length_before [i] = chunk_info.datalen ; + + err = sf_set_chunk (file, &chunk_info) ; + exit_if_true ( + err != SF_ERR_NO_ERROR, + "\n\nLine %d : sf_set_chunk returned for testdata[%d] '%s' : %s\n\n", __LINE__, (int) i, testdata [i], sf_error_number (err) + ) ; + + memset (chunk_info.data, 0, chunk_info.datalen) ; + free (chunk_info.data) ; + } + + sf_close (file) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; + + memset (&chunk_info, 0, sizeof (chunk_info)) ; + snprintf (chunk_info.id, sizeof (chunk_info.id), "Test") ; + chunk_info.id_size = 4 ; + + iterator = sf_get_chunk_iterator (file, &chunk_info) ; + + i = 0 ; + while (iterator) + { memset (&chunk_info, 0, sizeof (chunk_info)) ; + err = sf_get_chunk_size (iterator, &chunk_info) ; + exit_if_true ( + i > testdata_len, + "\n\nLine %d : iterated to chunk #%d, but only %d chunks have been written\n\n", __LINE__, (int) i, (int) testdata_len + ) ; + + exit_if_true ( + err != SF_ERR_NO_ERROR, + "\n\nLine %d : sf_get_chunk_size returned for testdata[%d] '%s' : %s\n\n", __LINE__, (int) i, testdata [i], sf_error_number (err) + ) ; + + exit_if_true ( + length_before [i] > chunk_info.datalen || chunk_info.datalen - length_before [i] > 4, + "\n\nLine %d : testdata[%d] '%s' : Bad chunk length %u (previous length %u)\n\n", __LINE__, (int) i, testdata [i], chunk_info.datalen, length_before [i] + ) ; + + chunk_info.data = malloc (chunk_info.datalen) ; + err = sf_get_chunk_data (iterator, &chunk_info) ; + exit_if_true ( + err != SF_ERR_NO_ERROR, + "\n\nLine %d : sf_get_chunk_size returned for testdata[%d] '%s' : %s\n\n", __LINE__, (int) i, testdata [i], sf_error_number (err) + ) ; + + exit_if_true ( + 4 != chunk_info.id_size, + "\n\nLine %d : testdata[%d] : Bad ID length %u (previous length %u)\n\n", __LINE__, (int) i, chunk_info.id_size, 4 + ) ; + exit_if_true ( + memcmp ("Test", chunk_info.id, 4), + "\n\nLine %d : ID compare failed at %d.\n %s\n %s\n\n", __LINE__, (int) i, "Test", (char*) chunk_info.id + ) ; + + exit_if_true ( + memcmp (testdata [i], chunk_info.data, length_before [i]), + "\n\nLine %d : Data compare failed at %d.\n %s\n %s\n\n", __LINE__, (int) i, testdata [i], (char*) chunk_info.data + ) ; + + free (chunk_info.data) ; + iterator = sf_next_chunk_iterator (iterator) ; + i++ ; + } + + sf_close (file) ; + unlink (filename) ; +} /* multichunk_test_helper */ + + +static void +chunk_test (const char *filename, int format) +{ const char* testdata [] = + { "There can be only one.", "", "A", "AB", "ABC", "ABCD", "ABCDE" } ; + uint32_t k ; + + print_test_name (__func__, filename) ; + + for (k = 0 ; k < ARRAY_LEN (testdata) ; k++) + chunk_test_helper (filename, format, testdata [k]) ; + + multichunk_test_helper (filename, format, testdata, ARRAY_LEN (testdata)) ; + + puts ("ok") ; +} /* chunk_test */ + + +static void +wav_subchunk_test (size_t chunk_size) +{ SNDFILE * file ; + SF_INFO sfinfo ; + SF_CHUNK_INFO chunk_info ; + char filename [256] ; + char chunk_data [10240] ; + short audio [16] ; + int err, value ; + + snprintf (filename, sizeof (filename), "subchunk_%04d.wav", (int) chunk_size) ; + print_test_name (__func__, filename) ; + + exit_if_true (sizeof (chunk_data) < chunk_size, "\n\nLine %d : sizeof (data) < chunk_size\n\n", __LINE__) ; + + memset (chunk_data, 53, sizeof (chunk_data)) ; + chunk_data [chunk_size] = 0 ; + + /* Fill in the chunk data. */ + value = MAKE_MARKER ('a', 'd', 't', 'l') ; + memcpy (chunk_data, &value, sizeof (value)) ; + value = MAKE_MARKER ('n', 'o', 't', 'e') ; + memcpy (chunk_data + 4, &value, sizeof (value)) ; + value = H2LE_32 (chunk_size - 12) ; + memcpy (chunk_data + 8, &value, sizeof (value)) ; + + sfinfo.samplerate = 44100 ; + sfinfo.channels = 1 ; + sfinfo.frames = 0 ; + sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + /* Set up the chunk to write. */ + memset (&chunk_info, 0, sizeof (chunk_info)) ; + snprintf (chunk_info.id, sizeof (chunk_info.id), "LIST") ; + chunk_info.id_size = 4 ; + chunk_info.data = chunk_data ; + chunk_info.datalen = chunk_size ; + + err = sf_set_chunk (file, &chunk_info) ; + exit_if_true ( + err != SF_ERR_NO_ERROR, + "\n\nLine %d : sf_set_chunk returned for testdata : %s\n\n", __LINE__, sf_error_number (err) + ) ; + + memset (chunk_info.data, 0, chunk_info.datalen) ; + + /* Add some audio data. */ + memset (audio, 0, sizeof (audio)) ; + sf_write_short (file, audio, ARRAY_LEN (audio)) ; + + sf_close (file) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true ( + sfinfo.frames != ARRAY_LEN (audio), + "\n\nLine %d : Incorrect sample count (%d should be %d)\n", __LINE__, (int) sfinfo.frames, (int) ARRAY_LEN (audio) + ) ; + + if (chunk_size < 512) + check_log_buffer_or_die (file, __LINE__) ; + + sf_close (file) ; + + unlink (filename) ; + puts ("ok") ; +} /* wav_subchunk_test */ + +static void +large_free_test (const char *filename, int format, size_t chunk_size) +{ SNDFILE * file ; + SF_INFO sfinfo ; + SF_CHUNK_INFO chunk_info ; + char chunk_data [20002] ; + short audio [16] ; + int err ; + + print_test_name (__func__, filename) ; + + exit_if_true (sizeof (chunk_data) <= chunk_size, "\n\nLine %d : sizeof (data) < chunk_size\n\n", __LINE__) ; + + memset (chunk_data, 53, sizeof (chunk_data)) ; + chunk_data [chunk_size] = 0 ; + + sfinfo.samplerate = 44100 ; + sfinfo.channels = 1 ; + sfinfo.frames = 0 ; + sfinfo.format = format ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + /* Set up the chunk to write. */ + memset (&chunk_info, 0, sizeof (chunk_info)) ; + snprintf (chunk_info.id, sizeof (chunk_info.id), "free") ; + chunk_info.id_size = 4 ; + chunk_info.data = chunk_data ; + chunk_info.datalen = chunk_size ; + + err = sf_set_chunk (file, &chunk_info) ; + exit_if_true ( + err != SF_ERR_NO_ERROR, + "\n\nLine %d : sf_set_chunk returned for testdata : %s\n\n", __LINE__, sf_error_number (err) + ) ; + + memset (chunk_info.data, 0, chunk_info.datalen) ; + + /* Add some audio data. */ + memset (audio, 0, sizeof (audio)) ; + sf_write_short (file, audio, ARRAY_LEN (audio)) ; + + sf_close (file) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true ( + sfinfo.frames != ARRAY_LEN (audio), + "\n\nLine %d : Incorrect sample count (%d should be %d)\n", __LINE__, (int) sfinfo.frames, (int) ARRAY_LEN (audio) + ) ; + + if (chunk_size < 512) + check_log_buffer_or_die (file, __LINE__) ; + + sf_close (file) ; + + unlink (filename) ; + puts ("ok") ; +} /* large_free_test */ diff --git a/lib-src/libsndfile/tests/command_test.c b/lib-src/libsndfile/tests/command_test.c index 8fe4d9c75..625d8e565 100644 --- a/lib-src/libsndfile/tests/command_test.c +++ b/lib-src/libsndfile/tests/command_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2019 Erik de Castro Lopo ** ** 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 @@ -20,28 +20,36 @@ #include #include +#include +#include #include #include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include #include +#include "sfendian.h" #include "utils.h" -#define BUFFER_LEN (1<<10) +#define BUFFER_LEN (1 << 10) #define LOG_BUFFER_SIZE 1024 +#define data_MARKER MAKE_MARKER ('d', 'a', 't', 'a') static void float_norm_test (const char *filename) ; static void double_norm_test (const char *filename) ; static void format_tests (void) ; -static void calc_peak_test (int filetype, const char *filename) ; +static void calc_peak_test (int filetype, const char *filename, int channels) ; static void truncate_test (const char *filename, int filetype) ; static void instrument_test (const char *filename, int filetype) ; +static void cue_test (const char *filename, int filetype) ; +static void cue_test_var (const char *filename, int filetype, int count) ; static void channel_map_test (const char *filename, int filetype) ; static void current_sf_info_test (const char *filename) ; static void raw_needs_endswap_test (const char *filename, int filetype) ; @@ -51,6 +59,10 @@ static void broadcast_rdwr_test (const char *filename, int filetype) ; static void broadcast_coding_history_test (const char *filename) ; static void broadcast_coding_history_size (const char *filename) ; +/* Cart Chunk tests */ +static void cart_test (const char *filename, int filetype) ; +static void cart_rdwr_test (const char *filename, int filetype) ; + /* Force the start of this buffer to be double aligned. Sparc-solaris will ** choke if its not. */ @@ -73,15 +85,17 @@ main (int argc, char *argv []) printf (" peak - test peak calculation\n") ; printf (" trunc - test file truncation\n") ; printf (" inst - test set/get of SF_INSTRUMENT.\n") ; + printf (" cue - test set/get of SF_CUES.\n") ; printf (" chanmap - test set/get of channel map data..\n") ; printf (" bext - test set/get of SF_BROADCAST_INFO.\n") ; printf (" bextch - test set/get of SF_BROADCAST_INFO coding_history.\n") ; + printf (" cart - test set/get of SF_CART_INFO.\n") ; printf (" rawend - test SFC_RAW_NEEDS_ENDSWAP.\n") ; printf (" all - perform all tests\n") ; exit (1) ; } ; - do_all =! strcmp (argv [1], "all") ; + do_all = ! strcmp (argv [1], "all") ; if (do_all || strcmp (argv [1], "ver") == 0) { char buffer [128] ; @@ -107,8 +121,10 @@ main (int argc, char *argv []) } ; if (do_all || strcmp (argv [1], "peak") == 0) - { calc_peak_test (SF_ENDIAN_BIG | SF_FORMAT_RAW, "be-peak.raw") ; - calc_peak_test (SF_ENDIAN_LITTLE | SF_FORMAT_RAW, "le-peak.raw") ; + { calc_peak_test (SF_ENDIAN_BIG | SF_FORMAT_RAW, "be-peak.raw", 1) ; + calc_peak_test (SF_ENDIAN_LITTLE | SF_FORMAT_RAW, "le-peak.raw", 1) ; + calc_peak_test (SF_ENDIAN_BIG | SF_FORMAT_RAW, "be-peak.raw", 7) ; + calc_peak_test (SF_ENDIAN_LITTLE | SF_FORMAT_RAW, "le-peak.raw", 7) ; test_count ++ ; } ; @@ -125,11 +141,27 @@ main (int argc, char *argv []) if (do_all || strcmp (argv [1], "inst") == 0) { instrument_test ("instrument.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ; - instrument_test ("instrument.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_24) ; + /*-instrument_test ("instrument.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_24) ;-*/ /*-instrument_test ("instrument.xi", SF_FORMAT_XI | SF_FORMAT_DPCM_16) ;-*/ test_count ++ ; } ; + if (do_all || strcmp (argv [1], "cue") == 0) + { /* 2500 is close to the largest number of cues possible because of block sizes (enforced in aiff.c, wav.c) */ + int cuecounts [] = { 0, 1, 10, 100, 101, 1000, 1001, 2500 } ; + unsigned int i ; + + cue_test ("cue.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ; + cue_test ("cue.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_24) ; + + for (i = 0 ; i < ARRAY_LEN (cuecounts) ; i++) + { cue_test_var ("cue.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16, cuecounts [i]) ; + cue_test_var ("cue.aiff", SF_FORMAT_AIFF | SF_FORMAT_PCM_24, cuecounts [i]) ; + } ; + + test_count ++ ; + } ; + if (do_all || strcmp (argv [1], "current_sf_info") == 0) { current_sf_info_test ("current.wav") ; test_count ++ ; @@ -147,6 +179,14 @@ main (int argc, char *argv []) test_count ++ ; } ; + if (do_all || strcmp (argv [1], "cart") == 0) + { cart_test ("cart.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ; + cart_rdwr_test ("cart.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ; + cart_test ("cart.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ; + cart_rdwr_test ("cart.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ; + test_count ++ ; + } ; + if (do_all || strcmp (argv [1], "bextch") == 0) { broadcast_coding_history_test ("coding_history.wav") ; broadcast_coding_history_size ("coding_hist_size.wav") ; @@ -241,7 +281,7 @@ float_norm_test (const char *filename) } ; if (sfinfo.frames != BUFFER_LEN) - { printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_LEN, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_LEN, sfinfo.frames) ; exit (1) ; } ; @@ -357,7 +397,7 @@ double_norm_test (const char *filename) } ; if (sfinfo.frames != BUFFER_LEN) - { printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_LEN, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_LEN, sfinfo.frames) ; exit (1) ; } ; @@ -513,28 +553,34 @@ format_tests (void) } /* format_tests */ static void -calc_peak_test (int filetype, const char *filename) +calc_peak_test (int filetype, const char *filename, int channels) { SNDFILE *file ; SF_INFO sfinfo ; + char label [128] ; int k, format ; + sf_count_t buffer_len, frame_count ; double peak ; - print_test_name ("calc_peak_test", filename) ; + snprintf (label, sizeof (label), "calc_peak_test (%d channels)", channels) ; + print_test_name (label, filename) ; - format = (filetype | SF_FORMAT_PCM_16) ; + format = filetype | SF_FORMAT_PCM_16 ; + + buffer_len = BUFFER_LEN - (BUFFER_LEN % channels) ; + frame_count = buffer_len / channels ; sfinfo.samplerate = 44100 ; sfinfo.format = format ; - sfinfo.channels = 1 ; - sfinfo.frames = BUFFER_LEN ; + sfinfo.channels = channels ; + sfinfo.frames = frame_count ; /* Create double_data with max value of 0.5. */ - for (k = 0 ; k < BUFFER_LEN ; k++) - double_data [k] = (k + 1) / (2.0 * BUFFER_LEN) ; + for (k = 0 ; k < buffer_len ; k++) + double_data [k] = (k + 1) / (2.0 * buffer_len) ; file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ; + test_writef_double_or_die (file, 0, double_data, frame_count, __LINE__) ; sf_close (file) ; @@ -545,12 +591,12 @@ calc_peak_test (int filetype, const char *filename) exit (1) ; } ; - if (sfinfo.frames != BUFFER_LEN) - { printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_LEN, SF_COUNT_TO_LONG (sfinfo.frames)) ; + if (sfinfo.frames != frame_count) + { printf ("\n\nLine %d: Incorrect number of frames in file. (%" PRId64 " => %" PRId64 ")\n", __LINE__, frame_count, sfinfo.frames) ; exit (1) ; } ; - if (sfinfo.channels != 1) + if (sfinfo.channels != channels) { printf ("Line %d: Incorrect number of channels in file.\n", __LINE__) ; exit (1) ; } ; @@ -572,16 +618,16 @@ calc_peak_test (int filetype, const char *filename) format = (filetype | SF_FORMAT_FLOAT) ; sfinfo.samplerate = 44100 ; sfinfo.format = format ; - sfinfo.channels = 1 ; - sfinfo.frames = BUFFER_LEN ; + sfinfo.channels = channels ; + sfinfo.frames = frame_count ; /* Create double_data with max value of 0.5. */ - for (k = 0 ; k < BUFFER_LEN ; k++) - double_data [k] = (k + 1) / (2.0 * BUFFER_LEN) ; + for (k = 0 ; k < buffer_len ; k++) + double_data [k] = (k + 1) / (2.0 * buffer_len) ; file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ; + test_writef_double_or_die (file, 0, double_data, frame_count, __LINE__) ; sf_close (file) ; @@ -592,12 +638,12 @@ calc_peak_test (int filetype, const char *filename) exit (1) ; } ; - if (sfinfo.frames != BUFFER_LEN) - { printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_LEN, SF_COUNT_TO_LONG (sfinfo.frames)) ; + if (sfinfo.frames != frame_count) + { printf ("\n\nLine %d: Incorrect number of.frames in file. (%" PRId64 " => %" PRId64 ")\n", __LINE__, frame_count, sfinfo.frames) ; exit (1) ; } ; - if (sfinfo.channels != 1) + if (sfinfo.channels != channels) { printf ("Line %d: Incorrect number of channels in file.\n", __LINE__) ; exit (1) ; } ; @@ -699,8 +745,8 @@ instrument_test (const char *filename, int filetype) } } ; SF_INSTRUMENT read_inst ; - SNDFILE *file ; - SF_INFO sfinfo ; + SNDFILE *file ; + SF_INFO sfinfo ; print_test_name ("instrument_test", filename) ; @@ -733,7 +779,6 @@ instrument_test (const char *filename, int filetype) ** write_inst struct to hold the default value that the WAV ** module should hold. */ - write_inst.detune = 0 ; write_inst.key_lo = write_inst.velocity_lo = 0 ; write_inst.key_hi = write_inst.velocity_hi = 127 ; write_inst.gain = 1 ; @@ -801,11 +846,214 @@ instrument_test (const char *filename, int filetype) puts ("ok") ; } /* instrument_test */ +static void +print_cue (SF_CUES *cue, int i) +{ + printf (" indx[%d] : %d\n" + " position : %u\n" + " fcc_chunk : %x\n" + " chunk_start : %d\n" + " block_start : %d\n" + " sample_offset : %u\n" + " name : %s\n", + i, + cue->cue_points [i].indx, + cue->cue_points [i].position, + cue->cue_points [i].fcc_chunk, + cue->cue_points [i].chunk_start, + cue->cue_points [i].block_start, + cue->cue_points [i].sample_offset, + cue->cue_points [i].name) ; +} + +static int +cue_compare (SF_CUES *write_cue, SF_CUES *read_cue, size_t cue_size, int line) +{ + if (memcmp (write_cue, read_cue, cue_size) != 0) + { + printf ("\n\nLine %d : cue comparison failed.\n\n", line) ; + printf ("W Cue count : %d\n", write_cue->cue_count) ; + if (write_cue->cue_count > 0) + print_cue (write_cue, 0) ; + if (write_cue->cue_count > 2) /* print last if at least 2 */ + print_cue (write_cue, write_cue->cue_count - 1) ; + + printf ("R Cue count : %d\n", read_cue->cue_count) ; + if (read_cue->cue_count > 0) + print_cue (read_cue, 0) ; + if (read_cue->cue_count > 2) /* print last if at least 2 */ + print_cue (read_cue, read_cue->cue_count - 1) ; + + return SF_FALSE ; + } ; + + return SF_TRUE ; +} /* cue_compare */ + +static void +cue_rw_test (const char *filename) +{ SNDFILE *sndfile ; + SF_INFO sfinfo ; + SF_CUES cues ; + memset (&sfinfo, 0, sizeof (SF_INFO)) ; + + sndfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_FALSE, __LINE__) ; + + exit_if_true ( + sf_command (sndfile, SFC_GET_CUE_COUNT, &cues.cue_count, sizeof (cues.cue_count)) != SF_TRUE, + "\nLine %d: SFC_GET_CUE_COUNT command failed.\n\n", __LINE__ + ) ; + + exit_if_true ( + cues.cue_count != 3, + "\nLine %d: Expected cue_count (%u) to be 3.\n\n", __LINE__, cues.cue_count + ) ; + + if (sf_command (sndfile, SFC_GET_CUE, &cues, sizeof (cues)) == SF_TRUE) + { cues.cue_points [1].sample_offset = 3 ; + + if (sf_command (sndfile, SFC_SET_CUE, &cues, sizeof (cues)) == SF_TRUE) + printf ("Sucess: [%s] updated\n", filename) ; + else + printf ("Error: SFC_SET_CUE on [%s] [%s]\n", filename, sf_strerror (sndfile)) ; + } + else + printf ("Error: SFC_GET_CUE on [%s] [%s]\n", filename, sf_strerror (sndfile)) ; + + + if (sf_command (sndfile, SFC_UPDATE_HEADER_NOW, NULL, 0) != 0) + printf ("Error: SFC_UPDATE_HEADER_NOW on [%s] [%s]\n", filename, sf_strerror (sndfile)) ; + + sf_write_sync (sndfile) ; + sf_close (sndfile) ; + + return ; +} /* cue_rw_test */ + +static void +cue_test (const char *filename, int filetype) +{ SF_CUES write_cue ; + SF_CUES read_cue ; + SNDFILE *file ; + SF_INFO sfinfo ; + + if (filetype == (SF_FORMAT_WAV | SF_FORMAT_PCM_16)) + { write_cue = (SF_CUES) + { 2, /* cue_count */ + { { 1, 0, data_MARKER, 0, 0, 1, "" }, + { 2, 0, data_MARKER, 0, 0, 2, "" }, + } + } ; + } + else + { write_cue = (SF_CUES) + { 2, /* cue_count */ + { { 1, 0, data_MARKER, 0, 0, 1, "Cue1" }, + { 2, 0, data_MARKER, 0, 0, 2, "Cue2" }, + } + } ; + } + + print_test_name ("cue_test", filename) ; + + sfinfo.samplerate = 11025 ; + sfinfo.format = filetype ; + sfinfo.channels = 1 ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + if (sf_command (file, SFC_SET_CUE, &write_cue, sizeof (write_cue)) == SF_FALSE) + { printf ("\n\nLine %d : sf_command (SFC_SET_CUE) failed.\n\n", __LINE__) ; + exit (1) ; + } ; + test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ; + sf_close (file) ; + + memset (&read_cue, 0, sizeof (read_cue)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + if (sf_command (file, SFC_GET_CUE, &read_cue, sizeof (read_cue)) == SF_FALSE) + { printf ("\n\nLine %d : sf_command (SFC_GET_CUE) failed.\n\n", __LINE__) ; + exit (1) ; + return ; + } ; + check_log_buffer_or_die (file, __LINE__) ; + sf_close (file) ; + + if (cue_compare (&write_cue, &read_cue, sizeof (write_cue), __LINE__) == SF_FALSE) + exit (1) ; + + if (0) cue_rw_test (filename) ; + + unlink (filename) ; + puts ("ok") ; +} /* cue_test */ + +/* calculate size of SF_CUES struct given number of cues */ +#define SF_CUES_SIZE(count) (sizeof (uint32_t) + sizeof (SF_CUE_POINT) * (count)) + +static void +cue_test_var (const char *filename, int filetype, int count) +{ size_t cues_size = SF_CUES_SIZE (count) ; + SF_CUES *write_cue = calloc (1, cues_size) ; + SF_CUES *read_cue = calloc (1, cues_size) ; + SNDFILE *file ; + SF_INFO sfinfo ; + char name [40] ; + int i ; + + snprintf (name, sizeof (name), "cue_test_var %d", count) ; + print_test_name (name, filename) ; + + if (write_cue == NULL || read_cue == NULL) + { printf ("ok (can't alloc)\n") ; + return ; + } ; + + write_cue->cue_count = count ; + for (i = 0 ; i < count ; i++) + { write_cue->cue_points [i] = (SF_CUE_POINT) { i, 0, data_MARKER, 0, 0, i, "" } ; + if (filetype == (SF_FORMAT_AIFF | SF_FORMAT_PCM_24)) + snprintf (write_cue->cue_points [i].name, sizeof (write_cue->cue_points [i].name), "Cue%03d", i) ; + } ; + + sfinfo.samplerate = 11025 ; + sfinfo.format = filetype ; + sfinfo.channels = 1 ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + if (sf_command (file, SFC_SET_CUE, write_cue, cues_size) == SF_FALSE) + { printf ("\n\nLine %d : sf_command (SFC_SET_CUE) failed with %d cues, datasize %zu --> error: %s\n\n", __LINE__, count, cues_size, sf_strerror (file)) ; + exit (1) ; + } ; + test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ; + sf_close (file) ; + + memset (read_cue, 0, cues_size) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + if (sf_command (file, SFC_GET_CUE, read_cue, cues_size) == SF_FALSE) + { printf ("\n\nLine %d : sf_command (SFC_GET_CUE) failed with %d cues, datasize %zu --> error: %s\n\n", __LINE__, count, cues_size, sf_strerror (file)) ; + exit (1) ; + } ; + check_log_buffer_or_die (file, __LINE__) ; + sf_close (file) ; + + if (cue_compare (write_cue, read_cue, cues_size, __LINE__) == SF_FALSE) + { printf ("\n\nLine %d : cue_compare failed.\n\n", __LINE__) ; + exit (1) ; + } ; + + free (write_cue) ; + free (read_cue) ; + unlink (filename) ; + puts ("ok") ; +} /* cue_test_var */ + static void current_sf_info_test (const char *filename) { SNDFILE *outfile, *infile ; SF_INFO outinfo, ininfo ; - sf_count_t last_count ; print_test_name ("current_sf_info_test", filename) ; @@ -825,23 +1073,21 @@ current_sf_info_test (const char *filename) sf_command (outfile, SFC_GET_CURRENT_SF_INFO, &outinfo, sizeof (outinfo)) ; exit_if_true (outinfo.frames != BUFFER_LEN, - "\n\nLine %d : Initial sfinfo.frames (%ld) should be %d.\n\n", __LINE__, - SF_COUNT_TO_LONG (outinfo.frames), BUFFER_LEN + "\n\nLine %d : Initial sfinfo.frames (%" PRId64 ") should be %d.\n\n", __LINE__, + outinfo.frames, BUFFER_LEN ) ; /* Read file making sure no channel map exists. */ memset (&ininfo, 0, sizeof (ininfo)) ; infile = test_open_file_or_die (filename, SFM_READ, &ininfo, SF_TRUE, __LINE__) ; - last_count = ininfo.frames ; - test_write_double_or_die (outfile, 0, double_data, BUFFER_LEN, __LINE__) ; sf_command (infile, SFC_GET_CURRENT_SF_INFO, &ininfo, sizeof (ininfo)) ; exit_if_true (ininfo.frames != BUFFER_LEN, - "\n\nLine %d : Initial sfinfo.frames (%ld) should be %d.\n\n", __LINE__, - SF_COUNT_TO_LONG (ininfo.frames), BUFFER_LEN + "\n\nLine %d : Initial sfinfo.frames (%" PRId64 ") should be %d.\n\n", __LINE__, + ininfo.frames, BUFFER_LEN ) ; sf_close (outfile) ; @@ -854,12 +1100,13 @@ current_sf_info_test (const char *filename) static void broadcast_test (const char *filename, int filetype) { static SF_BROADCAST_INFO bc_write, bc_read ; - SNDFILE *file ; - SF_INFO sfinfo ; + SNDFILE *file ; + SF_INFO sfinfo ; int errors = 0 ; print_test_name ("broadcast_test", filename) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = 11025 ; sfinfo.format = filetype ; sfinfo.channels = 1 ; @@ -893,7 +1140,7 @@ broadcast_test (const char *filename, int filetype) check_log_buffer_or_die (file, __LINE__) ; sf_close (file) ; - if (bc_read.version != 1) + if (bc_read.version != 2) { printf ("\n\nLine %d : Read bad version number %d.\n\n", __LINE__, bc_read.version) ; exit (1) ; return ; @@ -970,7 +1217,7 @@ broadcast_rdwr_test (const char *filename, int filetype) file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; sf_close (file) ; - exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %lld should be %lld.\n", __LINE__, sfinfo.frames, frames) ; + exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ; unlink (filename) ; puts ("ok") ; @@ -979,8 +1226,8 @@ broadcast_rdwr_test (const char *filename, int filetype) static void check_coding_history_newlines (const char *filename) { static SF_BROADCAST_INFO bc_write, bc_read ; - SNDFILE *file ; - SF_INFO sfinfo ; + SNDFILE *file ; + SF_INFO sfinfo ; unsigned k ; sfinfo.samplerate = 22050 ; @@ -1049,8 +1296,8 @@ check_coding_history_newlines (const char *filename) static void broadcast_coding_history_test (const char *filename) { static SF_BROADCAST_INFO bc_write, bc_read ; - SNDFILE *file ; - SF_INFO sfinfo ; + SNDFILE *file ; + SF_INFO sfinfo ; const char *default_history = "A=PCM,F=22050,W=16,M=mono" ; const char *supplied_history = "A=PCM,F=44100,W=24,M=mono,T=other\r\n" @@ -1153,8 +1400,8 @@ broadcast_coding_history_size (const char *filename) { /* SF_BROADCAST_INFO struct with coding_history field of 1024 bytes. */ static SF_BROADCAST_INFO_VAR (1024) bc_write ; static SF_BROADCAST_INFO_VAR (1024) bc_read ; - SNDFILE *file ; - SF_INFO sfinfo ; + SNDFILE *file ; + SF_INFO sfinfo ; int k ; print_test_name (__func__, filename) ; @@ -1211,13 +1458,225 @@ broadcast_coding_history_size (const char *filename) puts ("ok") ; } /* broadcast_coding_history_size */ +/*============================================================================== +*/ +static void +cart_test (const char *filename, int filetype) +{ static SF_CART_INFO ca_write, ca_read ; + SNDFILE *file ; + SF_INFO sfinfo ; + int errors = 0 ; + + print_test_name ("cart_test", filename) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + sfinfo.samplerate = 11025 ; + sfinfo.format = filetype ; + sfinfo.channels = 1 ; + memset (&ca_write, 0, sizeof (ca_write)) ; + + // example test data + snprintf (ca_write.artist, sizeof (ca_write.artist), "Test artist") ; + snprintf (ca_write.version, sizeof (ca_write.version), "Test version") ; + snprintf (ca_write.cut_id, sizeof (ca_write.cut_id), "Test cut ID") ; + snprintf (ca_write.client_id, sizeof (ca_write.client_id), "Test client ID") ; + snprintf (ca_write.category, sizeof (ca_write.category), "Test category") ; + snprintf (ca_write.classification, sizeof (ca_write.classification), "Test classification") ; + snprintf (ca_write.out_cue, sizeof (ca_write.out_cue), "Test out cue") ; + snprintf (ca_write.start_date, sizeof (ca_write.start_date), "%d/%02d/%02d", 2006, 3, 30) ; + snprintf (ca_write.start_time, sizeof (ca_write.start_time), "%02d:%02d:%02d", 20, 27, 0) ; + snprintf (ca_write.end_date, sizeof (ca_write.end_date), "%d/%02d/%02d", 2006, 3, 30) ; + snprintf (ca_write.end_time, sizeof (ca_write.end_time), "%02d:%02d:%02d", 20, 27, 0) ; + snprintf (ca_write.producer_app_id, sizeof (ca_write.producer_app_id), "Test producer app id") ; + snprintf (ca_write.producer_app_version, sizeof (ca_write.producer_app_version), "Test producer app version") ; + snprintf (ca_write.user_def, sizeof (ca_write.user_def), "test user def test test") ; + ca_write.level_reference = 42 ; + snprintf (ca_write.url, sizeof (ca_write.url), "http://www.test.com/test_url") ; + snprintf (ca_write.tag_text, sizeof (ca_write.tag_text), "tag text test! \r\n") ; // must be terminated \r\n to be valid + ca_write.tag_text_size = strlen (ca_write.tag_text) ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + if (sf_command (file, SFC_SET_CART_INFO, &ca_write, sizeof (ca_write)) == SF_FALSE) + exit (1) ; + + test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ; + sf_close (file) ; + + memset (&ca_read, 0, sizeof (ca_read)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + if (sf_command (file, SFC_GET_CART_INFO, &ca_read, sizeof (ca_read)) == SF_FALSE) + { printf ("\n\nLine %d : sf_command (SFC_GET_CART_INFO) failed.\n\n", __LINE__) ; + exit (1) ; + return ; + } ; + check_log_buffer_or_die (file, __LINE__) ; + sf_close (file) ; + + + if (memcmp (ca_write.artist, ca_read.artist, sizeof (ca_write.artist)) != 0) + { printf ("\n\nLine %d : artist mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.artist, ca_read.artist) ; + errors ++ ; + } ; + + if (memcmp (ca_write.version, ca_read.version, sizeof (ca_write.version)) != 0) + { printf ("\n\nLine %d : version mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.version, ca_read.version) ; + errors ++ ; + } ; + + if (memcmp (ca_write.title, ca_read.title, sizeof (ca_write.title)) != 0) + { printf ("\n\nLine %d : title mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.title, ca_read.title) ; + errors ++ ; + } ; + + if (memcmp (ca_write.cut_id, ca_read.cut_id, sizeof (ca_write.cut_id)) != 0) + { printf ("\n\nLine %d : cut_id mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.cut_id, ca_read.cut_id) ; + errors ++ ; + } ; + + if (memcmp (ca_write.client_id, ca_read.client_id, sizeof (ca_write.client_id)) != 0) + { printf ("\n\nLine %d : client_id mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.client_id, ca_read.client_id) ; + errors ++ ; + } ; + + if (memcmp (ca_write.category, ca_read.category, sizeof (ca_write.category)) != 0) + { printf ("\n\nLine %d : category mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.category, ca_read.category) ; + errors ++ ; + } ; + + if (memcmp (ca_write.out_cue, ca_read.out_cue, sizeof (ca_write.out_cue)) != 0) + { printf ("\n\nLine %d : out_cue mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.out_cue, ca_read.out_cue) ; + errors ++ ; + } ; + + if (memcmp (ca_write.start_date, ca_read.start_date, sizeof (ca_write.start_date)) != 0) + { printf ("\n\nLine %d : start_date mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.start_date, ca_read.start_date) ; + errors ++ ; + } ; + + + if (memcmp (ca_write.start_time, ca_read.start_time, sizeof (ca_write.start_time)) != 0) + { printf ("\n\nLine %d : start_time mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.start_time, ca_read.start_time) ; + errors ++ ; + } ; + + + if (memcmp (ca_write.end_date, ca_read.end_date, sizeof (ca_write.end_date)) != 0) + { printf ("\n\nLine %d : end_date mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.end_date, ca_read.end_date) ; + errors ++ ; + } ; + + + if (memcmp (ca_write.end_time, ca_read.end_time, sizeof (ca_write.end_time)) != 0) + { printf ("\n\nLine %d : end_time mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.end_time, ca_read.end_time) ; + errors ++ ; + } ; + + + if (memcmp (ca_write.producer_app_id, ca_read.producer_app_id, sizeof (ca_write.producer_app_id)) != 0) + { printf ("\n\nLine %d : producer_app_id mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.producer_app_id, ca_read.producer_app_id) ; + errors ++ ; + } ; + + + if (memcmp (ca_write.producer_app_version, ca_read.producer_app_version, sizeof (ca_write.producer_app_version)) != 0) + { printf ("\n\nLine %d : producer_app_version mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.producer_app_version, ca_read.producer_app_version) ; + errors ++ ; + } ; + + + if (memcmp (ca_write.user_def, ca_read.user_def, sizeof (ca_write.user_def)) != 0) + { printf ("\n\nLine %d : user_def mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.user_def, ca_read.user_def) ; + errors ++ ; + } ; + + + if (ca_write.level_reference != ca_read.level_reference) + { printf ("\n\nLine %d : level_reference mismatch :\n\twrite : '%d'\n\tread : '%d'\n\n", __LINE__, ca_write.level_reference, ca_read.level_reference) ; + errors ++ ; + } ; + + // TODO: make this more helpful + if (memcmp (ca_write.post_timers, ca_read.post_timers, sizeof (ca_write.post_timers)) != 0) + { printf ("\n\nLine %d : post_timers mismatch :\n'\n\n", __LINE__) ; + errors ++ ; + } ; + + if (memcmp (ca_write.url, ca_read.url, sizeof (ca_write.url)) != 0) + { printf ("\n\nLine %d : url mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.url, ca_read.url) ; + errors ++ ; + } ; + + + if (memcmp (ca_write.tag_text, ca_read.tag_text, (size_t) (ca_read.tag_text_size)) != 0) + { printf ("\n\nLine %d : tag_text mismatch :\n\twrite : '%s'\n\tread : '%s'\n\n", __LINE__, ca_write.tag_text, ca_read.tag_text) ; + errors ++ ; + } ; + + + if (errors) + exit (1) ; + + unlink (filename) ; + puts ("ok") ; +} /* cart_test */ + +static void +cart_rdwr_test (const char *filename, int filetype) +{ SF_CART_INFO cinfo ; + SNDFILE *file ; + SF_INFO sfinfo ; + sf_count_t frames ; + + print_test_name (__func__, filename) ; + + create_short_sndfile (filename, filetype, 2) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + memset (&cinfo, 0, sizeof (cinfo)) ; + + snprintf (cinfo.artist, sizeof (cinfo.artist), "Test artist") ; + snprintf (cinfo.version, sizeof (cinfo.version), "Test version") ; + snprintf (cinfo.cut_id, sizeof (cinfo.cut_id), "Test cut ID") ; + snprintf (cinfo.client_id, sizeof (cinfo.client_id), "Test client ID") ; + snprintf (cinfo.category, sizeof (cinfo.category), "Test category") ; + snprintf (cinfo.classification, sizeof (cinfo.classification), "Test classification") ; + snprintf (cinfo.out_cue, sizeof (cinfo.out_cue), "Test out cue") ; + snprintf (cinfo.start_date, sizeof (cinfo.start_date), "%d/%02d/%02d", 2006, 3, 30) ; + snprintf (cinfo.start_time, sizeof (cinfo.start_time), "%02d:%02d:%02d", 20, 27, 0) ; + snprintf (cinfo.end_date, sizeof (cinfo.end_date), "%d/%02d/%02d", 2006, 3, 30) ; + snprintf (cinfo.end_time, sizeof (cinfo.end_time), "%02d:%02d:%02d", 20, 27, 0) ; + snprintf (cinfo.producer_app_id, sizeof (cinfo.producer_app_id), "Test producer app id") ; + snprintf (cinfo.producer_app_version, sizeof (cinfo.producer_app_version), "Test producer app version") ; + snprintf (cinfo.user_def, sizeof (cinfo.user_def), "test user def test test") ; + cinfo.level_reference = 42 ; + snprintf (cinfo.url, sizeof (cinfo.url), "http://www.test.com/test_url") ; + snprintf (cinfo.tag_text, sizeof (cinfo.tag_text), "tag text test!\r\n") ; + cinfo.tag_text_size = strlen (cinfo.tag_text) ; + + file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; + frames = sfinfo.frames ; + if (sf_command (file, SFC_SET_CART_INFO, &cinfo, sizeof (cinfo)) != SF_FALSE) + { printf ("\n\nLine %d : sf_command (SFC_SET_CART_INFO) should have failed but didn't.\n\n", __LINE__) ; + exit (1) ; + } ; + sf_close (file) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + sf_close (file) ; + exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ; + + unlink (filename) ; + puts ("ok") ; +} /* cart_rdwr_test */ + /*============================================================================== */ static void channel_map_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; +{ SNDFILE *file ; + SF_INFO sfinfo ; int channel_map_read [4], channel_map_write [4] = { SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_LFE, SF_CHANNEL_MAP_REAR_CENTER @@ -1286,8 +1745,8 @@ raw_needs_endswap_test (const char *filename, int filetype) { SF_FORMAT_FLOAT, SF_FORMAT_DOUBLE, SF_FORMAT_PCM_16, SF_FORMAT_PCM_24, SF_FORMAT_PCM_32 } ; - SNDFILE *file ; - SF_INFO sfinfo ; + SNDFILE *file ; + SF_INFO sfinfo ; unsigned k ; int needs_endswap ; diff --git a/lib-src/libsndfile/tests/vorbis_test.c b/lib-src/libsndfile/tests/compression_size_test.c similarity index 64% rename from lib-src/libsndfile/tests/vorbis_test.c rename to lib-src/libsndfile/tests/compression_size_test.c index 9f5797fde..c8f43c81b 100644 --- a/lib-src/libsndfile/tests/vorbis_test.c +++ b/lib-src/libsndfile/tests/compression_size_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2007-2011 Erik de Castro Lopo +** Copyright (C) 2007-2016 Erik de Castro Lopo ** ** 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 @@ -21,7 +21,11 @@ #include #include #include +#if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" +#endif #include @@ -31,7 +35,7 @@ #include "dft_cmp.h" #define SAMPLE_RATE 16000 -#define DATA_LENGTH (SAMPLE_RATE / 8) +#define DATA_LENGTH (SAMPLE_RATE) static float data_out [DATA_LENGTH] ; @@ -96,81 +100,112 @@ vorbis_test (void) for (k = 0 ; k < ARRAY_LEN (float_data) ; k ++) max_abs = max_float (max_abs, fabs (float_data [k])) ; - if (max_abs > 1.021) - { printf ("\n\n Error : max_abs %f should be < 1.021.\n\n", max_abs) ; - exit (1) ; - } ; + exit_if_true (max_abs > 1.023, + "\n\nLine %d : max_abs %f should be < 1.023.\n\n", __LINE__, max_abs) ; puts ("ok") ; unlink (filename) ; } /* vorbis_test */ static void -vorbis_quality_test (void) +compression_size_test (int format, const char * filename) { /* ** Encode two files, one at quality 0.3 and one at quality 0.5 and then ** make sure that the quality 0.3 files is the smaller of the two. */ - const char * q3_fname = "q3_vorbis.oga" ; - const char * q5_fname = "q5_vorbis.oga" ; + char q3_fname [64] ; + char q6_fname [64] ; + char test_name [64] ; - SNDFILE *q3_file, *q5_file ; + SNDFILE *q3_file, *q6_file ; SF_INFO sfinfo ; - int q3_size, q5_size ; + int q3_size, q6_size ; double quality ; int k ; - print_test_name (__func__, "q[35]_vorbis.oga") ; + snprintf (q3_fname, sizeof (q3_fname), "q3_%s", filename) ; + snprintf (q6_fname, sizeof (q6_fname), "q6_%s", filename) ; + + snprintf (test_name, sizeof (test_name), "q[36]_%s", filename) ; + print_test_name (__func__, test_name) ; memset (&sfinfo, 0, sizeof (sfinfo)) ; /* Set up output file type. */ - sfinfo.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ; + sfinfo.format = format ; sfinfo.channels = 1 ; sfinfo.samplerate = SAMPLE_RATE ; /* Write the output file. */ q3_file = test_open_file_or_die (q3_fname, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; - q5_file = test_open_file_or_die (q5_fname, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + q6_file = test_open_file_or_die (q6_fname, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; quality = 0.3 ; sf_command (q3_file, SFC_SET_VBR_ENCODING_QUALITY, &quality, sizeof (quality)) ; - quality = 0.5 ; - sf_command (q5_file, SFC_SET_VBR_ENCODING_QUALITY, &quality, sizeof (quality)) ; + quality = 0.6 ; + sf_command (q6_file, SFC_SET_VBR_ENCODING_QUALITY, &quality, sizeof (quality)) ; for (k = 0 ; k < 5 ; k++) - { gen_lowpass_noise_float (data_out, ARRAY_LEN (data_out)) ; + { gen_lowpass_signal_float (data_out, ARRAY_LEN (data_out)) ; test_write_float_or_die (q3_file, 0, data_out, ARRAY_LEN (data_out), __LINE__) ; - test_write_float_or_die (q5_file, 0, data_out, ARRAY_LEN (data_out), __LINE__) ; + test_write_float_or_die (q6_file, 0, data_out, ARRAY_LEN (data_out), __LINE__) ; } ; sf_close (q3_file) ; - sf_close (q5_file) ; + sf_close (q6_file) ; q3_size = file_length (q3_fname) ; - q5_size = file_length (q5_fname) ; + q6_size = file_length (q6_fname) ; - if (q3_size >= q5_size) - { printf ("\n\nLine %d : q3 size (%d) >= q5 size (%d)\n\n", __LINE__, q3_size, q5_size) ; - exit (1) ; - } ; + exit_if_true (q3_size >= q6_size, + "\n\nLine %d : q3 size (%d) >= q6 size (%d)\n\n", __LINE__, q3_size, q6_size) ; puts ("ok") ; unlink (q3_fname) ; - unlink (q5_fname) ; -} /* vorbis_quality_test */ + unlink (q6_fname) ; +} /* compression_size_test */ int -main (void) -{ - if (HAVE_EXTERNAL_LIBS) +main (int argc, char *argv []) +{ int all_tests = 0, tests = 0 ; + + if (argc != 2) + { printf ( + "Usage : %s \n" + " Where is one of:\n" + " vorbis - test Ogg/Vorbis\n" + " flac - test FLAC\n" + " opus - test Opus\n" + " all - perform all tests\n", + argv [0]) ; + exit (0) ; + } ; + + if (! HAVE_EXTERNAL_XIPH_LIBS) + { puts (" No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.") ; + return 0 ; + } ; + + if (strcmp (argv [1], "all") == 0) + all_tests = 1 ; + + if (all_tests || strcmp (argv [1], "vorbis") == 0) { vorbis_test () ; - vorbis_quality_test () ; - } - else - puts (" No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.") ; + compression_size_test (SF_FORMAT_OGG | SF_FORMAT_VORBIS, "vorbis.oga") ; + tests ++ ; + } ; + + if (all_tests || strcmp (argv [1], "flac") == 0) + { compression_size_test (SF_FORMAT_FLAC | SF_FORMAT_PCM_16, "pcm16.flac") ; + tests ++ ; + } ; + + if (all_tests || strcmp (argv [1], "opus") == 0) + { compression_size_test (SF_FORMAT_OGG | SF_FORMAT_OPUS, "opus.opus") ; + tests ++ ; + } ; return 0 ; } /* main */ diff --git a/lib-src/libsndfile/tests/cpp_test.cc b/lib-src/libsndfile/tests/cpp_test.cc index 752f00edc..6e39da6d0 100644 --- a/lib-src/libsndfile/tests/cpp_test.cc +++ b/lib-src/libsndfile/tests/cpp_test.cc @@ -1,5 +1,5 @@ /* -** Copyright (C) 2006-2011 Erik de Castro Lopo +** Copyright (C) 2006-2012 Erik de Castro Lopo ** ** 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 @@ -16,6 +16,8 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "sfconfig.h" + #include #include #include @@ -159,7 +161,7 @@ read_file (const char * filename, int format) if (file.frames () != ARRAY_LEN (sbuffer) * 4) { printf ("\n\n%s %d : Error : frames %ld should be %lu.\n\n", __func__, __LINE__, - SF_COUNT_TO_LONG (file.frames ()), (long unsigned int) ARRAY_LEN (sbuffer) * 4 / 2) ; + (long) file.frames (), (long) ARRAY_LEN (sbuffer) * 4 / 2) ; exit (1) ; } ; @@ -187,14 +189,14 @@ read_file (const char * filename, int format) count = file.seek (file.frames () - 10, SEEK_SET) ; if (count != file.frames () - 10) { printf ("\n\n%s %d : Error : offset (%ld) should be %ld\n\n", __func__, __LINE__, - SF_COUNT_TO_LONG (count), SF_COUNT_TO_LONG (file.frames () - 10)) ; + (long) count, (long) (file.frames () - 10)) ; exit (1) ; } ; count = file.read (sbuffer, ARRAY_LEN (sbuffer)) ; if (count != 10 * file.channels ()) { printf ("\n\n%s %d : Error : count (%ld) should be %ld\n\n", __func__, __LINE__, - SF_COUNT_TO_LONG (count), SF_COUNT_TO_LONG (10 * file.channels ())) ; + (long) count, (long) (10 * file.channels ())) ; exit (1) ; } ; @@ -225,7 +227,7 @@ ceeplusplus_extra_test (void) error = file.error () ; if (error == 0) - { printf ("\n\n%s %d : error should be zero.\n\n", __func__, __LINE__) ; + { printf ("\n\n%s %d : error should not be zero.\n\n", __func__, __LINE__) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/cue_test.c b/lib-src/libsndfile/tests/cue_test.c new file mode 100644 index 000000000..d2fdae4bb --- /dev/null +++ b/lib-src/libsndfile/tests/cue_test.c @@ -0,0 +1,135 @@ + +#include "sfconfig.h" + +#include +#include +#include +#include + + +static void * +get_cues (const char *filename, double *sr) +{ + SNDFILE *file; + SF_INFO sfinfo; + + unsigned int err, size; + uint32_t count = 0; + SF_CUES_VAR(0) *info; + + if ((file = sf_open(filename, SFM_READ, &sfinfo)) == NULL) + { + printf("can't open file '%s'\n", filename); + exit(1); + } + + printf("\n---- get cues of file '%s'\n", filename); + + if ((err = sf_command(file, SFC_GET_CUE_COUNT, &count, sizeof(uint32_t))) == SF_FALSE) + { + if (sf_error(file)) + { + printf("can't get cue info size for file '%s' (arg size %lu), err %s\n", + filename, sizeof(uint32_t), sf_strerror(file)); + exit(2); + } + else + printf("no cue info for file '%s'\n", filename); + return NULL; + } + + size = sizeof(*info) + count * sizeof(SF_CUE_POINT); + printf("number of cues %d size %d\n", count, size); + + if (!(info = malloc(size))) + return NULL; + + if (sf_command(file, SFC_GET_CUE, info, size) == SF_FALSE) + { + printf("can't get cue info of size %d for file '%s' error %s\n", + size, filename, sf_strerror(file)); + exit(3); + } + + *sr = sfinfo.samplerate; + sf_close(file); + + return info; +} + + +static void +test_cues (const char *filename) +{ + unsigned int i; + double sr; + SF_CUES_VAR(0) *info = get_cues(filename, &sr); + + if (info == NULL) + exit(1); + + for (i = 0; i < info->cue_count; i++) + { + int pos = info->cue_points[i].position; + double t = (double) pos / sr; + double expected = i < 8 ? (double) i / 3. : 10. / 3.; + double error = (double) fabs(t - expected); + + printf("cue %02d: markerID %02d position %6d offset %6d (time %.3f expected %.3f diff %f) label '%s'\n", + i, info->cue_points[i].indx, pos, info->cue_points[i].sample_offset, t, expected, error, info->cue_points[i].name); + + if (error > 0.025) + exit(4); + } + + free(info); +} + +static void +print_cues (const char *filename) +{ + unsigned int i; + double sr; + SF_CUES_VAR(0) *info = get_cues(filename, &sr); + + if (info == NULL) + exit(1); + + for (i = 0; i < info->cue_count; i++) + { + int pos = info->cue_points[i].position; + int indx = info->cue_points[i].indx; + int cstart = info->cue_points[i].chunk_start; + int bstart = info->cue_points[i].block_start; + int offset = info->cue_points[i].sample_offset; + const char *name = info->cue_points[i].name; + double t = (double) pos / sr; + + if (cstart != 0 || bstart != 0) + printf("cue %02d time %7.3f: markerID %02d position %8d chunk_start %d block_start %d offset %8d label '%s'\n", + i, t, indx, pos, offset, cstart, bstart, name); + else + printf("cue %02d time %7.3f: markerID %02d position %8d offset %8d label '%s'\n", + i, t, indx, pos, offset, name); + } + + free(info); +} + + +int +main (int argc, char **argv) +{ + int i; + + if (argc > 1) + for (i = 1; i < argc; i++) + print_cues(argv[i]); + else + { + test_cues("clickpluck24.wav"); + test_cues("clickpluck.wav"); + test_cues("clickpluck.aiff"); + } + return 0; +} diff --git a/lib-src/libsndfile/tests/dft_cmp.c b/lib-src/libsndfile/tests/dft_cmp.c index c902769f8..03bd4646d 100644 --- a/lib-src/libsndfile/tests/dft_cmp.c +++ b/lib-src/libsndfile/tests/dft_cmp.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2015 Erik de Castro Lopo ** ** 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 @@ -16,6 +16,8 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "sfconfig.h" + #include #include #include @@ -123,9 +125,9 @@ dft_magnitude (const double *data, double *spectrum) spectrum [k] = sqrt (real_part * real_part + imag_part * imag_part) ; } ; - spectrum [k] = 0.0 ; + spectrum [DFT_SPEC_LENGTH - 1] = 0.0 ; - spectrum [0] = spectrum [1] = spectrum [2] = spectrum [3] = spectrum [4] = 0.0 ; + spectrum [0] = spectrum [1] = spectrum [2] = 0.0 ; return ; } /* dft_magnitude */ diff --git a/lib-src/libsndfile/tests/dft_cmp.h b/lib-src/libsndfile/tests/dft_cmp.h index 3cbdd118e..faa5fe0a6 100644 --- a/lib-src/libsndfile/tests/dft_cmp.h +++ b/lib-src/libsndfile/tests/dft_cmp.h @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2015 Erik de Castro Lopo ** ** 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 @@ -17,7 +17,7 @@ */ -#define DFT_DATA_LENGTH (2048) +#define DFT_DATA_LENGTH (8192) double dft_cmp_float (int linenum, const float *orig, const float *test, int len, double tolerance, int allow_exit) ; diff --git a/lib-src/libsndfile/tests/dither_test.c b/lib-src/libsndfile/tests/dither_test.c index 6c570ffb1..c0928440c 100644 --- a/lib-src/libsndfile/tests/dither_test.c +++ b/lib-src/libsndfile/tests/dither_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2003-2011 Erik de Castro Lopo +** Copyright (C) 2003-2013 Erik de Castro Lopo ** ** 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 @@ -17,10 +17,14 @@ */ - +#include "sfconfig.h" #include #include +#if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" +#endif #include #include @@ -28,7 +32,7 @@ #include "utils.h" -#define BUFFER_LEN (1<<16) +#define BUFFER_LEN (1 << 16) #define LOG_BUFFER_SIZE 1024 static void dither_test (const char *filename, int filetype) ; @@ -52,7 +56,7 @@ main (int argc, char *argv []) exit (1) ; } ; - do_all=!strcmp (argv [1], "all") ; + do_all = ! strcmp (argv [1], "all") ; if (do_all || ! strcmp (argv [1], "wav")) { dither_test ("dither.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_U8) ; @@ -135,8 +139,6 @@ dither_test (const char *filename, int filetype) SF_INFO sfinfo ; SF_DITHER_INFO dither ; - filetype = filetype ; - print_test_name ("dither_test", filename) ; sfinfo.samplerate = 44100 ; diff --git a/lib-src/libsndfile/tests/dwvw_test.c b/lib-src/libsndfile/tests/dwvw_test.c index 2bd11d18c..b2cae0675 100644 --- a/lib-src/libsndfile/tests/dwvw_test.c +++ b/lib-src/libsndfile/tests/dwvw_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2014 Erik de Castro Lopo ** ** 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 @@ -25,6 +25,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -62,7 +64,7 @@ dwvw_test (const char *filename, int format, int bit_width) srand (123456) ; /* Only want to grab the top bit_width bits. */ - bit_mask = (-1 << (32 - bit_width)) ; + bit_mask = arith_shift_left (-1, 32 - bit_width) ; print_test_name ("dwvw_test", filename) ; @@ -77,7 +79,7 @@ dwvw_test (const char *filename, int format, int bit_width) } ; for ( ; k < BUFFER_SIZE ; k++) - write_buf [k] = bit_mask & ((rand () << 11) ^ (rand () >> 11)) ; + write_buf [k] = bit_mask & (arith_shift_left (rand (), 11) ^ (rand () >> 11)) ; sf_write_int (file, write_buf, BUFFER_SIZE) ; sf_close (file) ; diff --git a/lib-src/libsndfile/tests/error_test.c b/lib-src/libsndfile/tests/error_test.c index 9df14b8c8..2e348e470 100644 --- a/lib-src/libsndfile/tests/error_test.c +++ b/lib-src/libsndfile/tests/error_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2018 Erik de Castro Lopo ** ** 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 @@ -21,9 +21,12 @@ #include #include #include +#include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #if OS_IS_WIN32 @@ -34,7 +37,7 @@ #include "utils.h" -#define BUFFER_SIZE (1<<15) +#define BUFFER_SIZE (1 << 15) #define SHORT_BUFFER (256) static void @@ -83,6 +86,8 @@ error_value_test (void) dump_data_to_file (filename, aiff_data, sizeof (aiff_data)) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; + file = sf_open (filename, SFM_READ, &sfinfo) ; if (file != NULL) { printf ("\n\nLine %d : Should not have been able to open this file.\n\n", __LINE__) ; @@ -229,6 +234,40 @@ error_close_test (void) puts ("ok") ; } /* error_close_test */ +static void +unrecognised_test (void) +{ const char *filename = "unrecognised.bin" ; + SNDFILE *sndfile ; + SF_INFO sfinfo ; + FILE *file ; + int k ; + + print_test_name (__func__, filename) ; + + file = fopen (filename, "wb") ; + exit_if_true (file == NULL, + "\n\nLine %d : fopen ('%s') failed : %s\n", __LINE__, filename, strerror (errno) + ) ; + fputs ("Unrecognised file", file) ; + fclose (file) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + sndfile = sf_open (filename, SFM_READ, &sfinfo) ; + + exit_if_true (sndfile != NULL, + "\n\nLine %d : SNDFILE* pointer (%p) should ne NULL.\n", __LINE__, sndfile + ) ; + + k = sf_error (sndfile) ; + exit_if_true (k != SF_ERR_UNRECOGNISED_FORMAT, + "\n\nLine %d : error (%d) should have been SF_ERR_UNRECOGNISED_FORMAT (%d).\n", + __LINE__, k, SF_ERR_UNRECOGNISED_FORMAT + ) ; + + unlink (filename) ; + puts ("ok") ; +} /* unrecognised_test */ + int main (void) { @@ -241,6 +280,8 @@ main (void) zero_length_test ("zero_length.wav") ; bad_wav_test ("bad_wav.wav") ; + unrecognised_test () ; + return 0 ; } /* main */ diff --git a/lib-src/libsndfile/tests/external_libs_test.c b/lib-src/libsndfile/tests/external_libs_test.c index 86b029078..0c6fcf8e4 100644 --- a/lib-src/libsndfile/tests/external_libs_test.c +++ b/lib-src/libsndfile/tests/external_libs_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2011 Erik de Castro Lopo +** Copyright (C) 2008-2017 Erik de Castro Lopo ** ** 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 @@ -23,6 +23,12 @@ #include #include +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + #include #include "utils.h" @@ -30,6 +36,7 @@ static void major_format_test (void) ; static void subtype_format_test (void) ; static void simple_format_test (void) ; +static void flac_subset_test (void) ; int main (void) @@ -38,6 +45,9 @@ main (void) subtype_format_test () ; simple_format_test () ; + if (HAVE_EXTERNAL_XIPH_LIBS) + flac_subset_test () ; + return 0 ; } /* main */ @@ -59,7 +69,7 @@ major_format_test (void) have_ogg = info.format == SF_FORMAT_OGG ? 1 : have_ogg ; } ; - if (HAVE_EXTERNAL_LIBS) + if (HAVE_EXTERNAL_XIPH_LIBS) { exit_if_true (have_flac == 0, "\n\nLine %d : FLAC should be available.\n\n", __LINE__) ; exit_if_true (have_ogg == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; } @@ -74,7 +84,7 @@ major_format_test (void) static void subtype_format_test (void) { SF_FORMAT_INFO info ; - int have_vorbis = 0 ; + int have_vorbis = 0 , have_opus = 0 ; int s, subtype_count ; print_test_name (__func__, NULL) ; @@ -86,12 +96,17 @@ subtype_format_test (void) sf_command (NULL, SFC_GET_FORMAT_SUBTYPE, &info, sizeof (info)) ; have_vorbis = info.format == SF_FORMAT_VORBIS ? 1 : have_vorbis ; + have_opus = info.format == SF_FORMAT_OPUS ? 1 : have_opus ; } ; - if (HAVE_EXTERNAL_LIBS) - exit_if_true (have_vorbis == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; + if (HAVE_EXTERNAL_XIPH_LIBS) + { exit_if_true (have_vorbis == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; + exit_if_true (have_opus == 0, "\n\nLine %d : Ogg/Opus should be available.\n\n", __LINE__) ; + } else - exit_if_true (have_vorbis, "\n\nLine %d : Ogg/Vorbis should not be available.\n\n", __LINE__) ; + { exit_if_true (have_vorbis, "\n\nLine %d : Ogg/Vorbis should not be available.\n\n", __LINE__) ; + exit_if_true (have_opus, "\n\nLine %d : Ogg/Opus should not be available.\n\n", __LINE__) ; + } ; puts ("ok") ; } /* subtype_format_test */ @@ -99,7 +114,7 @@ subtype_format_test (void) static void simple_format_test (void) { SF_FORMAT_INFO info ; - int have_flac = 0, have_ogg = 0, have_vorbis = 0 ; + int have_flac = 0, have_ogg = 0, have_vorbis = 0, have_opus = 0 ; int s, simple_count ; print_test_name (__func__, NULL) ; @@ -128,22 +143,62 @@ simple_format_test (void) have_vorbis = 1 ; break ; + case SF_FORMAT_OPUS : + have_opus = 1 ; + break ; + default : break ; } ; } ; - if (HAVE_EXTERNAL_LIBS) + if (HAVE_EXTERNAL_XIPH_LIBS) { exit_if_true (have_flac == 0, "\n\nLine %d : FLAC should be available.\n\n", __LINE__) ; exit_if_true (have_ogg == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; exit_if_true (have_vorbis == 0, "\n\nLine %d : Ogg/Vorbis should be available.\n\n", __LINE__) ; + exit_if_true (have_opus == 0, "\n\nLine %d : Ogg/Opus should be available.\n\n", __LINE__) ; } else { exit_if_true (have_flac, "\n\nLine %d : FLAC should not be available.\n\n", __LINE__) ; exit_if_true (have_ogg, "\n\nLine %d : Ogg/Vorbis should not be available.\n\n", __LINE__) ; exit_if_true (have_vorbis, "\n\nLine %d : Ogg/Vorbis should not be available.\n\n", __LINE__) ; + exit_if_true (have_opus, "\n\nLine %d : Ogg/Opus should not be available.\n\n", __LINE__) ; } ; puts ("ok") ; } /* simple_format_test */ + +static void +flac_subset_test (void) +{ float whatever [256] ; + SNDFILE *file ; + SF_INFO sfinfo ; + sf_count_t rc ; + int samplerate ; + const char *filename = "subset_test.flac" ; + + /* For some formats (like FLAC) the headers are written *just* before the + ** first bit of audio data. This test makes sure errors in that process + ** are caught. + */ + + print_test_name (__func__, NULL) ; + + for (samplerate = 65536 ; samplerate < 655350 ; samplerate *= 4) + { sfinfo.samplerate = samplerate ; + sfinfo.channels = 1 ; + sfinfo.frames = 0 ; + sfinfo.format = SF_FORMAT_FLAC | SF_FORMAT_PCM_16 ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + rc = sf_write_float (file, whatever, ARRAY_LEN (whatever)) ; + unlink (filename) ; + exit_if_true (rc != 0, "\n\nLine %d : return code (%d) should be 0.\n\n", __LINE__, (int) rc) ; + + sf_close (file) ; + } ; + + puts ("ok") ; +} /* flac_subset_test */ + diff --git a/lib-src/libsndfile/tests/fix_this.c b/lib-src/libsndfile/tests/fix_this.c index 8eabad279..5c697ea81 100644 --- a/lib-src/libsndfile/tests/fix_this.c +++ b/lib-src/libsndfile/tests/fix_this.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2014 Erik de Castro Lopo ** ** 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 @@ -16,17 +16,24 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include -#include -#include +#include "sfconfig.h" -#include +#include +#include +#include +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif +#include +#include -#include "utils.h" +#include -#define BUFFER_SIZE (1<<14) /* Should be (1<<14) */ +#include "utils.h" + +#define BUFFER_SIZE (1 << 14) #define SAMPLE_RATE (11025) #ifndef M_PI @@ -69,8 +76,9 @@ static void lcomp_test_int (const char *str, const char *filename, int filetype, double margin) { SNDFILE *file ; SF_INFO sfinfo ; - int k, m, *orig, *data, sum_abs ; - long datalen, seekpos ; + int k, m, *orig, *data ; + sf_count_t datalen, seekpos ; + int64_t sum_abs ; double scale ; printf ("\nThis is program is not part of the libsndfile test suite.\n\n") ; @@ -102,7 +110,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg } ; if ((k = sf_writef_int (file, orig, datalen)) != datalen) - { printf ("sf_writef_int failed with short write (%ld => %d).\n", datalen, k) ; + { printf ("sf_writef_int failed with short write (%" PRId64 " => %d).\n", datalen, k) ; exit (1) ; } ; sf_close (file) ; @@ -124,12 +132,12 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg } ; if (sfinfo.frames < datalen) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + datalen / 2)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; @@ -141,7 +149,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg check_log_buffer_or_die (file, __LINE__) ; if ((k = sf_readf_int (file, data, datalen)) != datalen) - { printf ("Line %d: short read (%d should be %ld).\n", __LINE__, k, datalen) ; + { printf ("Line %d: short read (%d should be %" PRId64 ").\n", __LINE__, k, datalen) ; exit (1) ; } ; @@ -152,7 +160,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg oct_save_int (orig, data, datalen) ; exit (1) ; } ; - sum_abs = abs (sum_abs + abs (data [k])) ; + sum_abs += abs (data [k]) ; } ; if (sum_abs < 1.0) @@ -161,7 +169,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg } ; if ((k = sf_readf_int (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("Line %d: Incorrect read length (%ld should be %d).\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames - datalen), k) ; + { printf ("Line %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__, sfinfo.frames - datalen, k) ; exit (1) ; } ; @@ -170,7 +178,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg */ if ((sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_MS_ADPCM) for (k = 0 ; k < sfinfo.frames - datalen ; k++) - if (abs (data [k] / scale) > decay_response (k)) + if (ABS (data [k] / scale) > decay_response (k)) { printf ("Line %d : Incorrect sample B (#%d : abs (%d) should be < %d).\n", __LINE__, k, data [k], decay_response (k)) ; exit (1) ; } ; @@ -209,7 +217,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg /* Check seek from start of file. */ if ((k = sf_seek (file, seekpos, SEEK_SET)) != seekpos) - { printf ("Seek to start of file + %ld failed (%d).\n", seekpos, k) ; + { printf ("Seek to start of file + %" PRId64 " failed (%d).\n", seekpos, k) ; exit (1) ; } ; @@ -224,7 +232,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg } ; if ((k = sf_seek (file, 0, SEEK_CUR)) != seekpos + 1) - { printf ("Line %d: sf_seek (SEEK_CUR) with 0 offset failed (%d should be %ld)\n", __LINE__, k, seekpos + 1) ; + { printf ("Line %d: sf_seek (SEEK_CUR) with 0 offset failed (%d should be %" PRId64 ")\n", __LINE__, k, seekpos + 1) ; exit (1) ; } ; @@ -232,7 +240,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg k = sf_seek (file, BUFFER_SIZE / 5, SEEK_CUR) ; sf_readf_int (file, data, 1) ; if (error_function ((double) data [0], (double) orig [seekpos], margin) || k != seekpos) - { printf ("Line %d: sf_seek (forwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %ld).\n", __LINE__, data [0], orig [seekpos], k, seekpos + 1) ; + { printf ("Line %d: sf_seek (forwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %" PRId64 ").\n", __LINE__, data [0], orig [seekpos], k, seekpos + 1) ; exit (1) ; } ; @@ -241,7 +249,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg k = sf_seek (file, -20, SEEK_CUR) ; sf_readf_int (file, data, 1) ; if (error_function ((double) data [0], (double) orig [seekpos], margin) || k != seekpos) - { printf ("sf_seek (backwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %ld).\n", data [0], orig [seekpos], k, seekpos) ; + { printf ("sf_seek (backwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %" PRId64 ").\n", data [0], orig [seekpos], k, seekpos) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/floating_point_test.c b/lib-src/libsndfile/tests/floating_point_test.c deleted file mode 100644 index aaf53866e..000000000 --- a/lib-src/libsndfile/tests/floating_point_test.c +++ /dev/null @@ -1,694 +0,0 @@ -/* -** Copyright (C) 1999-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#include - -#include "dft_cmp.h" -#include "utils.h" - -#define SAMPLE_RATE 16000 - -static void float_scaled_test (const char *filename, int allow_exit, int replace_float, int filetype, double target_snr) ; -static void double_scaled_test (const char *filename, int allow_exit, int replace_float, int filetype, double target_snr) ; - -static void float_short_little_test (const char * filename) ; -static void float_short_big_test (const char * filename) ; -static void float_int_little_test (const char * filename) ; -static void float_int_big_test (const char * filename) ; -static void double_short_little_test (const char * filename) ; -static void double_short_big_test (const char * filename) ; -static void double_int_little_test (const char * filename) ; -static void double_int_big_test (const char * filename) ; - - -static double double_data [DFT_DATA_LENGTH] ; -static double double_test [DFT_DATA_LENGTH] ; - -static float float_data [DFT_DATA_LENGTH] ; -static float float_test [DFT_DATA_LENGTH] ; - -static double double_data [DFT_DATA_LENGTH] ; -static short short_data [DFT_DATA_LENGTH] ; -static int int_data [DFT_DATA_LENGTH] ; - -int -main (int argc, char *argv []) -{ int allow_exit = 1 ; - - if (argc == 2 && ! strstr (argv [1], "no-exit")) - allow_exit = 0 ; - -#if ((HAVE_LRINTF == 0) && (HAVE_LRINT_REPLACEMENT == 0)) - puts ("*** Cannot run this test on this platform because it lacks lrintf().") ; - exit (0) ; -#endif - - /* Float tests. */ - float_scaled_test ("float.raw", allow_exit, SF_FALSE, SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, -163.0) ; - - /* Test both signed and unsigned 8 bit files. */ - float_scaled_test ("pcm_s8.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_S8, -39.0) ; - float_scaled_test ("pcm_u8.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_U8, -39.0) ; - - float_scaled_test ("pcm_16.raw", allow_exit, SF_FALSE, SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_16, -87.0) ; - float_scaled_test ("pcm_24.raw", allow_exit, SF_FALSE, SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_24, -138.0) ; - float_scaled_test ("pcm_32.raw", allow_exit, SF_FALSE, SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_32, -163.0) ; - - float_scaled_test ("ulaw.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_ULAW, -50.0) ; - float_scaled_test ("alaw.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_ALAW, -49.0) ; - - float_scaled_test ("ima_adpcm.wav", allow_exit, SF_FALSE, SF_FORMAT_WAV | SF_FORMAT_IMA_ADPCM, -47.0) ; - float_scaled_test ("ms_adpcm.wav" , allow_exit, SF_FALSE, SF_FORMAT_WAV | SF_FORMAT_MS_ADPCM, -40.0) ; - float_scaled_test ("gsm610.raw" , allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_GSM610, -33.0) ; - - float_scaled_test ("g721_32.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G721_32, -34.0) ; - float_scaled_test ("g723_24.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_24, -34.0) ; - float_scaled_test ("g723_40.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_40, -40.0) ; - - /* PAF files do not use the same encoding method for 24 bit PCM data as other file - ** formats so we need to explicitly test it here. - */ - float_scaled_test ("le_paf_24.paf", allow_exit, SF_FALSE, SF_ENDIAN_LITTLE | SF_FORMAT_PAF | SF_FORMAT_PCM_24, -149.0) ; - float_scaled_test ("be_paf_24.paf", allow_exit, SF_FALSE, SF_ENDIAN_BIG | SF_FORMAT_PAF | SF_FORMAT_PCM_24, -149.0) ; - - float_scaled_test ("dwvw_12.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DWVW_12, -64.0) ; - float_scaled_test ("dwvw_16.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DWVW_16, -92.0) ; - float_scaled_test ("dwvw_24.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DWVW_24, -151.0) ; - - float_scaled_test ("adpcm.vox", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM, -40.0) ; - - float_scaled_test ("dpcm_16.xi", allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_16, -90.0) ; - float_scaled_test ("dpcm_8.xi" , allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_8 , -41.0) ; - - float_scaled_test ("pcm_s8.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, -90.0) ; - float_scaled_test ("pcm_16.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_16, -140.0) ; - float_scaled_test ("pcm_24.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_24, -170.0) ; - -#if HAVE_EXTERNAL_LIBS - float_scaled_test ("flac_8.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, -39.0) ; - float_scaled_test ("flac_16.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_16, -87.0) ; - float_scaled_test ("flac_24.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_24, -138.0) ; - - float_scaled_test ("vorbis.oga", allow_exit, SF_FALSE, SF_FORMAT_OGG | SF_FORMAT_VORBIS, -31.0) ; -#endif - - float_scaled_test ("replace_float.raw", allow_exit, SF_TRUE, SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, -163.0) ; - - /*============================================================================== - ** Double tests. - */ - - double_scaled_test ("double.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -300.0) ; - - /* Test both signed (AIFF) and unsigned (WAV) 8 bit files. */ - double_scaled_test ("pcm_s8.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_S8, -39.0) ; - double_scaled_test ("pcm_u8.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_U8, -39.0) ; - - double_scaled_test ("pcm_16.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_16, -87.0) ; - double_scaled_test ("pcm_24.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_24, -135.0) ; - double_scaled_test ("pcm_32.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_32, -184.0) ; - - double_scaled_test ("ulaw.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_ULAW, -50.0) ; - double_scaled_test ("alaw.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_ALAW, -49.0) ; - - double_scaled_test ("ima_adpcm.wav", allow_exit, SF_FALSE, SF_FORMAT_WAV | SF_FORMAT_IMA_ADPCM, -47.0) ; - double_scaled_test ("ms_adpcm.wav" , allow_exit, SF_FALSE, SF_FORMAT_WAV | SF_FORMAT_MS_ADPCM, -40.0) ; - double_scaled_test ("gsm610.raw" , allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_GSM610, -33.0) ; - - double_scaled_test ("g721_32.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G721_32, -34.0) ; - double_scaled_test ("g723_24.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_24, -34.0) ; - double_scaled_test ("g723_40.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_40, -40.0) ; - - /* 24 bit PCM PAF files tested here. */ - double_scaled_test ("be_paf_24.paf", allow_exit, SF_FALSE, SF_ENDIAN_BIG | SF_FORMAT_PAF | SF_FORMAT_PCM_24, -151.0) ; - double_scaled_test ("le_paf_24.paf", allow_exit, SF_FALSE, SF_ENDIAN_LITTLE | SF_FORMAT_PAF | SF_FORMAT_PCM_24, -151.0) ; - - double_scaled_test ("dwvw_12.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DWVW_12, -64.0) ; - double_scaled_test ("dwvw_16.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DWVW_16, -92.0) ; - double_scaled_test ("dwvw_24.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DWVW_24, -151.0) ; - - double_scaled_test ("adpcm.vox" , allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM, -40.0) ; - - double_scaled_test ("dpcm_16.xi", allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_16, -90.0) ; - double_scaled_test ("dpcm_8.xi" , allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_8 , -42.0) ; - - double_scaled_test ("pcm_s8.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, -90.0) ; - double_scaled_test ("pcm_16.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_16, -140.0) ; - double_scaled_test ("pcm_24.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_24, -180.0) ; - -#if HAVE_EXTERNAL_LIBS - double_scaled_test ("flac_8.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, -39.0) ; - double_scaled_test ("flac_16.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_16, -87.0) ; - double_scaled_test ("flac_24.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_24, -138.0) ; - - double_scaled_test ("vorbis.oga", allow_exit, SF_FALSE, SF_FORMAT_OGG | SF_FORMAT_VORBIS, -29.0) ; -#endif - - double_scaled_test ("replace_double.raw", allow_exit, SF_TRUE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -300.0) ; - - putchar ('\n') ; - /* Float int tests. */ - float_short_little_test ("float_short_little.au") ; - float_short_big_test ("float_short_big.au") ; - float_int_little_test ("float_int_little.au") ; - float_int_big_test ("float_int_big.au") ; - double_short_little_test ("double_short_little.au") ; - double_short_big_test ("double_short_big.au") ; - double_int_little_test ("double_int_little.au") ; - double_int_big_test ("double_int_big.au") ; - - - return 0 ; -} /* main */ - -/*============================================================================================ - * Here are the test functions. - */ - -static void -float_scaled_test (const char *filename, int allow_exit, int replace_float, int filetype, double target_snr) -{ SNDFILE *file ; - SF_INFO sfinfo ; - double snr ; - - print_test_name ("float_scaled_test", filename) ; - - gen_windowed_sine_float (float_data, DFT_DATA_LENGTH, 1.0) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DFT_DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - - test_write_float_or_die (file, 0, float_data, DFT_DATA_LENGTH, __LINE__) ; - - sf_close (file) ; - - memset (float_test, 0, sizeof (float_test)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - - exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_float_or_die (file, 0, float_test, DFT_DATA_LENGTH, __LINE__) ; - - sf_close (file) ; - - snr = dft_cmp_float (__LINE__, float_data, float_test, DFT_DATA_LENGTH, target_snr, allow_exit) ; - - exit_if_true (snr > target_snr, "% 6.1fdB SNR\n\n Error : should be better than % 6.1fdB\n\n", snr, target_snr) ; - - printf ("% 6.1fdB SNR ... ok\n", snr) ; - - unlink (filename) ; - - return ; -} /* float_scaled_test */ - -static void -double_scaled_test (const char *filename, int allow_exit, int replace_float, int filetype, double target_snr) -{ SNDFILE *file ; - SF_INFO sfinfo ; - double snr ; - - print_test_name ("double_scaled_test", filename) ; - - gen_windowed_sine_double (double_data, DFT_DATA_LENGTH, 0.95) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DFT_DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - - test_write_double_or_die (file, 0, double_data, DFT_DATA_LENGTH, __LINE__) ; - - sf_close (file) ; - - memset (double_test, 0, sizeof (double_test)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - - exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_double_or_die (file, 0, double_test, DFT_DATA_LENGTH, __LINE__) ; - - sf_close (file) ; - - snr = dft_cmp_double (__LINE__, double_data, double_test, DFT_DATA_LENGTH, target_snr, allow_exit) ; - - exit_if_true (snr > target_snr, "% 6.1fdB SNR\n\n Error : should be better than % 6.1fdB\n\n", snr, target_snr) ; - - printf ("% 6.1fdB SNR ... ok\n", snr) ; - - unlink (filename) ; - - return ; -} /* double_scaled_test */ - -/*============================================================================== -*/ - - -static void -float_short_little_test (const char * filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - unsigned k, max ; - - print_test_name ("float_short_little_test", filename) ; - - gen_windowed_sine_float (float_data, ARRAY_LEN (float_data), 0.98) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = ARRAY_LEN (short_data) ; - sfinfo.channels = 1 ; - sfinfo.format = SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_FLOAT ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_float_or_die (file, 0, float_data, ARRAY_LEN (float_data), __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.frames != ARRAY_LEN (float_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - test_read_short_or_die (file, 0, short_data, ARRAY_LEN (short_data), __LINE__) ; - sf_close (file) ; - - max = 0 ; - for (k = 0 ; k < ARRAY_LEN (short_data) ; k++) - if ((unsigned) abs (short_data [k]) > max) - max = abs (short_data [k]) ; - - if (1.0 * abs (max - 0x7FFF) / 0x7FFF > 0.01) - { printf ("\n\nLine %d: Bad maximum (%d should be %d).\n\n", __LINE__, max, 0x7FFF) ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* float_short_little_test */ - -static void -float_short_big_test (const char * filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - unsigned k, max ; - - print_test_name ("float_short_big_test", filename) ; - - gen_windowed_sine_float (float_data, ARRAY_LEN (float_data), 0.98) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = ARRAY_LEN (short_data) ; - sfinfo.channels = 1 ; - sfinfo.format = SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_FLOAT ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_float_or_die (file, 0, float_data, ARRAY_LEN (float_data), __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.frames != ARRAY_LEN (float_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - test_read_short_or_die (file, 0, short_data, ARRAY_LEN (short_data), __LINE__) ; - sf_close (file) ; - - max = 0 ; - for (k = 0 ; k < ARRAY_LEN (short_data) ; k++) - if ((unsigned) abs (short_data [k]) > max) - max = abs (short_data [k]) ; - - if (1.0 * abs (max - 0x7FFF) / 0x7FFF > 0.01) - { printf ("\n\nLine %d: Bad maximum (%d should be %d).\n\n", __LINE__, max, 0x7FFF) ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* float_short_big_test */ - -static void -float_int_little_test (const char * filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - unsigned k, max ; - - print_test_name ("float_int_little_test", filename) ; - - gen_windowed_sine_float (float_data, ARRAY_LEN (float_data), 0.98) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = ARRAY_LEN (int_data) ; - sfinfo.channels = 1 ; - sfinfo.format = SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_FLOAT ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_float_or_die (file, 0, float_data, ARRAY_LEN (float_data), __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.frames != ARRAY_LEN (float_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - test_read_int_or_die (file, 0, int_data, ARRAY_LEN (int_data), __LINE__) ; - sf_close (file) ; - - max = 0 ; - for (k = 0 ; k < ARRAY_LEN (int_data) ; k++) - if ((unsigned) abs (int_data [k]) > max) - max = abs (int_data [k]) ; - - if (1.0 * abs (max - 0x7FFFFFFF) / 0x7FFFFFFF > 0.01) - { printf ("\n\nLine %d: Bad maximum (%d should be %d).\n\n", __LINE__, max, 0x7FFFFFFF) ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* float_int_little_test */ - -static void -float_int_big_test (const char * filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - unsigned k, max ; - - print_test_name ("float_int_big_test", filename) ; - - gen_windowed_sine_float (float_data, ARRAY_LEN (float_data), 0.98) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = ARRAY_LEN (int_data) ; - sfinfo.channels = 1 ; - sfinfo.format = SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_FLOAT ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_float_or_die (file, 0, float_data, ARRAY_LEN (float_data), __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.frames != ARRAY_LEN (float_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - test_read_int_or_die (file, 0, int_data, ARRAY_LEN (int_data), __LINE__) ; - sf_close (file) ; - - max = 0 ; - for (k = 0 ; k < ARRAY_LEN (int_data) ; k++) - if ((unsigned) abs (int_data [k]) > max) - max = abs (int_data [k]) ; - - if (1.0 * abs (max - 0x7FFFFFFF) / 0x7FFFFFFF > 0.01) - { printf ("\n\nLine %d: Bad maximum (%d should be %d).\n\n", __LINE__, max, 0x7FFFFFFF) ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* float_int_big_test */ - -static void -double_short_little_test (const char * filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - unsigned k, max ; - - print_test_name ("double_short_little_test", filename) ; - - gen_windowed_sine_double (double_data, ARRAY_LEN (double_data), 0.98) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = ARRAY_LEN (short_data) ; - sfinfo.channels = 1 ; - sfinfo.format = SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_DOUBLE ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_double_or_die (file, 0, double_data, ARRAY_LEN (double_data), __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.frames != ARRAY_LEN (double_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - test_read_short_or_die (file, 0, short_data, ARRAY_LEN (short_data), __LINE__) ; - sf_close (file) ; - - max = 0 ; - for (k = 0 ; k < ARRAY_LEN (short_data) ; k++) - if ((unsigned) abs (short_data [k]) > max) - max = abs (short_data [k]) ; - - if (1.0 * abs (max - 0x7FFF) / 0x7FFF > 0.01) - { printf ("\n\nLine %d: Bad maximum (%d should be %d).\n\n", __LINE__, max, 0x7FFF) ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* double_short_little_test */ - -static void -double_short_big_test (const char * filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - unsigned k, max ; - - print_test_name ("double_short_big_test", filename) ; - - gen_windowed_sine_double (double_data, ARRAY_LEN (double_data), 0.98) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = ARRAY_LEN (short_data) ; - sfinfo.channels = 1 ; - sfinfo.format = SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_DOUBLE ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_double_or_die (file, 0, double_data, ARRAY_LEN (double_data), __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.frames != ARRAY_LEN (double_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - test_read_short_or_die (file, 0, short_data, ARRAY_LEN (short_data), __LINE__) ; - sf_close (file) ; - - max = 0 ; - for (k = 0 ; k < ARRAY_LEN (short_data) ; k++) - if ((unsigned) abs (short_data [k]) > max) - max = abs (short_data [k]) ; - - if (1.0 * abs (max - 0x7FFF) / 0x7FFF > 0.01) - { printf ("\n\nLine %d: Bad maximum (%d should be %d).\n\n", __LINE__, max, 0x7FFF) ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* double_short_big_test */ - -static void -double_int_little_test (const char * filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - unsigned k, max ; - - print_test_name ("double_int_little_test", filename) ; - - gen_windowed_sine_double (double_data, ARRAY_LEN (double_data), 0.98) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = ARRAY_LEN (int_data) ; - sfinfo.channels = 1 ; - sfinfo.format = SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_DOUBLE ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_double_or_die (file, 0, double_data, ARRAY_LEN (double_data), __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.frames != ARRAY_LEN (double_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - test_read_int_or_die (file, 0, int_data, ARRAY_LEN (int_data), __LINE__) ; - sf_close (file) ; - - max = 0 ; - for (k = 0 ; k < ARRAY_LEN (int_data) ; k++) - if ((unsigned) abs (int_data [k]) > max) - max = abs (int_data [k]) ; - - if (1.0 * abs (max - 0x7FFFFFFF) / 0x7FFFFFFF > 0.01) - { printf ("\n\nLine %d: Bad maximum (%d should be %d).\n\n", __LINE__, max, 0x7FFFFFFF) ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* double_int_little_test */ - -static void -double_int_big_test (const char * filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - unsigned k, max ; - - print_test_name ("double_int_big_test", filename) ; - - gen_windowed_sine_double (double_data, ARRAY_LEN (double_data), 0.98) ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = ARRAY_LEN (int_data) ; - sfinfo.channels = 1 ; - sfinfo.format = SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_DOUBLE ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_double_or_die (file, 0, double_data, ARRAY_LEN (double_data), __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.frames != ARRAY_LEN (double_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - test_read_int_or_die (file, 0, int_data, ARRAY_LEN (int_data), __LINE__) ; - sf_close (file) ; - - max = 0 ; - for (k = 0 ; k < ARRAY_LEN (int_data) ; k++) - if ((unsigned) abs (int_data [k]) > max) - max = abs (int_data [k]) ; - - if (1.0 * abs (max - 0x7FFFFFFF) / 0x7FFFFFFF > 0.01) - { printf ("\n\nLine %d: Bad maximum (%d should be %d).\n\n", __LINE__, max, 0x7FFFFFFF) ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* double_int_big_test */ - - diff --git a/lib-src/libsndfile/tests/floating_point_test.def b/lib-src/libsndfile/tests/floating_point_test.def index 3441d34bc..e368ddf45 100644 --- a/lib-src/libsndfile/tests/floating_point_test.def +++ b/lib-src/libsndfile/tests/floating_point_test.def @@ -22,11 +22,11 @@ float_type = { int_type = { int_name = short ; - int_max = 0x7FFF ; + int_max = "0x7FFF" ; } ; int_type = { int_name = int ; - int_max = 0x7FFFFFFF ; + int_max = "0x7FFFFFFF" ; } ; diff --git a/lib-src/libsndfile/tests/floating_point_test.tpl b/lib-src/libsndfile/tests/floating_point_test.tpl index 2bb6b867d..7258fa235 100644 --- a/lib-src/libsndfile/tests/floating_point_test.tpl +++ b/lib-src/libsndfile/tests/floating_point_test.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** 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 @@ -23,9 +23,12 @@ #include #include #include +#include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -60,13 +63,14 @@ main (int argc, char *argv []) if (argc == 2 && ! strstr (argv [1], "no-exit")) allow_exit = 0 ; -#if ((HAVE_LRINTF == 0) && (HAVE_LRINT_REPLACEMENT == 0)) +#if (HAVE_LRINTF == 0) puts ("*** Cannot run this test on this platform because it lacks lrintf().") ; exit (0) ; #endif /* Float tests. */ - float_scaled_test ("float.raw", allow_exit, SF_FALSE, SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, -163.0) ; + float_scaled_test ("float.raw", allow_exit, SF_FALSE, SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, + OS_IS_OPENBSD ? -98.0 : -163.0) ; /* Test both signed and unsigned 8 bit files. */ float_scaled_test ("pcm_s8.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_S8, -39.0) ; @@ -83,8 +87,8 @@ main (int argc, char *argv []) float_scaled_test ("ms_adpcm.wav" , allow_exit, SF_FALSE, SF_FORMAT_WAV | SF_FORMAT_MS_ADPCM, -40.0) ; float_scaled_test ("gsm610.raw" , allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_GSM610, -33.0) ; - float_scaled_test ("g721_32.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G721_32, -34.0) ; - float_scaled_test ("g723_24.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_24, -34.0) ; + float_scaled_test ("g721_32.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G721_32, -32.3) ; + float_scaled_test ("g723_24.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_24, -32.3) ; float_scaled_test ("g723_40.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_40, -40.0) ; /* PAF files do not use the same encoding method for 24 bit PCM data as other file @@ -102,16 +106,23 @@ main (int argc, char *argv []) float_scaled_test ("dpcm_16.xi", allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_16, -90.0) ; float_scaled_test ("dpcm_8.xi" , allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_8 , -41.0) ; - float_scaled_test ("pcm_s8.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, -90.0) ; - float_scaled_test ("pcm_16.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_16, -140.0) ; + float_scaled_test ("pcm_s8.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, -89.0) ; + float_scaled_test ("pcm_16.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_16, -132.0) ; float_scaled_test ("pcm_24.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_24, -170.0) ; -#if HAVE_EXTERNAL_LIBS + float_scaled_test ("alac_16.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_16, -90.0) ; + float_scaled_test ("alac_32.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_32, -76.0) ; + float_scaled_test ("alac_24.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_24, -153.0) ; + float_scaled_test ("alac_20.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_20, -125.0) ; + +#if HAVE_EXTERNAL_XIPH_LIBS float_scaled_test ("flac_8.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, -39.0) ; float_scaled_test ("flac_16.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_16, -87.0) ; float_scaled_test ("flac_24.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_24, -138.0) ; float_scaled_test ("vorbis.oga", allow_exit, SF_FALSE, SF_FORMAT_OGG | SF_FORMAT_VORBIS, -31.0) ; + + float_scaled_test ("opus.opus", allow_exit, SF_FALSE, SF_FORMAT_OGG | SF_FORMAT_OPUS, -32.0) ; #endif float_scaled_test ("replace_float.raw", allow_exit, SF_TRUE, SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, -163.0) ; @@ -120,7 +131,7 @@ main (int argc, char *argv []) ** Double tests. */ - double_scaled_test ("double.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -300.0) ; + double_scaled_test ("double.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -201.0) ; /* Test both signed (AIFF) and unsigned (WAV) 8 bit files. */ double_scaled_test ("pcm_s8.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_S8, -39.0) ; @@ -137,8 +148,8 @@ main (int argc, char *argv []) double_scaled_test ("ms_adpcm.wav" , allow_exit, SF_FALSE, SF_FORMAT_WAV | SF_FORMAT_MS_ADPCM, -40.0) ; double_scaled_test ("gsm610.raw" , allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_GSM610, -33.0) ; - double_scaled_test ("g721_32.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G721_32, -34.0) ; - double_scaled_test ("g723_24.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_24, -34.0) ; + double_scaled_test ("g721_32.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G721_32, -32.3) ; + double_scaled_test ("g723_24.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_24, -32.3) ; double_scaled_test ("g723_40.au", allow_exit, SF_FALSE, SF_FORMAT_AU | SF_FORMAT_G723_40, -40.0) ; /* 24 bit PCM PAF files tested here. */ @@ -152,21 +163,27 @@ main (int argc, char *argv []) double_scaled_test ("adpcm.vox" , allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM, -40.0) ; double_scaled_test ("dpcm_16.xi", allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_16, -90.0) ; - double_scaled_test ("dpcm_8.xi" , allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_8 , -42.0) ; + double_scaled_test ("dpcm_8.xi" , allow_exit, SF_FALSE, SF_FORMAT_XI | SF_FORMAT_DPCM_8 , -41.0) ; - double_scaled_test ("pcm_s8.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, -90.0) ; - double_scaled_test ("pcm_16.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_16, -140.0) ; + double_scaled_test ("pcm_s8.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, -89.0) ; + double_scaled_test ("pcm_16.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_16, -132.0) ; double_scaled_test ("pcm_24.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_24, -180.0) ; -#if HAVE_EXTERNAL_LIBS + double_scaled_test ("alac_16.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_16, -90.0) ; + double_scaled_test ("alac_20.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_20, -125.0) ; + double_scaled_test ("alac_24.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_24, -153.0) ; + double_scaled_test ("alac_32.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_32, -186.0) ; + +#if HAVE_EXTERNAL_XIPH_LIBS double_scaled_test ("flac_8.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, -39.0) ; double_scaled_test ("flac_16.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_16, -87.0) ; double_scaled_test ("flac_24.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_24, -138.0) ; double_scaled_test ("vorbis.oga", allow_exit, SF_FALSE, SF_FORMAT_OGG | SF_FORMAT_VORBIS, -29.0) ; + double_scaled_test ("opus.opus", allow_exit, SF_FALSE, SF_FORMAT_OGG | SF_FORMAT_OPUS, -32.0) ; #endif - double_scaled_test ("replace_double.raw", allow_exit, SF_TRUE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -300.0) ; + double_scaled_test ("replace_double.raw", allow_exit, SF_TRUE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -201.0) ; putchar ('\n') ; /* Float int tests. */ @@ -187,11 +204,13 @@ float_scaled_test (const char *filename, int allow_exit, int replace_float, int { SNDFILE *file ; SF_INFO sfinfo ; double snr ; + int byterate ; print_test_name ("float_scaled_test", filename) ; - gen_windowed_sine_float (float_data, DFT_DATA_LENGTH, 1.0) ; + gen_windowed_sine_float (float_data, DFT_DATA_LENGTH, 0.9999) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = SAMPLE_RATE ; sfinfo.frames = DFT_DATA_LENGTH ; sfinfo.channels = 1 ; @@ -210,13 +229,16 @@ float_scaled_test (const char *filename, int allow_exit, int replace_float, int sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; + exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ; exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; check_log_buffer_or_die (file, __LINE__) ; test_read_float_or_die (file, 0, float_test, DFT_DATA_LENGTH, __LINE__) ; + byterate = sf_current_byterate (file) ; + exit_if_true (byterate <= 0, "\n\nLine %d: byterate is zero.\n", __LINE__) ; + sf_close (file) ; snr = dft_cmp_float (__LINE__, float_data, float_test, DFT_DATA_LENGTH, target_snr, allow_exit) ; @@ -235,11 +257,13 @@ double_scaled_test (const char *filename, int allow_exit, int replace_float, int { SNDFILE *file ; SF_INFO sfinfo ; double snr ; + int byterate ; print_test_name ("double_scaled_test", filename) ; - gen_windowed_sine_double (double_data, DFT_DATA_LENGTH, 0.95) ; + gen_windowed_sine_double (double_data, DFT_DATA_LENGTH, 0.9999) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = SAMPLE_RATE ; sfinfo.frames = DFT_DATA_LENGTH ; sfinfo.channels = 1 ; @@ -258,13 +282,16 @@ double_scaled_test (const char *filename, int allow_exit, int replace_float, int sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; + exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ; exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; check_log_buffer_or_die (file, __LINE__) ; test_read_double_or_die (file, 0, double_test, DFT_DATA_LENGTH, __LINE__) ; + byterate = sf_current_byterate (file) ; + exit_if_true (byterate <= 0, "\n\nLine %d: byterate is zero.\n", __LINE__) ; + sf_close (file) ; snr = dft_cmp_double (__LINE__, double_data, double_test, DFT_DATA_LENGTH, target_snr, allow_exit) ; @@ -287,12 +314,14 @@ static void [+ (get "float_name") +]_[+ (get "int_name") +]_[+ (get "end_name") +]_test (const char * filename) { SNDFILE *file ; SF_INFO sfinfo ; - unsigned k, max ; + int max ; + unsigned k ; print_test_name ("[+ (get "float_name") +]_[+ (get "int_name") +]_[+ (get "end_name") +]_test", filename) ; - gen_windowed_sine_[+ (get "float_name") +] ([+ (get "float_name") +]_data, ARRAY_LEN ([+ (get "float_name") +]_data), 0.98) ; + gen_windowed_sine_[+ (get "float_name") +] ([+ (get "float_name") +]_data, ARRAY_LEN ([+ (get "float_name") +]_data), 0.9999) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = SAMPLE_RATE ; sfinfo.frames = ARRAY_LEN ([+ (get "int_name") +]_data) ; sfinfo.channels = 1 ; @@ -305,7 +334,7 @@ static void file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; if (sfinfo.frames != ARRAY_LEN ([+ (get "float_name") +]_data)) - { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ; + { printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ; exit (1) ; } ; @@ -321,7 +350,7 @@ static void max = 0 ; for (k = 0 ; k < ARRAY_LEN ([+ (get "int_name") +]_data) ; k++) - if ((unsigned) abs ([+ (get "int_name") +]_data [k]) > max) + if (abs ([+ (get "int_name") +]_data [k]) > max) max = abs ([+ (get "int_name") +]_data [k]) ; if (1.0 * abs (max - [+ (get "int_max") +]) / [+ (get "int_max") +] > 0.01) diff --git a/lib-src/libsndfile/tests/format_check_test.c b/lib-src/libsndfile/tests/format_check_test.c new file mode 100644 index 000000000..7ab71c9b3 --- /dev/null +++ b/lib-src/libsndfile/tests/format_check_test.c @@ -0,0 +1,156 @@ +/* +** Copyright (C) 2011-2017 Erik de Castro Lopo +** +** 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-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include "sndfile.h" +#include "utils.h" + +static void format_error_test (void) ; +static void format_combo_test (void) ; + +int +main (void) +{ + format_error_test () ; + format_combo_test () ; + + return 0 ; +} /* main */ + +/*============================================================================== +*/ + +static void +format_error_test (void) +{ const char *filename = "format-error.wav" ; + SNDFILE *file ; + SF_INFO info ; + + print_test_name (__func__, NULL) ; + + memset (&info, 0, sizeof (info)) ; + info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 ; + info.channels = 1 ; + info.samplerate = 44100 ; + + info.format = SF_FORMAT_WAV ; + file = sf_open (filename, SFM_WRITE, &info) ; + exit_if_true (file != NULL, "\n\nLine %d : Format should not be valid.\n\n", __LINE__) ; + exit_if_true ( + strstr (sf_strerror (NULL), "minor format") == NULL, + "\n\nLine %d : Error string should reference bad 'minor format'.\n\n", __LINE__ + ) ; + + info.format = SF_FORMAT_PCM_16 ; + file = sf_open (filename, SFM_WRITE, &info) ; + exit_if_true (file != NULL, "\n\nLine %d : Format should not be valid.\n\n", __LINE__) ; + exit_if_true ( + strstr (sf_strerror (NULL), "major format") == NULL, + "\n\nLine %d : Error string should reference bad 'major format'.\n\n", __LINE__ + ) ; + + unlink (filename) ; + puts ("ok") ; +} /* format_error_test */ + +static void +format_combo_test (void) +{ int container_max, codec_max, cont, codec ; + + print_test_name (__func__, NULL) ; + + sf_command (NULL, SFC_GET_FORMAT_MAJOR_COUNT, &container_max, sizeof (container_max)) ; + sf_command (NULL, SFC_GET_FORMAT_SUBTYPE_COUNT, &codec_max, sizeof (codec_max)) ; + + for (cont = 0 ; cont < container_max + 10 ; cont ++) + { SF_FORMAT_INFO major_fmt_info ; + + memset (&major_fmt_info, 0, sizeof (major_fmt_info)) ; + major_fmt_info.format = cont ; + (void) sf_command (NULL, SFC_GET_FORMAT_MAJOR, &major_fmt_info, sizeof (major_fmt_info)) ; + + for (codec = 0 ; codec < codec_max + 10 ; codec ++) + { SF_FORMAT_INFO subtype_fmt_info ; + SNDFILE * sndfile ; + SF_INFO info ; + char filename [128] ; + int subtype_is_valid, check_is_valid ; + + memset (&info, 0, sizeof (info)) ; + memset (&subtype_fmt_info, 0, sizeof (subtype_fmt_info)) ; + subtype_fmt_info.format = codec ; + subtype_is_valid = sf_command (NULL, SFC_GET_FORMAT_SUBTYPE, &subtype_fmt_info, sizeof (subtype_fmt_info)) == 0 ; + + /* Opus only works with a fixed set of sample rates. */ + if (subtype_fmt_info.format == SF_FORMAT_OPUS) + sf_info_setup (&info, major_fmt_info.format | subtype_fmt_info.format, 24000, 1) ; + else + sf_info_setup (&info, major_fmt_info.format | subtype_fmt_info.format, 22050, 1) ; + + check_is_valid = sf_format_check (&info) ; + + exit_if_true ( + NOT (subtype_is_valid) && check_is_valid, + "\n\nLine %d : Subtype is not valid but checks ok.\n", + __LINE__ + ) ; + + snprintf (filename, sizeof (filename), "format-check.%s", major_fmt_info.extension) ; + + sndfile = sf_open (filename, SFM_WRITE, &info) ; + + sf_close (sndfile) ; + unlink (filename) ; + + if (major_fmt_info.extension != NULL && strcmp (major_fmt_info.extension, "sd2") == 0) + { snprintf (filename, sizeof (filename), "._format-check.%s", major_fmt_info.extension) ; + unlink (filename) ; + } ; + + exit_if_true ( + sndfile && NOT (check_is_valid), + "\n\nError : Format was not valid but file opened correctly.\n" + " Container : %s\n" + " Codec : %s\n\n", + major_fmt_info.name, subtype_fmt_info.name + ) ; + + exit_if_true ( + NOT (sndfile) && check_is_valid, + "\n\nError : Format was valid but file failed to open.\n" + " Container : %s\n" + " Codec : %s\n\n", + major_fmt_info.name, subtype_fmt_info.name + ) ; + } ; + } ; + + puts ("ok") ; +} /* format_combo_test */ + diff --git a/lib-src/libsndfile/tests/generate.c b/lib-src/libsndfile/tests/generate.c index d759385ce..87efbb44e 100644 --- a/lib-src/libsndfile/tests/generate.c +++ b/lib-src/libsndfile/tests/generate.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2007-2011 Erik de Castro Lopo +** Copyright (C) 2007-2012 Erik de Castro Lopo ** ** 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 @@ -16,6 +16,8 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "sfconfig.h" + #include #include #include @@ -26,7 +28,7 @@ #include "utils.h" #include "generate.h" -#define SF_MAX(x,y) ((x) > (y) ? (x) : (y)) +#define SF_MAX(x, y) ((x) > (y) ? (x) : (y)) static float crappy_snare (float *output, int len, int offset, float gain, float maxabs) ; diff --git a/lib-src/libsndfile/tests/header_test.c b/lib-src/libsndfile/tests/header_test.c deleted file mode 100644 index 78333d934..000000000 --- a/lib-src/libsndfile/tests/header_test.c +++ /dev/null @@ -1,743 +0,0 @@ -/* -** Copyright (C) 2001-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include -#include - -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#if (HAVE_DECL_S_IRGRP == 0) -#include -#endif - -#if (defined (WIN32) || defined (_WIN32)) -#include -#include -#endif - -#include - -#include "utils.h" - -#define BUFFER_LEN (1<<10) -#define LOG_BUFFER_SIZE 1024 - -static void update_header_test (const char *filename, int typemajor) ; - -static void update_seek_short_test (const char *filename, int filetype) ; -static void update_seek_int_test (const char *filename, int filetype) ; -static void update_seek_float_test (const char *filename, int filetype) ; -static void update_seek_double_test (const char *filename, int filetype) ; - - -static void extra_header_test (const char *filename, int filetype) ; - -static void header_shrink_test (const char *filename, int filetype) ; - -/* Force the start of this buffer to be double aligned. Sparc-solaris will -** choke if its not. -*/ -static int data_out [BUFFER_LEN] ; -static int data_in [BUFFER_LEN] ; - -int -main (int argc, char *argv []) -{ int do_all = 0 ; - int test_count = 0 ; - - if (argc != 2) - { printf ("Usage : %s \n", argv [0]) ; - printf (" Where is one of the following:\n") ; - printf (" wav - test WAV file peak chunk\n") ; - printf (" aiff - test AIFF file PEAK chunk\n") ; - printf (" all - perform all tests\n") ; - exit (1) ; - } ; - - do_all=!strcmp (argv [1], "all") ; - - if (do_all || ! strcmp (argv [1], "wav")) - { update_header_test ("header.wav", SF_FORMAT_WAV) ; - update_seek_short_test ("header_short.wav", SF_FORMAT_WAV) ; - update_seek_int_test ("header_int.wav", SF_FORMAT_WAV) ; - update_seek_float_test ("header_float.wav", SF_FORMAT_WAV) ; - update_seek_double_test ("header_double.wav", SF_FORMAT_WAV) ; - header_shrink_test ("header_shrink.wav", SF_FORMAT_WAV) ; - extra_header_test ("extra.wav", SF_FORMAT_WAV) ; - - update_header_test ("header.wavex", SF_FORMAT_WAVEX) ; - update_seek_short_test ("header_short.wavex", SF_FORMAT_WAVEX) ; - update_seek_int_test ("header_int.wavex", SF_FORMAT_WAVEX) ; - update_seek_float_test ("header_float.wavex", SF_FORMAT_WAVEX) ; - update_seek_double_test ("header_double.wavex", SF_FORMAT_WAVEX) ; - header_shrink_test ("header_shrink.wavex", SF_FORMAT_WAVEX) ; - extra_header_test ("extra.wavex", SF_FORMAT_WAVEX) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "aiff")) - { update_header_test ("header.aiff", SF_FORMAT_AIFF) ; - update_seek_short_test ("header_short.aiff", SF_FORMAT_AIFF) ; - update_seek_int_test ("header_int.aiff", SF_FORMAT_AIFF) ; - update_seek_float_test ("header_float.aiff", SF_FORMAT_AIFF) ; - update_seek_double_test ("header_double.aiff", SF_FORMAT_AIFF) ; - header_shrink_test ("header_shrink.wav", SF_FORMAT_AIFF) ; - extra_header_test ("extra.aiff", SF_FORMAT_AIFF) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "au")) - { update_header_test ("header.au", SF_FORMAT_AU) ; - update_seek_short_test ("header_short.au", SF_FORMAT_AU) ; - update_seek_int_test ("header_int.au", SF_FORMAT_AU) ; - update_seek_float_test ("header_float.au", SF_FORMAT_AU) ; - update_seek_double_test ("header_double.au", SF_FORMAT_AU) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "caf")) - { update_header_test ("header.caf", SF_FORMAT_CAF) ; - update_seek_short_test ("header_short.caf", SF_FORMAT_CAF) ; - update_seek_int_test ("header_int.caf", SF_FORMAT_CAF) ; - update_seek_float_test ("header_float.caf", SF_FORMAT_CAF) ; - update_seek_double_test ("header_double.caf", SF_FORMAT_CAF) ; - /* extra_header_test ("extra.caf", SF_FORMAT_CAF) ; */ - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "nist")) - { update_header_test ("header.nist", SF_FORMAT_NIST) ; - update_seek_short_test ("header_short.nist", SF_FORMAT_NIST) ; - update_seek_int_test ("header_int.nist", SF_FORMAT_NIST) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "paf")) - { update_header_test ("header.paf", SF_FORMAT_PAF) ; - update_seek_short_test ("header_short.paf", SF_FORMAT_PAF) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "ircam")) - { update_header_test ("header.ircam", SF_FORMAT_IRCAM) ; - update_seek_short_test ("header_short.ircam", SF_FORMAT_IRCAM) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "w64")) - { update_header_test ("header.w64", SF_FORMAT_W64) ; - update_seek_short_test ("header_short.w64", SF_FORMAT_W64) ; - update_seek_int_test ("header_int.w64", SF_FORMAT_W64) ; - update_seek_float_test ("header_float.w64", SF_FORMAT_W64) ; - update_seek_double_test ("header_double.w64", SF_FORMAT_W64) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "rf64")) - { update_header_test ("header.rf64", SF_FORMAT_RF64) ; - update_seek_short_test ("header_short.rf64", SF_FORMAT_RF64) ; - update_seek_int_test ("header_int.rf64", SF_FORMAT_RF64) ; - update_seek_float_test ("header_float.rf64", SF_FORMAT_RF64) ; - update_seek_double_test ("header_double.rf64", SF_FORMAT_RF64) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "mat4")) - { update_header_test ("header.mat4", SF_FORMAT_MAT4) ; - update_seek_short_test ("header_short.mat4", SF_FORMAT_MAT4) ; - update_seek_int_test ("header_int.mat4", SF_FORMAT_MAT4) ; - update_seek_float_test ("header_float.mat4", SF_FORMAT_MAT4) ; - update_seek_double_test ("header_double.mat4", SF_FORMAT_MAT4) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "mat5")) - { update_header_test ("header.mat5", SF_FORMAT_MAT5) ; - update_seek_short_test ("header_short.mat5", SF_FORMAT_MAT5) ; - update_seek_int_test ("header_int.mat5", SF_FORMAT_MAT5) ; - update_seek_float_test ("header_float.mat5", SF_FORMAT_MAT5) ; - update_seek_double_test ("header_double.mat5", SF_FORMAT_MAT5) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "pvf")) - { update_header_test ("header.pvf", SF_FORMAT_PVF) ; - update_seek_short_test ("header_short.pvf", SF_FORMAT_PVF) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "avr")) - { update_header_test ("header.avr", SF_FORMAT_AVR) ; - update_seek_short_test ("header_short.avr", SF_FORMAT_AVR) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "htk")) - { update_header_test ("header.htk", SF_FORMAT_HTK) ; - update_seek_short_test ("header_short.htk", SF_FORMAT_HTK) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "svx")) - { update_header_test ("header.svx", SF_FORMAT_SVX) ; - update_seek_short_test ("header_short.svx", SF_FORMAT_SVX) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "voc")) - { update_header_test ("header.voc", SF_FORMAT_VOC) ; - /*-update_seek_short_test ("header_short.voc", SF_FORMAT_VOC) ;-*/ - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "sds")) - { update_header_test ("header.sds", SF_FORMAT_SDS) ; - /*-update_seek_short_test ("header_short.sds", SF_FORMAT_SDS) ;-*/ - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "mpc2k")) - { update_header_test ("header.mpc", SF_FORMAT_MPC2K) ; - update_seek_short_test ("header_short.mpc", SF_FORMAT_MPC2K) ; - test_count++ ; - } ; - - if (test_count == 0) - { printf ("Mono : ************************************\n") ; - printf ("Mono : * No '%s' test defined.\n", argv [1]) ; - printf ("Mono : ************************************\n") ; - return 1 ; - } ; - - return 0 ; -} /* main */ - - -/*============================================================================================ -** Here are the test functions. -*/ - -static void -update_header_sub (const char *filename, int typemajor, int write_mode) -{ SNDFILE *outfile, *infile ; - SF_INFO sfinfo ; - int k, frames ; - - sfinfo.samplerate = 44100 ; - sfinfo.format = (typemajor | SF_FORMAT_PCM_16) ; - sfinfo.channels = 1 ; - sfinfo.frames = 0 ; - - frames = BUFFER_LEN / sfinfo.channels ; - - outfile = test_open_file_or_die (filename, write_mode, &sfinfo, SF_TRUE, __LINE__) ; - - for (k = 0 ; k < BUFFER_LEN ; k++) - data_out [k] = k + 1 ; - test_write_int_or_die (outfile, 0, data_out, BUFFER_LEN, __LINE__) ; - - if (typemajor != SF_FORMAT_HTK) - { /* The HTK header is not correct when the file is first written. */ - infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_close (infile) ; - } ; - - sf_command (outfile, SFC_UPDATE_HEADER_NOW, NULL, 0) ; - - /* - ** Open file and check log buffer for an error. If header update failed - ** the the log buffer will contain errors. - */ - infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - check_log_buffer_or_die (infile, __LINE__) ; - - if (sfinfo.frames < BUFFER_LEN || sfinfo.frames > BUFFER_LEN + 50) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), BUFFER_LEN) ; - dump_log_buffer (infile) ; - exit (1) ; - } ; - - test_read_int_or_die (infile, 0, data_in, BUFFER_LEN, __LINE__) ; - for (k = 0 ; k < BUFFER_LEN ; k++) - if (data_out [k] != k + 1) - printf ("Error : line %d\n", __LINE__) ; - - sf_close (infile) ; - - /* Set auto update on. */ - sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) ; - - /* Write more data_out. */ - for (k = 0 ; k < BUFFER_LEN ; k++) - data_out [k] = k + 2 ; - test_write_int_or_die (outfile, 0, data_out, BUFFER_LEN, __LINE__) ; - - /* Open file again and make sure no errors in log buffer. */ - infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - check_log_buffer_or_die (infile, __LINE__) ; - - if (sfinfo.frames < 2 * BUFFER_LEN || sfinfo.frames > 2 * BUFFER_LEN + 50) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * BUFFER_LEN) ; - dump_log_buffer (infile) ; - exit (1) ; - } ; - - sf_close (infile) ; - - sf_close (outfile) ; - - unlink (filename) ; -} /* update_header_sub */ - -static void -update_header_test (const char *filename, int typemajor) -{ - print_test_name ("update_header_test", filename) ; - - update_header_sub (filename, typemajor, SFM_WRITE) ; - update_header_sub (filename, typemajor, SFM_RDWR) ; - - unlink (filename) ; - puts ("ok") ; -} /* update_header_test */ - -/*============================================================================== -*/ - -static void -update_seek_short_test (const char *filename, int filetype) -{ SNDFILE *outfile, *infile ; - SF_INFO sfinfo ; - sf_count_t frames ; - short buffer [8] ; - int k ; - - print_test_name ("update_seek_short_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound outfile with no data. */ - sfinfo.format = filetype | SF_FORMAT_PCM_16 ; - sfinfo.samplerate = 48000 ; - sfinfo.channels = 2 ; - - if (sf_format_check (&sfinfo) == SF_FALSE) - sfinfo.channels = 1 ; - - outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_close (outfile) ; - - /* Open again for read/write. */ - outfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - /* - ** In auto header update mode, seeking to the end of the file with - ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END - ** will seek to 0 anyway - */ - if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0) - { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; - exit (1) ; - } ; - - /* Now write some frames. */ - frames = ARRAY_LEN (buffer) / sfinfo.channels ; - - for (k = 0 ; k < 6 ; k++) - { test_seek_or_die (outfile, k * frames, SEEK_SET, k * frames, sfinfo.channels, __LINE__) ; - test_seek_or_die (outfile, 0, SEEK_END, k * frames, sfinfo.channels, __LINE__) ; - - /* Open file again and make sure no errors in log buffer. */ - infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - check_log_buffer_or_die (infile, __LINE__) ; - sf_close (infile) ; - - if (sfinfo.frames != k * frames) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ; - dump_log_buffer (infile) ; - exit (1) ; - } ; - - if ((k & 1) == 0) - test_write_short_or_die (outfile, k, buffer, sfinfo.channels * frames, __LINE__) ; - else - test_writef_short_or_die (outfile, k, buffer, frames, __LINE__) ; - } ; - - sf_close (outfile) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* update_seek_short_test */ - -static void -update_seek_int_test (const char *filename, int filetype) -{ SNDFILE *outfile, *infile ; - SF_INFO sfinfo ; - sf_count_t frames ; - int buffer [8] ; - int k ; - - print_test_name ("update_seek_int_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound outfile with no data. */ - sfinfo.format = filetype | SF_FORMAT_PCM_32 ; - sfinfo.samplerate = 48000 ; - sfinfo.channels = 2 ; - - if (sf_format_check (&sfinfo) == SF_FALSE) - sfinfo.channels = 1 ; - - outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_close (outfile) ; - - /* Open again for read/write. */ - outfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - /* - ** In auto header update mode, seeking to the end of the file with - ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END - ** will seek to 0 anyway - */ - if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0) - { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; - exit (1) ; - } ; - - /* Now write some frames. */ - frames = ARRAY_LEN (buffer) / sfinfo.channels ; - - for (k = 0 ; k < 6 ; k++) - { test_seek_or_die (outfile, k * frames, SEEK_SET, k * frames, sfinfo.channels, __LINE__) ; - test_seek_or_die (outfile, 0, SEEK_END, k * frames, sfinfo.channels, __LINE__) ; - - /* Open file again and make sure no errors in log buffer. */ - infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - check_log_buffer_or_die (infile, __LINE__) ; - sf_close (infile) ; - - if (sfinfo.frames != k * frames) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ; - dump_log_buffer (infile) ; - exit (1) ; - } ; - - if ((k & 1) == 0) - test_write_int_or_die (outfile, k, buffer, sfinfo.channels * frames, __LINE__) ; - else - test_writef_int_or_die (outfile, k, buffer, frames, __LINE__) ; - } ; - - sf_close (outfile) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* update_seek_int_test */ - -static void -update_seek_float_test (const char *filename, int filetype) -{ SNDFILE *outfile, *infile ; - SF_INFO sfinfo ; - sf_count_t frames ; - float buffer [8] ; - int k ; - - print_test_name ("update_seek_float_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound outfile with no data. */ - sfinfo.format = filetype | SF_FORMAT_FLOAT ; - sfinfo.samplerate = 48000 ; - sfinfo.channels = 2 ; - - if (sf_format_check (&sfinfo) == SF_FALSE) - sfinfo.channels = 1 ; - - outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_close (outfile) ; - - /* Open again for read/write. */ - outfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - /* - ** In auto header update mode, seeking to the end of the file with - ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END - ** will seek to 0 anyway - */ - if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0) - { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; - exit (1) ; - } ; - - /* Now write some frames. */ - frames = ARRAY_LEN (buffer) / sfinfo.channels ; - - for (k = 0 ; k < 6 ; k++) - { test_seek_or_die (outfile, k * frames, SEEK_SET, k * frames, sfinfo.channels, __LINE__) ; - test_seek_or_die (outfile, 0, SEEK_END, k * frames, sfinfo.channels, __LINE__) ; - - /* Open file again and make sure no errors in log buffer. */ - infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - check_log_buffer_or_die (infile, __LINE__) ; - sf_close (infile) ; - - if (sfinfo.frames != k * frames) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ; - dump_log_buffer (infile) ; - exit (1) ; - } ; - - if ((k & 1) == 0) - test_write_float_or_die (outfile, k, buffer, sfinfo.channels * frames, __LINE__) ; - else - test_writef_float_or_die (outfile, k, buffer, frames, __LINE__) ; - } ; - - sf_close (outfile) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* update_seek_float_test */ - -static void -update_seek_double_test (const char *filename, int filetype) -{ SNDFILE *outfile, *infile ; - SF_INFO sfinfo ; - sf_count_t frames ; - double buffer [8] ; - int k ; - - print_test_name ("update_seek_double_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound outfile with no data. */ - sfinfo.format = filetype | SF_FORMAT_DOUBLE ; - sfinfo.samplerate = 48000 ; - sfinfo.channels = 2 ; - - if (sf_format_check (&sfinfo) == SF_FALSE) - sfinfo.channels = 1 ; - - outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_close (outfile) ; - - /* Open again for read/write. */ - outfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - /* - ** In auto header update mode, seeking to the end of the file with - ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END - ** will seek to 0 anyway - */ - if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0) - { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; - exit (1) ; - } ; - - /* Now write some frames. */ - frames = ARRAY_LEN (buffer) / sfinfo.channels ; - - for (k = 0 ; k < 6 ; k++) - { test_seek_or_die (outfile, k * frames, SEEK_SET, k * frames, sfinfo.channels, __LINE__) ; - test_seek_or_die (outfile, 0, SEEK_END, k * frames, sfinfo.channels, __LINE__) ; - - /* Open file again and make sure no errors in log buffer. */ - infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - check_log_buffer_or_die (infile, __LINE__) ; - sf_close (infile) ; - - if (sfinfo.frames != k * frames) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ; - dump_log_buffer (infile) ; - exit (1) ; - } ; - - if ((k & 1) == 0) - test_write_double_or_die (outfile, k, buffer, sfinfo.channels * frames, __LINE__) ; - else - test_writef_double_or_die (outfile, k, buffer, frames, __LINE__) ; - } ; - - sf_close (outfile) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* update_seek_double_test */ - - - -static void -header_shrink_test (const char *filename, int filetype) -{ SNDFILE *outfile, *infile ; - SF_INFO sfinfo ; - sf_count_t frames ; - float buffer [8], bufferin [8] ; - - print_test_name ("header_shrink_test", filename) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.format = filetype | SF_FORMAT_FLOAT ; - sfinfo.channels = 1 ; - - memset (buffer, 0xA0, sizeof (buffer)) ; - - /* Now write some frames. */ - frames = ARRAY_LEN (buffer) / sfinfo.channels ; - - /* Test the file with extra header data. */ - outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; - - sf_command (outfile, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_TRUE) ; - sf_command (outfile, SFC_UPDATE_HEADER_NOW, NULL, SF_FALSE) ; - sf_command (outfile, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_FALSE) ; - - test_writef_float_or_die (outfile, 0, buffer, frames, __LINE__) ; - sf_close (outfile) ; - - /* Open again for read. */ - infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; - - test_readf_float_or_die (infile, 0, bufferin, frames, __LINE__) ; - sf_close (infile) ; - - compare_float_or_die (buffer, bufferin, frames, __LINE__) ; - - unlink (filename) ; - puts ("ok") ; - return ; -} /* header_shrink_test */ - - -static void -extra_header_test (const char *filename, int filetype) -{ SNDFILE *outfile, *infile ; - SF_INFO sfinfo ; - sf_count_t frames ; - short buffer [8] ; - int k = 0 ; - - print_test_name ("extra_header_test", filename) ; - - sfinfo.samplerate = 44100 ; - sfinfo.format = (filetype | SF_FORMAT_PCM_16) ; - sfinfo.channels = 1 ; - - memset (buffer, 0xA0, sizeof (buffer)) ; - - /* Now write some frames. */ - frames = ARRAY_LEN (buffer) / sfinfo.channels ; - - /* Test the file with extra header data. */ - outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, 464) ; - sf_set_string (outfile, SF_STR_TITLE, filename) ; - test_writef_short_or_die (outfile, k, buffer, frames, 466) ; - sf_set_string (outfile, SF_STR_COPYRIGHT, "(c) 1980 Erik") ; - sf_close (outfile) ; - -#if 1 - /* - ** Erik de Castro Lopo May 23 2004. - ** - ** This file has extra string data in the header and therefore cannot - ** currently be opened in SFM_RDWR mode. This is fixable, but its in - ** a part of the code I don't want to fiddle with until the Ogg/Vorbis - ** integration is done. - */ - - if ((infile = sf_open (filename, SFM_RDWR, &sfinfo)) != NULL) - { printf ("\n\nError : should not be able to open this file in SFM_RDWR.\n\n") ; - exit (1) ; - } ; - - unlink (filename) ; - puts ("ok") ; - return ; -#else - - hexdump_file (filename, 0, 100000) ; - - /* Open again for read/write. */ - outfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, 493) ; - - /* - ** In auto header update mode, seeking to the end of the file with - ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END - ** will seek to 0 anyway - */ - if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0) - { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; - exit (1) ; - } ; - - /* Now write some frames. */ - frames = ARRAY_LEN (buffer) / sfinfo.channels ; - - for (k = 1 ; k < 6 ; k++) - { - printf ("\n*** pass %d\n", k) ; - memset (buffer, 0xA0 + k, sizeof (buffer)) ; - - - test_seek_or_die (outfile, k * frames, SEEK_SET, k * frames, sfinfo.channels, 514) ; - test_seek_or_die (outfile, 0, SEEK_END, k * frames, sfinfo.channels, 515) ; - - /* Open file again and make sure no errors in log buffer. */ - if (0) - { infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, 519) ; - check_log_buffer_or_die (infile, 520) ; - sf_close (infile) ; - } ; - - if (sfinfo.frames != k * frames) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", 525, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ; - dump_log_buffer (infile) ; - exit (1) ; - } ; - - if ((k & 1) == 0) - test_write_short_or_die (outfile, k, buffer, sfinfo.channels * frames, 531) ; - else - test_writef_short_or_die (outfile, k, buffer, frames, 533) ; - hexdump_file (filename, 0, 100000) ; - } ; - - sf_close (outfile) ; - unlink (filename) ; - - puts ("ok") ; - return ; -#endif -} /* extra_header_test */ - diff --git a/lib-src/libsndfile/tests/header_test.tpl b/lib-src/libsndfile/tests/header_test.tpl index 9caebdaa4..f4dd5b5b2 100644 --- a/lib-src/libsndfile/tests/header_test.tpl +++ b/lib-src/libsndfile/tests/header_test.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2017 Erik de Castro Lopo ** ** 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 @@ -22,9 +22,10 @@ #include #include #include +#include +#include #include -#include #if HAVE_UNISTD_H #include @@ -43,10 +44,11 @@ #include "utils.h" -#define BUFFER_LEN (1<<10) +#define BUFFER_LEN (1 << 10) #define LOG_BUFFER_SIZE 1024 static void update_header_test (const char *filename, int typemajor) ; +static void update_header_before_write_test (const char *filename, int typemajor) ; [+ FOR data_type +]static void update_seek_[+ (get "name") +]_test (const char *filename, int filetype) ; @@ -77,7 +79,7 @@ main (int argc, char *argv []) exit (1) ; } ; - do_all=!strcmp (argv [1], "all") ; + do_all= !strcmp (argv [1], "all") ; if (do_all || ! strcmp (argv [1], "wav")) { update_header_test ("header.wav", SF_FORMAT_WAV) ; @@ -225,6 +227,14 @@ main (int argc, char *argv []) test_count++ ; } ; + if (do_all || ! strcmp (argv [1], "flac")) + { if (HAVE_EXTERNAL_XIPH_LIBS) + update_header_before_write_test ("header.flac", SF_FORMAT_FLAC) ; + else + puts (" No FLAC tests because FLAC support was not compiled in.") ; + test_count++ ; + } ; + if (test_count == 0) { printf ("Mono : ************************************\n") ; printf ("Mono : * No '%s' test defined.\n", argv [1]) ; @@ -244,14 +254,12 @@ static void update_header_sub (const char *filename, int typemajor, int write_mode) { SNDFILE *outfile, *infile ; SF_INFO sfinfo ; - int k, frames ; + int k ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = 44100 ; sfinfo.format = (typemajor | SF_FORMAT_PCM_16) ; sfinfo.channels = 1 ; - sfinfo.frames = 0 ; - - frames = BUFFER_LEN / sfinfo.channels ; outfile = test_open_file_or_die (filename, write_mode, &sfinfo, SF_TRUE, __LINE__) ; @@ -275,7 +283,7 @@ update_header_sub (const char *filename, int typemajor, int write_mode) check_log_buffer_or_die (infile, __LINE__) ; if (sfinfo.frames < BUFFER_LEN || sfinfo.frames > BUFFER_LEN + 50) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), BUFFER_LEN) ; + { printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, BUFFER_LEN) ; dump_log_buffer (infile) ; exit (1) ; } ; @@ -300,7 +308,7 @@ update_header_sub (const char *filename, int typemajor, int write_mode) check_log_buffer_or_die (infile, __LINE__) ; if (sfinfo.frames < 2 * BUFFER_LEN || sfinfo.frames > 2 * BUFFER_LEN + 50) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * BUFFER_LEN) ; + { printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, 2 * BUFFER_LEN) ; dump_log_buffer (infile) ; exit (1) ; } ; @@ -324,6 +332,36 @@ update_header_test (const char *filename, int typemajor) puts ("ok") ; } /* update_header_test */ +static void +update_header_before_write_test (const char *filename, int typemajor) +{ + SNDFILE *outfile ; + SF_INFO sfinfo ; + int k ; + + print_test_name ("update_header_before_write", filename) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + sfinfo.samplerate = 44100 ; + sfinfo.format = (typemajor | SF_FORMAT_PCM_16) ; + sfinfo.channels = 1 ; + + outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + /* FLAC can only write the header once; if the first call to sf_write() will + ** also attempt to write the header, it fails. FLAC-specific regression + */ + sf_command (outfile, SFC_UPDATE_HEADER_NOW, NULL, 0) ; + + for (k = 0 ; k < BUFFER_LEN ; k++) + data_out [k] = k + 1 ; + test_write_int_or_die (outfile, 0, data_out, BUFFER_LEN, __LINE__) ; + + sf_close (outfile) ; + unlink (filename) ; + puts ("ok") ; +} /* update_header_before_write_test */ + /*============================================================================== */ @@ -332,8 +370,8 @@ update_header_test (const char *filename, int typemajor) update_seek_[+ (get "name") +]_test (const char *filename, int filetype) { SNDFILE *outfile, *infile ; SF_INFO sfinfo ; - sf_count_t frames ; - [+ (get "name") +] buffer [8] ; + sf_count_t frames ; + [+ (get "name") +] buffer [8] ; int k ; print_test_name ("update_seek_[+ (get "name") +]_test", filename) ; @@ -341,6 +379,7 @@ update_seek_[+ (get "name") +]_test (const char *filename, int filetype) memset (buffer, 0, sizeof (buffer)) ; /* Create sound outfile with no data. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.format = filetype | [+ (get "format") +] ; sfinfo.samplerate = 48000 ; sfinfo.channels = 2 ; @@ -356,11 +395,11 @@ update_seek_[+ (get "name") +]_test (const char *filename, int filetype) /* ** In auto header update mode, seeking to the end of the file with - ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END + ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END ** will seek to 0 anyway */ if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0) - { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; + { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; exit (1) ; } ; @@ -377,7 +416,7 @@ update_seek_[+ (get "name") +]_test (const char *filename, int filetype) sf_close (infile) ; if (sfinfo.frames != k * frames) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ; + { printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %" PRId64 ")\n", __LINE__, sfinfo.frames, k + frames) ; dump_log_buffer (infile) ; exit (1) ; } ; @@ -445,12 +484,13 @@ static void extra_header_test (const char *filename, int filetype) { SNDFILE *outfile, *infile ; SF_INFO sfinfo ; - sf_count_t frames ; - short buffer [8] ; + sf_count_t frames ; + short buffer [8] ; int k = 0 ; print_test_name ("extra_header_test", filename) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = 44100 ; sfinfo.format = (filetype | SF_FORMAT_PCM_16) ; sfinfo.channels = 1 ; @@ -494,11 +534,11 @@ extra_header_test (const char *filename, int filetype) /* ** In auto header update mode, seeking to the end of the file with - ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END + ** SEEK_SET will fail from the 2nd seek on. seeking to 0, SEEK_END ** will seek to 0 anyway */ if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0) - { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; + { printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ; exit (1) ; } ; @@ -522,7 +562,7 @@ extra_header_test (const char *filename, int filetype) } ; if (sfinfo.frames != k * frames) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", [+ (tpl-file-line "%2$d") +], SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ; + { printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %" PRId64 ")\n", [+ (tpl-file-line "%2$d") +], sfinfo.frames, k + frames) ; dump_log_buffer (infile) ; exit (1) ; } ; @@ -541,4 +581,3 @@ extra_header_test (const char *filename, int filetype) return ; #endif } /* extra_header_test */ - diff --git a/lib-src/libsndfile/tests/headerless_test.c b/lib-src/libsndfile/tests/headerless_test.c index 62035890b..059fa683d 100644 --- a/lib-src/libsndfile/tests/headerless_test.c +++ b/lib-src/libsndfile/tests/headerless_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2012 Erik de Castro Lopo ** ** 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 @@ -22,9 +22,12 @@ #include #include #include +#include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -93,7 +96,7 @@ headerless_test (const char * filename, int format, int expected) } ; if (sfinfo.frames < BUFFER_SIZE) - { printf ("Line %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Line %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_SIZE, sfinfo.frames) ; exit (1) ; } ; @@ -154,7 +157,7 @@ old_test (void) } ; if (sfinfo.frames < BUFFER_SIZE) - { printf ("Line %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Line %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_SIZE, sfinfo.frames) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/largefile_test.c b/lib-src/libsndfile/tests/largefile_test.c index 328a589a0..4c97c90b2 100644 --- a/lib-src/libsndfile/tests/largefile_test.c +++ b/lib-src/libsndfile/tests/largefile_test.c @@ -24,6 +24,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include diff --git a/lib-src/libsndfile/tests/locale_test.c b/lib-src/libsndfile/tests/locale_test.c index b67d549c5..b26530166 100644 --- a/lib-src/libsndfile/tests/locale_test.c +++ b/lib-src/libsndfile/tests/locale_test.c @@ -24,6 +24,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #if HAVE_LOCALE_H diff --git a/lib-src/libsndfile/tests/long_read_write_test.c b/lib-src/libsndfile/tests/long_read_write_test.c new file mode 100644 index 000000000..486246877 --- /dev/null +++ b/lib-src/libsndfile/tests/long_read_write_test.c @@ -0,0 +1,272 @@ +/* +** Copyright (C) 2015-2016 Erik de Castro Lopo +** +** 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-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#include +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include + +#include "dft_cmp.h" +#include "utils.h" + +#define BUFFER_LENGTH 10000 +#define SAMPLE_RATE 44010 + +static void short_lrw_test (const char *filename, int filetype, const short * output, int out_len) ; +static void int_lrw_test (const char *filename, int filetype, const int * output, int out_len) ; +static void float_lrw_test (const char *filename, int filetype, const float * output, int out_len) ; +static void double_lrw_test (const char *filename, int filetype, const double * output, int out_len) ; + + +static short short_data [BUFFER_LENGTH] ; +static int int_data [BUFFER_LENGTH] ; +static float float_data [BUFFER_LENGTH] ; +static double double_data [BUFFER_LENGTH] ; + +int +main (int argc, char *argv []) +{ int do_all ; + size_t k ; + + if (argc != 2) + { printf ("Usage : %s \n", argv [0]) ; + printf (" Where is one of the following:\n") ; + printf (" alac - test CAF/ALAC file functions\n") ; + printf (" all - perform all tests\n") ; + exit (1) ; + } ; + + for (k = 0 ; k < ARRAY_LEN (short_data) ; k++) + { int value = k / 32 ; + int_data [k] = (value & 1 ? -1 : 1) * value ; + short_data [k] = int_data [k] ; + float_data [k] = int_data [k] / 32000.0 ; + double_data [k] = int_data [k] / 32000.0 ; + } + + do_all = ! strcmp (argv [1], "all") ; + + if (do_all || strcmp (argv [1], "alac") == 0) + { short_lrw_test ("alac.caf", SF_FORMAT_CAF | SF_FORMAT_ALAC_16, short_data, ARRAY_LEN (short_data)) ; + int_lrw_test ("alac.caf", SF_FORMAT_CAF | SF_FORMAT_ALAC_32, int_data, ARRAY_LEN (int_data)) ; + float_lrw_test ("alac.caf", SF_FORMAT_CAF | SF_FORMAT_ALAC_32, float_data, ARRAY_LEN (float_data)) ; + double_lrw_test ("alac.caf", SF_FORMAT_CAF | SF_FORMAT_ALAC_32, double_data, ARRAY_LEN (double_data)) ; + } ; + + return 0 ; +} /* main */ + +/*============================================================================================ + * Here are the test functions. + */ + +static void +short_lrw_test (const char *filename, int filetype, const short * output, int out_len) +{ SNDFILE *file ; + SF_INFO sfinfo ; + int k ; + short input [BUFFER_LENGTH] ; + + print_test_name ("short_lrw_test", filename) ; + + exit_if_true (BUFFER_LENGTH > out_len, "\n\nLine %d: Bad array length.\n", __LINE__) ; + + sfinfo.samplerate = SAMPLE_RATE ; + sfinfo.frames = out_len ; + sfinfo.channels = 1 ; + sfinfo.format = filetype ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + test_write_short_or_die (file, 0, output, out_len, __LINE__) ; + + sf_close (file) ; + + memset (input, 0, sizeof (input)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; + exit_if_true (sfinfo.frames < out_len, "\n\nLine %d: Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ; + exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; + + check_log_buffer_or_die (file, __LINE__) ; + + test_read_short_or_die (file, 0, input, out_len, __LINE__) ; + + sf_close (file) ; + + for (k = 0 ; k < out_len ; k++) + exit_if_true (input [k] != output [k], + "\n\nLine: %d: Error on input %d, expected %d, got %d\n", __LINE__, k, output [k], input [k]) ; + + puts ("ok") ; + unlink (filename) ; + + return ; +} /* short_lrw_test */ + +static void +int_lrw_test (const char *filename, int filetype, const int * output, int out_len) +{ SNDFILE *file ; + SF_INFO sfinfo ; + int k ; + int input [BUFFER_LENGTH] ; + + print_test_name ("int_lrw_test", filename) ; + + exit_if_true (BUFFER_LENGTH > out_len, "\n\nLine %d: Bad array length.\n", __LINE__) ; + + sfinfo.samplerate = SAMPLE_RATE ; + sfinfo.frames = out_len ; + sfinfo.channels = 1 ; + sfinfo.format = filetype ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + test_write_int_or_die (file, 0, output, out_len, __LINE__) ; + + sf_close (file) ; + + memset (input, 0, sizeof (input)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; + exit_if_true (sfinfo.frames < out_len, "\n\nLine %d: Incorrect number of frames in file (too int). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ; + exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; + + check_log_buffer_or_die (file, __LINE__) ; + + test_read_int_or_die (file, 0, input, out_len, __LINE__) ; + + sf_close (file) ; + + for (k = 0 ; k < out_len ; k++) + exit_if_true (input [k] != output [k], + "\n\nLine: %d: Error on input %d, expected %d, got %d\n", __LINE__, k, output [k], input [k]) ; + + puts ("ok") ; + unlink (filename) ; + + return ; +} /* int_lrw_test */ + +static void +float_lrw_test (const char *filename, int filetype, const float * output, int out_len) +{ SNDFILE *file ; + SF_INFO sfinfo ; + int k ; + float input [BUFFER_LENGTH] ; + + print_test_name ("float_lrw_test", filename) ; + + exit_if_true (BUFFER_LENGTH > out_len, "\n\nLine %d: Bad array length.\n", __LINE__) ; + + sfinfo.samplerate = SAMPLE_RATE ; + sfinfo.frames = out_len ; + sfinfo.channels = 1 ; + sfinfo.format = filetype ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + test_write_float_or_die (file, 0, output, out_len, __LINE__) ; + + sf_close (file) ; + + memset (input, 0, sizeof (input)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; + exit_if_true (sfinfo.frames < out_len, "\n\nLine %d: Incorrect number of frames in file (too float). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ; + exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; + + check_log_buffer_or_die (file, __LINE__) ; + + test_read_float_or_die (file, 0, input, out_len, __LINE__) ; + + sf_close (file) ; + + for (k = 0 ; k < out_len ; k++) + exit_if_true (fabs (input [k] - output [k]) > 0.00001, + "\n\nLine: %d: Error on input %d, expected %f, got %f\n", __LINE__, k, output [k], input [k]) ; + + puts ("ok") ; + unlink (filename) ; + + return ; +} /* float_lrw_test */ + +static void +double_lrw_test (const char *filename, int filetype, const double * output, int out_len) +{ SNDFILE *file ; + SF_INFO sfinfo ; + int k ; + double input [BUFFER_LENGTH] ; + + print_test_name ("double_lrw_test", filename) ; + + exit_if_true (BUFFER_LENGTH > out_len, "\n\nLine %d: Bad array length.\n", __LINE__) ; + + sfinfo.samplerate = SAMPLE_RATE ; + sfinfo.frames = out_len ; + sfinfo.channels = 1 ; + sfinfo.format = filetype ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + test_write_double_or_die (file, 0, output, out_len, __LINE__) ; + + sf_close (file) ; + + memset (input, 0, sizeof (input)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; + exit_if_true (sfinfo.frames < out_len, "\n\nLine %d: Incorrect number of frames in file (too double). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ; + exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; + + check_log_buffer_or_die (file, __LINE__) ; + + test_read_double_or_die (file, 0, input, out_len, __LINE__) ; + + sf_close (file) ; + + for (k = 0 ; k < out_len ; k++) + exit_if_true (fabs (input [k] - output [k]) > 0.00001, + "\n\nLine: %d: Error on input %d, expected %f, got %f\n", __LINE__, k, output [k], input [k]) ; + + puts ("ok") ; + unlink (filename) ; + + return ; +} /* double_lrw_test */ + diff --git a/lib-src/libsndfile/tests/lossy_comp_test.c b/lib-src/libsndfile/tests/lossy_comp_test.c index e871760e0..cca274ccf 100644 --- a/lib-src/libsndfile/tests/lossy_comp_test.c +++ b/lib-src/libsndfile/tests/lossy_comp_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2016 Erik de Castro Lopo ** ** 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 @@ -22,23 +22,27 @@ #include #include #include +#include + #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include #include "utils.h" -#define BUFFER_SIZE (1<<14) /* Should be (1<<14) */ +#define BUFFER_SIZE (1 << 14) #define SAMPLE_RATE 11025 #ifndef M_PI #define M_PI 3.14159265358979323846264338 #endif -#define LCT_MAX(x,y) ((x) > (y) ? (x) : (y)) +#define LCT_MAX(x, y) ((x) > (y) ? (x) : (y)) static void lcomp_test_short (const char *filename, int filetype, int chan, double margin) ; static void lcomp_test_int (const char *filename, int filetype, int chan, double margin) ; @@ -66,6 +70,8 @@ static void check_comment (SNDFILE * file, int format, int lineno) ; static int is_lossy (int filetype) ; +static int check_opus_version (SNDFILE *file) ; + /* ** Force the start of these buffers to be double aligned. Sparc-solaris will ** choke if they are not. @@ -218,6 +224,42 @@ main (int argc, char *argv []) test_count++ ; } ; + /* Lite remove start */ + if (do_all || strcmp (argv [1], "wav_nmsadpcm") == 0) + { lcomp_test_short ("nms_16.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16, 1, 0.37) ; + lcomp_test_int ("nms_16.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16, 1, 0.31) ; + lcomp_test_float ("nms_16.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16, 1, 0.34) ; + lcomp_test_double ("nms_16.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16, 1, 0.34) ; + + lcomp_test_short ("nms_24.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24, 1, 0.15) ; + lcomp_test_int ("nms_24.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24, 1, 0.10) ; + lcomp_test_float ("nms_24.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24, 1, 0.14) ; + lcomp_test_double ("nms_24.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24, 1, 0.14) ; + + lcomp_test_short ("nms_32.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32, 1, 0.036) ; + lcomp_test_int ("nms_32.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32, 1, 0.045) ; + lcomp_test_float ("nms_32.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32, 1, 0.035) ; + lcomp_test_double ("nms_32.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32, 1, 0.035) ; + + sdlcomp_test_short ("nms_16.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16, 1, 0.16) ; + sdlcomp_test_int ("nms_16.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16, 1, 0.16) ; + sdlcomp_test_float ("nms_16.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16, 1, 0.16) ; + sdlcomp_test_double ("nms_16.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_16, 1, 0.16) ; + + sdlcomp_test_short ("nms_24.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24, 1, 0.06) ; + sdlcomp_test_int ("nms_24.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24, 1, 0.06) ; + sdlcomp_test_float ("nms_24.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24, 1, 0.06) ; + sdlcomp_test_double ("nms_24.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_24, 1, 0.06) ; + + sdlcomp_test_short ("nms_32.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32, 1, 0.017) ; + sdlcomp_test_int ("nms_32.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32, 1, 0.018) ; + sdlcomp_test_float ("nms_32.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32, 1, 0.018) ; + sdlcomp_test_double ("nms_32.wav", SF_FORMAT_WAV | SF_FORMAT_NMS_ADPCM_32, 1, 0.018) ; + + test_count++ ; + } ; + /* Lite remove end */ + if (do_all || strcmp (argv [1], "aiff_ulaw") == 0) { lcomp_test_short ("ulaw.aiff", SF_FORMAT_AIFF | SF_FORMAT_ULAW, 2, 0.04) ; lcomp_test_int ("ulaw.aiff", SF_FORMAT_AIFF | SF_FORMAT_ULAW, 2, 0.04) ; @@ -373,8 +415,44 @@ main (int argc, char *argv []) test_count++ ; } ; + /* Lite remove start */ + if (do_all || strcmp (argv [1], "raw_nmsadpcm") == 0) + { lcomp_test_short ("raw.vce16", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_16, 1, 0.37) ; + lcomp_test_int ("raw.vce16", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_16, 1, 0.31) ; + lcomp_test_float ("raw.vce16", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_16, 1, 0.34) ; + lcomp_test_double ("raw.vce16", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_16, 1, 0.34) ; + + lcomp_test_short ("raw.vce24", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_24, 1, 0.15) ; + lcomp_test_int ("raw.vce24", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_24, 1, 0.10) ; + lcomp_test_float ("raw.vce24", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_24, 1, 0.14) ; + lcomp_test_double ("raw.vce24", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_24, 1, 0.14) ; + + lcomp_test_short ("raw.vce32", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_32, 1, 0.036) ; + lcomp_test_int ("raw.vce32", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_32, 1, 0.045) ; + lcomp_test_float ("raw.vce32", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_32, 1, 0.035) ; + lcomp_test_double ("raw.vce32", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_32, 1, 0.035) ; + + sdlcomp_test_short ("raw.vce16", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_16, 1, 0.16) ; + sdlcomp_test_int ("raw.vce16", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_16, 1, 0.16) ; + sdlcomp_test_float ("raw.vce16", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_16, 1, 0.16) ; + sdlcomp_test_double ("raw.vce16", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_16, 1, 0.16) ; + + sdlcomp_test_short ("raw.vce24", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_24, 1, 0.06) ; + sdlcomp_test_int ("raw.vce24", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_24, 1, 0.06) ; + sdlcomp_test_float ("raw.vce24", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_24, 1, 0.06) ; + sdlcomp_test_double ("raw.vce24", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_24, 1, 0.06) ; + + sdlcomp_test_short ("raw.vce32", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_32, 1, 0.017) ; + sdlcomp_test_int ("raw.vce32", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_32, 1, 0.018) ; + sdlcomp_test_float ("raw.vce32", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_32, 1, 0.018) ; + sdlcomp_test_double ("raw.vce32", SF_FORMAT_RAW | SF_FORMAT_NMS_ADPCM_32, 1, 0.018) ; + + test_count++ ; + } ; + /* Lite remove end */ + if (do_all || strcmp (argv [1], "ogg_vorbis") == 0) - { if (HAVE_EXTERNAL_LIBS) + { if (HAVE_EXTERNAL_XIPH_LIBS) { /* Don't do lcomp_test_XXX as the errors are too big. */ sdlcomp_test_short ("vorbis.oga", SF_FORMAT_OGG | SF_FORMAT_VORBIS, 1, 0.30) ; sdlcomp_test_int ("vorbis.oga", SF_FORMAT_OGG | SF_FORMAT_VORBIS, 1, 0.30) ; @@ -387,6 +465,20 @@ main (int argc, char *argv []) test_count++ ; } ; + if (do_all || strcmp (argv [1], "ogg_opus") == 0) + { if (HAVE_EXTERNAL_XIPH_LIBS) + { /* Don't do lcomp_test_XXX as the errors are too big. */ + sdlcomp_test_short ("opus.opus", SF_FORMAT_OGG | SF_FORMAT_OPUS, 1, 0.57) ; + sdlcomp_test_int ("opus.opus", SF_FORMAT_OGG | SF_FORMAT_OPUS, 1, 0.54) ; + sdlcomp_test_float ("opus.opus", SF_FORMAT_OGG | SF_FORMAT_OPUS, 1, 0.55) ; + sdlcomp_test_double ("opus.opus", SF_FORMAT_OGG | SF_FORMAT_OPUS, 1, 0.55) ; + } + else + puts (" No Ogg/Opus tests because Ogg/Opus support was not compiled in.") ; + + test_count++ ; + } ; + /* Lite remove start */ if (do_all || strcmp (argv [1], "ircam_ulaw") == 0) { lcomp_test_short ("ulaw.ircam", SF_ENDIAN_LITTLE | SF_FORMAT_IRCAM | SF_FORMAT_ULAW, 2, 0.04) ; @@ -556,7 +648,7 @@ lcomp_test_short (const char *filename, int filetype, int channels, double margi { SNDFILE *file ; SF_INFO sfinfo ; int k, m, seekpos, half_max_abs ; - long datalen ; + sf_count_t datalen ; short *orig, *data ; print_test_name ("lcomp_test_short", filename) ; @@ -593,12 +685,12 @@ lcomp_test_short (const char *filename, int filetype, int channels, double margi } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ; + { printf ("Too few frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ; exit (1) ; } ; if (sfinfo.frames > (datalen + datalen / 20)) - { printf ("Too many frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ; + { printf ("Too many frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ; exit (1) ; } ; @@ -629,8 +721,8 @@ lcomp_test_short (const char *filename, int filetype, int channels, double margi } ; if ((k = sf_readf_short (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("\n\nLine %d: Incorrect read length (%ld should be %d).\n", __LINE__, - SF_COUNT_TO_LONG (channels * sfinfo.frames - datalen), k) ; + { printf ("\n\nLine %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__, + channels * sfinfo.frames - datalen, k) ; exit (1) ; } ; @@ -742,7 +834,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin) { SNDFILE *file ; SF_INFO sfinfo ; int k, m, half_max_abs ; - long datalen, seekpos ; + sf_count_t datalen, seekpos ; double scale, max_val ; int *orig, *data ; @@ -790,12 +882,12 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin) } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + datalen / 20)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; @@ -826,8 +918,8 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin) } ; if ((k = sf_readf_int (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("\n\nLine %d: Incorrect read length (%ld should be %d).\n", __LINE__, - SF_COUNT_TO_LONG (channels * sfinfo.frames - datalen), k) ; + { printf ("\n\nLine %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__, + channels * sfinfo.frames - datalen, k) ; exit (1) ; } ; @@ -836,7 +928,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin) */ if ((sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_MS_ADPCM) for (k = 0 ; k < sfinfo.frames - datalen ; k++) - if (abs (data [channels * k] / scale) > decay_response (channels * k)) + if (ABS (data [channels * k] / scale) > decay_response (channels * k)) { printf ("\n\nLine %d : Incorrect sample B (#%d : abs (%d) should be < %d).\n", __LINE__, channels * k, data [channels * k], decay_response (channels * k)) ; exit (1) ; } ; @@ -872,7 +964,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin) /* Check seek from start of file. */ if ((k = sf_seek (file, seekpos, SEEK_SET)) != seekpos) - { printf ("Seek to start of file + %ld failed (%d).\n", seekpos, k) ; + { printf ("Seek to start of file + %" PRId64 " failed (%d).\n", seekpos, k) ; exit (1) ; } ; @@ -884,7 +976,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin) } ; if ((k = sf_seek (file, 0, SEEK_CUR)) != seekpos + 1) - { printf ("\n\nLine %d: sf_seek (SEEK_CUR) with 0 offset failed (%d should be %ld)\n", __LINE__, k, seekpos + 1) ; + { printf ("\n\nLine %d: sf_seek (SEEK_CUR) with 0 offset failed (%d should be %" PRId64 ")\n", __LINE__, k, seekpos + 1) ; exit (1) ; } ; @@ -892,7 +984,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin) k = sf_seek (file, BUFFER_SIZE / 5, SEEK_CUR) ; test_readf_int_or_die (file, 0, data, 1, __LINE__) ; if (error_function (1.0 * data [0], 1.0 * orig [seekpos * channels], margin) || k != seekpos) - { printf ("\nLine %d: sf_seek (forwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %ld).\n", __LINE__, data [0], orig [seekpos * channels], k, seekpos + 1) ; + { printf ("\nLine %d: sf_seek (forwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %" PRId64 ").\n", __LINE__, data [0], orig [seekpos * channels], k, seekpos + 1) ; exit (1) ; } ; @@ -901,7 +993,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin) k = sf_seek (file, -20, SEEK_CUR) ; test_readf_int_or_die (file, 0, data, 1, __LINE__) ; if (error_function (1.0 * data [0], 1.0 * orig [seekpos * channels], margin) || k != seekpos) - { printf ("\nLine %d: sf_seek (backwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %ld).\n", __LINE__, data [0], orig [seekpos * channels], k, seekpos) ; + { printf ("\nLine %d: sf_seek (backwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %" PRId64 ").\n", __LINE__, data [0], orig [seekpos * channels], k, seekpos) ; exit (1) ; } ; @@ -939,7 +1031,7 @@ lcomp_test_float (const char *filename, int filetype, int channels, double margi { SNDFILE *file ; SF_INFO sfinfo ; int k, m, seekpos ; - long datalen ; + sf_count_t datalen ; float *orig, *data ; double half_max_abs ; @@ -978,12 +1070,12 @@ lcomp_test_float (const char *filename, int filetype, int channels, double margi } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + datalen / 20)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; @@ -1020,8 +1112,8 @@ lcomp_test_float (const char *filename, int filetype, int channels, double margi } ; if ((k = sf_readf_float (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("\n\nLine %d: Incorrect read length (%ld should be %d).\n", __LINE__, - SF_COUNT_TO_LONG (channels * sfinfo.frames - datalen), k) ; + { printf ("\n\nLine %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__, + channels * sfinfo.frames - datalen, k) ; exit (1) ; } ; @@ -1030,7 +1122,7 @@ lcomp_test_float (const char *filename, int filetype, int channels, double margi */ if ((sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_MS_ADPCM) for (k = 0 ; k < sfinfo.frames - datalen ; k++) - if (abs (data [channels * k]) > decay_response (channels * k)) + if (ABS (data [channels * k]) > decay_response (channels * k)) { printf ("\n\nLine %d : Incorrect sample B (#%d : abs (%f) should be < %d).\n", __LINE__, channels * k, data [channels * k], decay_response (channels * k)) ; exit (1) ; } ; @@ -1133,7 +1225,7 @@ lcomp_test_double (const char *filename, int filetype, int channels, double marg { SNDFILE *file ; SF_INFO sfinfo ; int k, m, seekpos ; - long datalen ; + sf_count_t datalen ; double *orig, *data ; double half_max_abs ; @@ -1172,12 +1264,12 @@ lcomp_test_double (const char *filename, int filetype, int channels, double marg } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + datalen / 20)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; @@ -1205,7 +1297,7 @@ lcomp_test_double (const char *filename, int filetype, int channels, double marg oct_save_double (orig, data, datalen) ; exit (1) ; } ; - half_max_abs = LCT_MAX (half_max_abs, abs (0.5 * data [k])) ; + half_max_abs = LCT_MAX (half_max_abs, ABS (0.5 * data [k])) ; } ; if (half_max_abs < 1.0) @@ -1214,8 +1306,8 @@ lcomp_test_double (const char *filename, int filetype, int channels, double marg } ; if ((k = sf_readf_double (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("\n\nLine %d: Incorrect read length (%ld should be %d).\n", __LINE__, - SF_COUNT_TO_LONG (channels * sfinfo.frames - datalen), k) ; + { printf ("\n\nLine %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__, + channels * sfinfo.frames - datalen, k) ; exit (1) ; } ; @@ -1224,7 +1316,7 @@ lcomp_test_double (const char *filename, int filetype, int channels, double marg */ if ((sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_MS_ADPCM) for (k = 0 ; k < sfinfo.frames - datalen ; k++) - if (abs (data [channels * k]) > decay_response (channels * k)) + if (ABS (data [channels * k]) > decay_response (channels * k)) { printf ("\n\nLine %d : Incorrect sample B (#%d : abs (%f) should be < %d).\n", __LINE__, channels * k, data [channels * k], decay_response (channels * k)) ; exit (1) ; } ; @@ -1328,7 +1420,7 @@ sdlcomp_test_short (const char *filename, int filetype, int channels, double mar { SNDFILE *file ; SF_INFO sfinfo ; int k, m, seekpos, half_max_abs ; - long datalen ; + sf_count_t datalen ; short *orig, *data, *smooth ; channels = 1 ; @@ -1352,23 +1444,35 @@ channels = 1 ; /* The Vorbis encoder has a bug on PowerPC and X86-64 with sample rates ** <= 22050. Increasing the sample rate to 32000 avoids triggering it. ** See https://trac.xiph.org/ticket/1229 + ** + ** Opus only supports discrete sample rates. Choose supported 12000. */ if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL) { const char * errstr ; errstr = sf_strerror (NULL) ; - if (strstr (errstr, "Sample rate chosen is known to trigger a Vorbis") == NULL) + if (strstr (errstr, "Sample rate chosen is known to trigger a Vorbis") != NULL) + { printf ("\n Sample rate -> 32kHz ") ; + sfinfo.samplerate = 32000 ; + } + else if (strstr (errstr, "Opus only supports sample rates of") != NULL) + { printf ("\n Sample rate -> 12kHz ") ; + sfinfo.samplerate = 12000 ; + } + else { printf ("Line %d: sf_open_fd (SFM_WRITE) failed : %s\n", __LINE__, errstr) ; dump_log_buffer (NULL) ; exit (1) ; } ; - printf ("\n Sample rate -> 32kHz ") ; - sfinfo.samplerate = 32000 ; - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; } ; + if ((filetype & SF_FORMAT_SUBMASK) == SF_FORMAT_OPUS && !check_opus_version (file)) + { sf_close (file) ; + return ; + } ; + test_write_short_or_die (file, 0, orig, datalen, __LINE__) ; sf_set_string (file, SF_STR_COMMENT, long_comment) ; sf_close (file) ; @@ -1386,12 +1490,12 @@ channels = 1 ; } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + 400)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ; exit (1) ; } ; @@ -1419,7 +1523,7 @@ channels = 1 ; oct_save_short (orig, smooth, datalen) ; exit (1) ; } ; - half_max_abs = LCT_MAX (half_max_abs, abs (0.5 * data [k])) ; + half_max_abs = LCT_MAX (half_max_abs, ABS (0.5 * data [k])) ; } ; if (half_max_abs < 1) @@ -1428,15 +1532,15 @@ channels = 1 ; } ; if ((k = sf_read_short (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("\n\nLine %d: Incorrect read length (%d should be %ld).\n", __LINE__, k, SF_COUNT_TO_LONG (sfinfo.frames - datalen)) ; + { printf ("\n\nLine %d: Incorrect read length (%d should be %" PRId64 ").\n", __LINE__, k, sfinfo.frames - datalen) ; exit (1) ; } ; if ((sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_MS_ADPCM && (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_GSM610) for (k = 0 ; k < sfinfo.frames - datalen ; k++) - if (abs (data [k]) > decay_response (k)) - { printf ("\n\nLine %d: Incorrect sample (#%ld : abs (%d) should be < %d).\n", __LINE__, datalen + k, data [k], decay_response (k)) ; + if (ABS (data [k]) > decay_response (k)) + { printf ("\n\nLine %d: Incorrect sample (#%" PRId64 " : abs (%d) should be < %d).\n", __LINE__, datalen + k, data [k], decay_response (k)) ; exit (1) ; } ; @@ -1456,7 +1560,7 @@ channels = 1 ; for (k = 0 ; k < datalen / 7 ; k++) if (error_function (1.0 * data [k], 1.0 * smooth [k], margin)) - { printf ("\nLine %d: Incorrect sample C (#%d (%ld) : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), smooth [k], data [k]) ; + { printf ("\nLine %d: Incorrect sample C (#%d (%" PRId64 ") : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), smooth [k], data [k]) ; for (m = 0 ; m < 10 ; m++) printf ("%d ", data [k]) ; printf ("\n") ; @@ -1503,10 +1607,10 @@ channels = 1 ; /* Check that read past end of file returns number of items. */ sf_seek (file, sfinfo.frames, SEEK_SET) ; - if ((k = sf_read_short (file, data, datalen)) != 0) - { printf ("\n\nLine %d: Return value from sf_read_short past end of file incorrect (%d).\n", __LINE__, k) ; - exit (1) ; - } ; + if ((k = sf_read_short (file, data, datalen)) != 0) + { printf ("\n\nLine %d: Return value from sf_read_short past end of file incorrect (%d).\n", __LINE__, k) ; + exit (1) ; + } ; /* Check seek backward from end. */ @@ -1533,7 +1637,7 @@ sdlcomp_test_int (const char *filename, int filetype, int channels, double margi { SNDFILE *file ; SF_INFO sfinfo ; int k, m, seekpos, half_max_abs ; - long datalen ; + sf_count_t datalen ; int *orig, *data, *smooth ; double scale ; @@ -1560,23 +1664,35 @@ channels = 1 ; /* The Vorbis encoder has a bug on PowerPC and X86-64 with sample rates ** <= 22050. Increasing the sample rate to 32000 avoids triggering it. ** See https://trac.xiph.org/ticket/1229 + ** + ** Opus only supports discrete sample rates. Choose supported 12000. */ if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL) { const char * errstr ; errstr = sf_strerror (NULL) ; - if (strstr (errstr, "Sample rate chosen is known to trigger a Vorbis") == NULL) + if (strstr (errstr, "Sample rate chosen is known to trigger a Vorbis") != NULL) + { printf ("\n Sample rate -> 32kHz ") ; + sfinfo.samplerate = 32000 ; + } + else if (strstr (errstr, "Opus only supports sample rates of") != NULL) + { printf ("\n Sample rate -> 12kHz ") ; + sfinfo.samplerate = 12000 ; + } + else { printf ("Line %d: sf_open_fd (SFM_WRITE) failed : %s\n", __LINE__, errstr) ; dump_log_buffer (NULL) ; exit (1) ; } ; - printf ("\n Sample rate -> 32kHz ") ; - sfinfo.samplerate = 32000 ; - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; } ; + if ((filetype & SF_FORMAT_SUBMASK) == SF_FORMAT_OPUS && !check_opus_version (file)) + { sf_close (file) ; + return ; + } ; + test_writef_int_or_die (file, 0, orig, datalen, __LINE__) ; sf_set_string (file, SF_STR_COMMENT, long_comment) ; sf_close (file) ; @@ -1594,12 +1710,12 @@ channels = 1 ; } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + 400)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ; exit (1) ; } ; @@ -1632,7 +1748,7 @@ channels = 1 ; } ; if ((k = sf_readf_int (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("\n\nLine %d: Incorrect read length (%d should be %ld).\n", __LINE__, k, SF_COUNT_TO_LONG (sfinfo.frames - datalen)) ; + { printf ("\n\nLine %d: Incorrect read length (%d should be %" PRId64 ").\n", __LINE__, k, sfinfo.frames - datalen) ; exit (1) ; } ; @@ -1640,10 +1756,13 @@ channels = 1 ; (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_MS_ADPCM && (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_GSM610 && (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_G721_32 && - (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_G723_24) + (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_G723_24 && + (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_NMS_ADPCM_16 && + (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_NMS_ADPCM_24 && + (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_NMS_ADPCM_32) for (k = 0 ; k < sfinfo.frames - datalen ; k++) if (abs (data [k]) > decay_response (k)) - { printf ("\n\nLine %d: Incorrect sample (#%ld : abs (%d) should be < %d).\n", __LINE__, datalen + k, data [k], decay_response (k)) ; + { printf ("\n\nLine %d: Incorrect sample (#%" PRId64 " : abs (%d) should be < %d).\n", __LINE__, datalen + k, data [k], decay_response (k)) ; exit (1) ; } ; @@ -1663,7 +1782,7 @@ channels = 1 ; for (k = 0 ; k < datalen / 7 ; k++) if (error_function (data [k] / scale, smooth [k] / scale, margin)) - { printf ("\nLine %d: Incorrect sample (#%d (%ld) : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), smooth [k], data [k]) ; + { printf ("\nLine %d: Incorrect sample (#%d (%" PRId64 ") : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), smooth [k], data [k]) ; for (m = 0 ; m < 10 ; m++) printf ("%d ", data [k]) ; printf ("\n") ; @@ -1710,10 +1829,10 @@ channels = 1 ; /* Check that read past end of file returns number of items. */ sf_seek (file, sfinfo.frames, SEEK_SET) ; - if ((k = sf_readf_int (file, data, datalen)) != 0) - { printf ("\n\nLine %d: Return value from sf_readf_int past end of file incorrect (%d).\n", __LINE__, k) ; - exit (1) ; - } ; + if ((k = sf_readf_int (file, data, datalen)) != 0) + { printf ("\n\nLine %d: Return value from sf_readf_int past end of file incorrect (%d).\n", __LINE__, k) ; + exit (1) ; + } ; /* Check seek backward from end. */ @@ -1740,20 +1859,36 @@ sdlcomp_test_float (const char *filename, int filetype, int channels, double mar { SNDFILE *file ; SF_INFO sfinfo ; int k, m, seekpos ; - long datalen ; + sf_count_t datalen ; float *orig, *data, *smooth ; - double half_max_abs ; + double half_max_abs , scale ; channels = 1 ; print_test_name ("sdlcomp_test_float", filename) ; - if ((filetype & SF_FORMAT_SUBMASK) == SF_FORMAT_VORBIS) - { puts ("Not working for this format.") ; - return ; - } ; + switch ((filetype & SF_FORMAT_SUBMASK)) + { case SF_FORMAT_VORBIS : + /* Vorbis starts to loose fidelity with floating point values outside + ** the range of approximately [-2000.0, 2000.0] (Determined + ** experimentally, not know if it is a limitation of Vorbis or + ** libvorbis.) + */ + scale = 16.0 ; /* 32000/16 = 2000 */ + break ; -printf ("** fix this ** ") ; + case SF_FORMAT_OPUS : + /* The Opus spec says that non-normalized floating point value + ** support (extended dynamic range in its terms) is optional and + ** cannot be relied upon. + */ + scale = 32000.0 ; /* 32000/32000 = 1 */ + break ; + + default : + scale = 1.0 ; + break ; + } ; datalen = BUFFER_SIZE ; @@ -1761,16 +1896,48 @@ printf ("** fix this ** ") ; data = data_buffer.f ; smooth = smooth_buffer.f ; - gen_signal_double (orig_buffer.d, 32000.0, channels, datalen) ; + gen_signal_double (orig_buffer.d, 32000.0 / scale, channels, datalen) ; for (k = 0 ; k < datalen ; k++) - orig [k] = lrint (orig_buffer.d [k]) ; + orig [k] = orig_buffer.d [k] ; sfinfo.samplerate = SAMPLE_RATE ; sfinfo.frames = 123456789 ; /* Ridiculous value. */ sfinfo.channels = channels ; sfinfo.format = filetype ; - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + + /* The Vorbis encoder has a bug on PowerPC and X86-64 with sample rates + ** <= 22050. Increasing the sample rate to 32000 avoids triggering it. + ** See https://trac.xiph.org/ticket/1229 + ** + ** Opus only supports discrete sample rates. Choose supported 12000. + */ + if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL) + { const char * errstr ; + + errstr = sf_strerror (NULL) ; + if (strstr (errstr, "Sample rate chosen is known to trigger a Vorbis") != NULL) + { printf ("\n Sample rate -> 32kHz ") ; + sfinfo.samplerate = 32000 ; + } + else if (strstr (errstr, "Opus only supports sample rates of") != NULL) + { printf ("\n Sample rate -> 12kHz ") ; + sfinfo.samplerate = 12000 ; + } + else + { printf ("Line %d: sf_open_fd (SFM_WRITE) failed : %s\n", __LINE__, errstr) ; + dump_log_buffer (NULL) ; + exit (1) ; + } ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + } ; + + if ((filetype & SF_FORMAT_SUBMASK) == SF_FORMAT_OPUS && !check_opus_version (file)) + { sf_close (file) ; + return ; + } ; + sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; test_write_float_or_die (file, 0, orig, datalen, __LINE__) ; sf_set_string (file, SF_STR_COMMENT, long_comment) ; @@ -1789,12 +1956,12 @@ printf ("** fix this ** ") ; } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + 400)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ; exit (1) ; } ; @@ -1817,12 +1984,12 @@ printf ("** fix this ** ") ; half_max_abs = fabs (data [0]) ; for (k = 1 ; k < datalen ; k++) - { if (error_function (data [k], smooth [k], margin)) - { printf ("\nLine %d: Incorrect sample (#%d : %d should be %d).\n", __LINE__, k, (int) data [k], (int) smooth [k]) ; + { if (error_function (data [k] * scale, smooth [k] * scale, margin)) + { printf ("\nLine %d: Incorrect sample (#%d : %d should be %d).\n", __LINE__, k, (int) (data [k] * scale), (int) (smooth [k] * scale)) ; oct_save_float (orig, smooth, datalen) ; exit (1) ; } ; - half_max_abs = LCT_MAX (half_max_abs, abs (0.5 * data [k])) ; + half_max_abs = LCT_MAX (half_max_abs, ABS (0.5 * data [k] * scale)) ; } ; if (half_max_abs <= 0.0) @@ -1832,15 +1999,15 @@ printf ("** fix this ** ") ; } ; if ((k = sf_read_float (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("\n\nLine %d: Incorrect read length (%d should be %ld).\n", __LINE__, k, SF_COUNT_TO_LONG (sfinfo.frames - datalen)) ; + { printf ("\n\nLine %d: Incorrect read length (%d should be %" PRId64 ").\n", __LINE__, k, sfinfo.frames - datalen) ; exit (1) ; } ; if ((sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_MS_ADPCM && (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_GSM610) for (k = 0 ; k < sfinfo.frames - datalen ; k++) - if (abs (data [k]) > decay_response (k)) - { printf ("\n\nLine %d: Incorrect sample (#%ld : abs (%d) should be < %d).\n", __LINE__, datalen + k, (int) data [k], (int) decay_response (k)) ; + if (ABS (data [k]) > decay_response (k)) + { printf ("\n\nLine %d: Incorrect sample (#%" PRId64 " : abs (%d) should be < %d).\n", __LINE__, datalen + k, (int) data [k], (int) decay_response (k)) ; exit (1) ; } ; @@ -1859,8 +2026,8 @@ printf ("** fix this ** ") ; smoothed_diff_float (smooth, datalen / 7) ; for (k = 0 ; k < datalen / 7 ; k++) - if (error_function (data [k], smooth [k], margin)) - { printf ("\nLine %d: Incorrect sample C (#%d (%ld) : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), (int) smooth [k], (int) data [k]) ; + if (error_function (data [k] * scale, smooth [k] * scale, margin)) + { printf ("\nLine %d: Incorrect sample C (#%d (%" PRId64 ") : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), (int) (smooth [k] * scale), (int) (data [k] * scale)) ; for (m = 0 ; m < 10 ; m++) printf ("%d ", (int) data [k]) ; printf ("\n") ; @@ -1877,8 +2044,8 @@ printf ("** fix this ** ") ; } ; test_read_float_or_die (file, 0, data, channels, __LINE__) ; - if (error_function (data [0], orig [seekpos * channels], margin)) - { printf ("\nLine %d: sf_seek (SEEK_SET) followed by sf_read_float failed (%d, %d).\n", __LINE__, (int) orig [1], (int) data [0]) ; + if (error_function (data [0] * scale, orig [seekpos * channels] * scale, margin)) + { printf ("\nLine %d: sf_seek (SEEK_SET) followed by sf_read_float failed (%d, %d).\n", __LINE__, (int) (orig [1] * scale), (int) (data [0] * scale)) ; exit (1) ; } ; @@ -1890,8 +2057,8 @@ printf ("** fix this ** ") ; seekpos = sf_seek (file, 0, SEEK_CUR) + BUFFER_SIZE / 5 ; k = sf_seek (file, BUFFER_SIZE / 5, SEEK_CUR) ; test_read_float_or_die (file, 0, data, channels, __LINE__) ; - if (error_function (data [0], orig [seekpos * channels], margin) || k != seekpos) - { printf ("\nLine %d: sf_seek (forwards, SEEK_CUR) followed by sf_read_float failed (%d, %d) (%d, %d).\n", __LINE__, (int) data [0], (int) orig [seekpos * channels], k, seekpos + 1) ; + if (error_function (data [0] * scale, orig [seekpos * channels] * scale, margin) || k != seekpos) + { printf ("\nLine %d: sf_seek (forwards, SEEK_CUR) followed by sf_read_float failed (%d, %d) (%d, %d).\n", __LINE__, (int) (data [0] * scale), (int) (orig [seekpos * channels] * scale), k, seekpos + 1) ; exit (1) ; } ; @@ -1899,18 +2066,18 @@ printf ("** fix this ** ") ; /* Check seek backward from current position. */ k = sf_seek (file, -20, SEEK_CUR) ; test_read_float_or_die (file, 0, data, channels, __LINE__) ; - if (error_function (data [0], orig [seekpos * channels], margin) || k != seekpos) - { printf ("\nLine %d: sf_seek (backwards, SEEK_CUR) followed by sf_read_float failed (%d, %d) (%d, %d).\n", __LINE__, (int) data [0], (int) orig [seekpos * channels], k, seekpos) ; + if (error_function (data [0] * scale, orig [seekpos * channels] * scale, margin) || k != seekpos) + { printf ("\nLine %d: sf_seek (backwards, SEEK_CUR) followed by sf_read_float failed (%d, %d) (%d, %d).\n", __LINE__, (int) (data [0] * scale), (int) (orig [seekpos * channels] * scale), k, seekpos) ; exit (1) ; } ; /* Check that read past end of file returns number of items. */ sf_seek (file, sfinfo.frames, SEEK_SET) ; - if ((k = sf_read_float (file, data, datalen)) != 0) - { printf ("\n\nLine %d: Return value from sf_read_float past end of file incorrect (%d).\n", __LINE__, k) ; - exit (1) ; - } ; + if ((k = sf_read_float (file, data, datalen)) != 0) + { printf ("\n\nLine %d: Return value from sf_read_float past end of file incorrect (%d).\n", __LINE__, k) ; + exit (1) ; + } ; /* Check seek backward from end. */ @@ -1920,8 +2087,8 @@ printf ("** fix this ** ") ; } ; test_read_float_or_die (file, 0, data, channels, __LINE__) ; - if (error_function (data [0], orig [5 * channels], margin)) - { printf ("\nLine %d: sf_seek (SEEK_END) followed by sf_read_float failed (%f should be %f).\n", __LINE__, data [0], orig [5 * channels]) ; + if (error_function (data [0] * scale, orig [5 * channels] * scale, margin)) + { printf ("\nLine %d: sf_seek (SEEK_END) followed by sf_read_float failed (%f should be %f).\n", __LINE__, data [0] * scale, orig [5 * channels] * scale) ; exit (1) ; } ; } /* if (sfinfo.seekable) */ @@ -1937,15 +2104,33 @@ sdlcomp_test_double (const char *filename, int filetype, int channels, double ma { SNDFILE *file ; SF_INFO sfinfo ; int k, m, seekpos ; - long datalen ; - double *orig, *data, *smooth, half_max_abs ; + sf_count_t datalen ; + double *orig, *data, *smooth, half_max_abs, scale ; channels = 1 ; print_test_name ("sdlcomp_test_double", filename) ; - if ((filetype & SF_FORMAT_SUBMASK) == SF_FORMAT_VORBIS) - { puts ("Not working for this format.") ; - return ; + switch ((filetype & SF_FORMAT_SUBMASK)) + { case SF_FORMAT_VORBIS : + /* Vorbis starts to loose fidelity with floating point values outside + ** the range of approximately [-2000.0, 2000.0] (Determined + ** experimentally, not know if it is a limitation of Vorbis or + ** libvorbis.) + */ + scale = 16.0 ; /* 32000/16 = 2000 */ + break ; + + case SF_FORMAT_OPUS : + /* The Opus spec says that non-normalized floating point value + ** support (extended dynamic range in its terms) is optional and + ** cannot be relied upon. + */ + scale = 32000.0 ; /* 32000/32000 = 1 */ + break ; + + default : + scale = 1.0 ; + break ; } ; datalen = BUFFER_SIZE ; @@ -1954,14 +2139,45 @@ channels = 1 ; data = data_buffer.d ; smooth = smooth_buffer.d ; - gen_signal_double (orig_buffer.d, 32000.0, channels, datalen) ; + gen_signal_double (orig_buffer.d, 32000.0 / scale, channels, datalen) ; sfinfo.samplerate = SAMPLE_RATE ; sfinfo.frames = 123456789 ; /* Ridiculous value. */ sfinfo.channels = channels ; sfinfo.format = filetype ; - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + /* The Vorbis encoder has a bug on PowerPC and X86-64 with sample rates + ** <= 22050. Increasing the sample rate to 32000 avoids triggering it. + ** See https://trac.xiph.org/ticket/1229 + ** + ** Opus only supports discrete sample rates. Choose supported 12000. + */ + if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL) + { const char * errstr ; + + errstr = sf_strerror (NULL) ; + if (strstr (errstr, "Sample rate chosen is known to trigger a Vorbis") != NULL) + { printf ("\n Sample rate -> 32kHz ") ; + sfinfo.samplerate = 32000 ; + } + else if (strstr (errstr, "Opus only supports sample rates of") != NULL) + { printf ("\n Sample rate -> 12kHz ") ; + sfinfo.samplerate = 12000 ; + } + else + { printf ("Line %d: sf_open_fd (SFM_WRITE) failed : %s\n", __LINE__, errstr) ; + dump_log_buffer (NULL) ; + exit (1) ; + } ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + } ; + + if ((filetype & SF_FORMAT_SUBMASK) == SF_FORMAT_OPUS && !check_opus_version (file)) + { sf_close (file) ; + return ; + } ; + sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; test_write_double_or_die (file, 0, orig, datalen, __LINE__) ; sf_set_string (file, SF_STR_COMMENT, long_comment) ; @@ -1980,12 +2196,12 @@ channels = 1 ; } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + 400)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ; exit (1) ; } ; @@ -2010,12 +2226,12 @@ channels = 1 ; half_max_abs = 0.0 ; for (k = 0 ; k < datalen ; k++) - { if (error_function (data [k], smooth [k], margin)) - { printf ("\n\nLine %d: Incorrect sample (#%d : %d should be %d).\n", __LINE__, k, (int) data [k], (int) smooth [k]) ; + { if (error_function (data [k] * scale, smooth [k] * scale, margin)) + { printf ("\n\nLine %d: Incorrect sample (#%d : %d should be %d).\n", __LINE__, k, (int) (data [k] * scale), (int) (smooth [k] * scale)) ; oct_save_double (orig, smooth, datalen) ; exit (1) ; } ; - half_max_abs = LCT_MAX (half_max_abs, 0.5 * fabs (data [k])) ; + half_max_abs = LCT_MAX (half_max_abs, 0.5 * fabs (data [k] * scale)) ; } ; if (half_max_abs < 1.0) @@ -2024,15 +2240,15 @@ channels = 1 ; } ; if ((k = sf_read_double (file, data, datalen)) != sfinfo.frames - datalen) - { printf ("\n\nLine %d: Incorrect read length (%d should be %ld).\n", __LINE__, k, SF_COUNT_TO_LONG (sfinfo.frames - datalen)) ; + { printf ("\n\nLine %d: Incorrect read length (%d should be %" PRId64 ").\n", __LINE__, k, sfinfo.frames - datalen) ; exit (1) ; } ; if ((sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_MS_ADPCM && (sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_GSM610) for (k = 0 ; k < sfinfo.frames - datalen ; k++) - if (abs (data [k]) > decay_response (k)) - { printf ("\n\nLine %d: Incorrect sample (#%ld : abs (%d) should be < %d).\n", __LINE__, datalen + k, (int) data [k], (int) decay_response (k)) ; + if (ABS (data [k]) > decay_response (k)) + { printf ("\n\nLine %d: Incorrect sample (#%" PRId64 " : abs (%d) should be < %d).\n", __LINE__, datalen + k, (int) data [k], (int) decay_response (k)) ; exit (1) ; } ; @@ -2051,8 +2267,8 @@ channels = 1 ; smoothed_diff_double (smooth, datalen / 7) ; for (k = 0 ; k < datalen / 7 ; k++) - if (error_function (data [k], smooth [k], margin)) - { printf ("\nLine %d: Incorrect sample C (#%d (%ld) : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), (int) smooth [k], (int) data [k]) ; + if (error_function (data [k] * scale, smooth [k] * scale, margin)) + { printf ("\nLine %d: Incorrect sample C (#%d (%" PRId64 ") : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), (int) (smooth [k] * scale), (int) (data [k] * scale)) ; for (m = 0 ; m < 10 ; m++) printf ("%d ", (int) data [k]) ; printf ("\n") ; @@ -2069,8 +2285,8 @@ channels = 1 ; } ; test_read_double_or_die (file, 0, data, channels, __LINE__) ; - if (error_function (data [0], orig [seekpos * channels], margin)) - { printf ("\nLine %d: sf_seek (SEEK_SET) followed by sf_read_double failed (%d, %d).\n", __LINE__, (int) orig [1], (int) data [0]) ; + if (error_function (data [0] * scale, orig [seekpos * channels] * scale, margin)) + { printf ("\nLine %d: sf_seek (SEEK_SET) followed by sf_read_double failed (%d, %d).\n", __LINE__, (int) (orig [1] * scale), (int) (data [0] * scale)) ; exit (1) ; } ; @@ -2082,8 +2298,8 @@ channels = 1 ; seekpos = sf_seek (file, 0, SEEK_CUR) + BUFFER_SIZE / 5 ; k = sf_seek (file, BUFFER_SIZE / 5, SEEK_CUR) ; test_read_double_or_die (file, 0, data, channels, __LINE__) ; - if (error_function (data [0], orig [seekpos * channels], margin) || k != seekpos) - { printf ("\nLine %d: sf_seek (forwards, SEEK_CUR) followed by sf_read_double failed (%d, %d) (%d, %d).\n", __LINE__, (int) data [0], (int) orig [seekpos * channels], k, seekpos + 1) ; + if (error_function (data [0] * scale, orig [seekpos * channels] * scale, margin) || k != seekpos) + { printf ("\nLine %d: sf_seek (forwards, SEEK_CUR) followed by sf_read_double failed (%d, %d) (%d, %d).\n", __LINE__, (int) (data [0] * scale), (int) (orig [seekpos * channels] * scale), k, seekpos + 1) ; exit (1) ; } ; @@ -2091,18 +2307,18 @@ channels = 1 ; /* Check seek backward from current position. */ k = sf_seek (file, -20, SEEK_CUR) ; test_read_double_or_die (file, 0, data, channels, __LINE__) ; - if (error_function (data [0], orig [seekpos * channels], margin) || k != seekpos) - { printf ("\nLine %d: sf_seek (backwards, SEEK_CUR) followed by sf_read_double failed (%d, %d) (%d, %d).\n", __LINE__, (int) data [0], (int) orig [seekpos * channels], k, seekpos) ; + if (error_function (data [0] * scale, orig [seekpos * channels] * scale, margin) || k != seekpos) + { printf ("\nLine %d: sf_seek (backwards, SEEK_CUR) followed by sf_read_double failed (%d, %d) (%d, %d).\n", __LINE__, (int) (data [0] * scale), (int) (orig [seekpos * channels] * scale), k, seekpos) ; exit (1) ; } ; /* Check that read past end of file returns number of items. */ sf_seek (file, sfinfo.frames, SEEK_SET) ; - if ((k = sf_read_double (file, data, datalen)) != 0) - { printf ("\n\nLine %d: Return value from sf_read_double past end of file incorrect (%d).\n", __LINE__, k) ; - exit (1) ; - } ; + if ((k = sf_read_double (file, data, datalen)) != 0) + { printf ("\n\nLine %d: Return value from sf_read_double past end of file incorrect (%d).\n", __LINE__, k) ; + exit (1) ; + } ; /* Check seek backward from end. */ @@ -2112,8 +2328,8 @@ channels = 1 ; } ; test_read_double_or_die (file, 0, data, channels, __LINE__) ; - if (error_function (data [0], orig [5 * channels], margin)) - { printf ("\nLine %d: sf_seek (SEEK_END) followed by sf_read_double failed (%f should be %f).\n", __LINE__, data [0], orig [5 * channels]) ; + if (error_function (data [0] * scale, orig [5 * channels] * scale, margin)) + { printf ("\nLine %d: sf_seek (SEEK_END) followed by sf_read_double failed (%f should be %f).\n", __LINE__, data [0] * scale, orig [5 * channels] * scale) ; exit (1) ; } ; } /* if (sfinfo.seekable) */ @@ -2128,8 +2344,7 @@ static void read_raw_test (const char *filename, int filetype, int channels) { SNDFILE *file ; SF_INFO sfinfo ; - sf_count_t count ; - long datalen ; + sf_count_t count, datalen ; short *orig, *data ; int k ; @@ -2167,12 +2382,12 @@ read_raw_test (const char *filename, int filetype, int channels) } ; if (sfinfo.frames < datalen / channels) - { printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ; exit (1) ; } ; if (sfinfo.frames > (datalen + 400)) - { printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ; + { printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ; exit (1) ; } ; @@ -2185,7 +2400,7 @@ read_raw_test (const char *filename, int filetype, int channels) count = sf_read_raw (file, orig_buffer.c, datalen + 5 * channels) ; if (count != sfinfo.channels * sfinfo.frames) - { printf ("\nLine %d : sf_read_raw returned %ld should be %ld\n", __LINE__, SF_COUNT_TO_LONG (count), sfinfo.channels * SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\nLine %d : sf_read_raw returned %" PRId64 " should be %" PRId64 "\n", __LINE__, count, sfinfo.channels * sfinfo.frames) ; exit (1) ; } ; @@ -2369,3 +2584,34 @@ is_lossy (int filetype) return 1 ; } /* is_lossy */ + +static int +check_opus_version (SNDFILE *file) +{ char log_buf [256] ; + char *str, *p ; + const char *str_libopus = "Opus library version: " ; + int ver_major, ver_minor ; + + sf_command (file, SFC_GET_LOG_INFO, log_buf, sizeof (log_buf)) ; + str = strstr (log_buf, str_libopus) ; + if (str) + { str += strlen (str_libopus) ; + if ((p = strchr (str, '\n'))) + *p = '\0' ; + if (sscanf (str, "libopus %d.%d", &ver_major, &ver_minor) == 2) + { /* Reject versions prior to 1.3 */ + if (ver_major > 1 || (ver_major == 1 && ver_minor >= 3)) + { /* + ** Make sure that the libopus in use is not fixed-point, as it + ** sacrifices accuracy. libopus API documentation explicitly + ** allows checking for this suffix to determine if it is. + */ + if (!strstr (str, "-fixed")) + return 1 ; + } ; + } ; + } ; + + printf ("skipping (%s)\n", str ? str : "unknown libopus version") ; + return 0 ; +} /* check_opus_version */ diff --git a/lib-src/libsndfile/tests/misc_test.c b/lib-src/libsndfile/tests/misc_test.c index dedfabc14..d406cdd0e 100644 --- a/lib-src/libsndfile/tests/misc_test.c +++ b/lib-src/libsndfile/tests/misc_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2017 Erik de Castro Lopo ** ** 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 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -43,13 +44,15 @@ #include "utils.h" -#define BUFFER_LEN (1<<10) +#define BUFFER_LEN (1 << 10) #define LOG_BUFFER_SIZE 1024 static void zero_data_test (const char *filename, int format) ; static void filesystem_full_test (int format) ; static void permission_test (const char *filename, int typemajor) ; static void wavex_amb_test (const char *filename) ; +static void rf64_downgrade_test (const char *filename) ; +static void rf64_long_file_downgrade_test (const char *filename) ; int main (int argc, char *argv []) @@ -65,7 +68,7 @@ main (int argc, char *argv []) exit (1) ; } ; - do_all=!strcmp (argv [1], "all") ; + do_all = ! strcmp (argv [1], "all") ; if (do_all || ! strcmp (argv [1], "wav")) { zero_data_test ("zerolen.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ; @@ -139,9 +142,13 @@ main (int argc, char *argv []) } ; if (do_all || ! strcmp (argv [1], "rf64")) - { zero_data_test ("zerolen.rf64", SF_FORMAT_W64 | SF_FORMAT_PCM_16) ; - filesystem_full_test (SF_FORMAT_W64 | SF_FORMAT_PCM_16) ; - permission_test ("readonly.rf64", SF_FORMAT_W64) ; + { zero_data_test ("zerolen.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ; + filesystem_full_test (SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ; + permission_test ("readonly.rf64", SF_FORMAT_RF64) ; + rf64_downgrade_test ("downgrade.wav") ; + /* Disable this by default, because it needs to write 4 gigabytes of data. */ + if (SF_FALSE) + rf64_long_file_downgrade_test ("no-downgrade.rf64") ; test_count++ ; } ; @@ -220,11 +227,10 @@ static void zero_data_test (const char *filename, int format) { SNDFILE *file ; SF_INFO sfinfo ; - int frames ; switch (format & SF_FORMAT_TYPEMASK) { case SF_FORMAT_OGG : - if (HAVE_EXTERNAL_LIBS == 0) + if (HAVE_EXTERNAL_XIPH_LIBS == 0) return ; break ; default : @@ -238,8 +244,6 @@ zero_data_test (const char *filename, int format) sfinfo.channels = 1 ; sfinfo.frames = 0 ; - frames = BUFFER_LEN / sfinfo.channels ; - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; sf_close (file) ; @@ -261,12 +265,11 @@ filesystem_full_test (int format) struct stat buf ; const char *filename = "/dev/full", *errorstr ; - int frames ; #if (defined (WIN32) || defined (_WIN32)) /* Can't run this test on Win32 so return. */ return ; -#endif +#else /* Make sure errno is zero before doing anything else. */ errno = 0 ; @@ -288,8 +291,6 @@ filesystem_full_test (int format) sfinfo.channels = 1 ; sfinfo.frames = 0 ; - frames = BUFFER_LEN / sfinfo.channels ; - if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) != NULL) { printf ("\n\nLine %d : Error, file should not have openned.\n", __LINE__ - 1) ; exit (1) ; @@ -303,6 +304,7 @@ filesystem_full_test (int format) } ; puts ("ok") ; +#endif } /* filesystem_full_test */ static void @@ -321,7 +323,6 @@ permission_test (const char *filename, int typemajor) SNDFILE *file ; SF_INFO sfinfo ; const char *errorstr ; - int frames ; /* Make sure errno is zero before doing anything else. */ errno = 0 ; @@ -360,8 +361,6 @@ permission_test (const char *filename, int typemajor) sfinfo.channels = 1 ; sfinfo.frames = 0 ; - frames = BUFFER_LEN / sfinfo.channels ; - if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) != NULL) { printf ("\n\nLine %d : Error, file should not have opened.\n", __LINE__ - 1) ; exit (1) ; @@ -422,3 +421,112 @@ wavex_amb_test (const char *filename) unlink (filename) ; puts ("ok") ; } /* wavex_amb_test */ + +static void +rf64_downgrade_test (const char *filename) +{ static short output [BUFFER_LEN] ; + static short input [BUFFER_LEN] ; + + SNDFILE *file ; + SF_INFO sfinfo ; + unsigned k ; + + print_test_name (__func__, filename) ; + + sf_info_clear (&sfinfo) ; + + sfinfo.samplerate = 44100 ; + sfinfo.frames = ARRAY_LEN (output) ; + sfinfo.channels = 1 ; + sfinfo.format = SF_FORMAT_RF64 | SF_FORMAT_PCM_16 ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true (sf_command (file, SFC_RF64_AUTO_DOWNGRADE, NULL, SF_FALSE) != SF_FALSE, "\n\nLine %d: sf_command failed.\n", __LINE__) ; + exit_if_true (sf_command (file, SFC_RF64_AUTO_DOWNGRADE, NULL, SF_TRUE) != SF_TRUE, "\n\nLine %d: sf_command failed.\n", __LINE__) ; + + test_write_short_or_die (file, 0, output, ARRAY_LEN (output), __LINE__) ; + + exit_if_true (sf_command (file, SFC_RF64_AUTO_DOWNGRADE, NULL, SF_FALSE) != SF_TRUE, "\n\nLine %d: sf_command failed.\n", __LINE__) ; + exit_if_true (sf_command (file, SFC_RF64_AUTO_DOWNGRADE, NULL, SF_TRUE) != SF_TRUE, "\n\nLine %d: sf_command failed.\n", __LINE__) ; + + sf_close (file) ; + + memset (input, 0, sizeof (input)) ; + sf_info_clear (&sfinfo) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true (sfinfo.format != (SF_FORMAT_WAVEX | SF_FORMAT_PCM_16), "\n\nLine %d: RF64 to WAV downgrade failed.\n", __LINE__) ; + exit_if_true (sfinfo.frames != ARRAY_LEN (output), "\n\nLine %d: Incorrect number of frames in file (too short). (%d should be %d)\n", __LINE__, (int) sfinfo.frames, (int) ARRAY_LEN (output)) ; + exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; + + check_log_buffer_or_die (file, __LINE__) ; + + test_read_short_or_die (file, 0, input, ARRAY_LEN (input), __LINE__) ; + + sf_close (file) ; + + for (k = 0 ; k < ARRAY_LEN (input) ; k++) + exit_if_true (input [k] != output [k], + "\n\nLine: %d: Error on input %d, expected %d, got %d\n", __LINE__, k, output [k], input [k]) ; + + puts ("ok") ; + unlink (filename) ; + + return ; +} /* rf64_downgrade_test */ + +static void +rf64_long_file_downgrade_test (const char *filename) +{ static int output [BUFFER_LEN] ; + static int input [1] = { 0 } ; + + SNDFILE *file ; + SF_INFO sfinfo ; + sf_count_t output_frames = 0 ; + + print_test_name (__func__, filename) ; + + sf_info_clear (&sfinfo) ; + + memset (output, 0, sizeof (output)) ; + output [0] = 0x1020304 ; + + sfinfo.samplerate = 44100 ; + sfinfo.frames = ARRAY_LEN (output) ; + sfinfo.channels = 1 ; + sfinfo.format = SF_FORMAT_RF64 | SF_FORMAT_PCM_32 ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true (sf_command (file, SFC_RF64_AUTO_DOWNGRADE, NULL, SF_TRUE) != SF_TRUE, "\n\nLine %d: sf_command failed.\n", __LINE__) ; + + while (output_frames * sizeof (output [0]) < 0x100000000) + { test_write_int_or_die (file, 0, output, ARRAY_LEN (output), __LINE__) ; + output_frames += ARRAY_LEN (output) ; + } ; + + sf_close (file) ; + + sf_info_clear (&sfinfo) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + + exit_if_true (sfinfo.format != (SF_FORMAT_RF64 | SF_FORMAT_PCM_32), "\n\nLine %d: RF64 to WAV downgrade should have failed.\n", __LINE__) ; + exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; + exit_if_true (sfinfo.frames != output_frames, "\n\nLine %d: Incorrect number of frames in file (%d should be %d).\n", __LINE__, (int) sfinfo.frames, (int) output_frames) ; + + /* Check that the first sample read is the same as the first written. */ + test_read_int_or_die (file, 0, input, ARRAY_LEN (input), __LINE__) ; + exit_if_true (input [0] != output [0], "\n\nLine %d: Bad first sample (0x%08x).\n", __LINE__, input [0]) ; + + check_log_buffer_or_die (file, __LINE__) ; + + sf_close (file) ; + + puts ("ok") ; + unlink (filename) ; + + return ; +} /* rf64_long_file_downgrade_test */ diff --git a/lib-src/libsndfile/tests/multi_file_test.c b/lib-src/libsndfile/tests/multi_file_test.c index 041f39807..502d15a6b 100644 --- a/lib-src/libsndfile/tests/multi_file_test.c +++ b/lib-src/libsndfile/tests/multi_file_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2012 Erik de Castro Lopo ** ** 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 @@ -20,6 +20,9 @@ #include #include +#include +#include +#include #if HAVE_UNISTD_H #include @@ -30,8 +33,6 @@ #endif #include -#include -#include #include #include @@ -157,7 +158,7 @@ multi_file_test (const char *filename, int *formats, int format_count) { if (verbose) { puts ("\n------------------------------------") ; - printf ("This offset : %ld\n", SF_COUNT_TO_LONG (embed_info.offset + embed_info.length)) ; + printf ("This offset : %" PRId64 "\n", embed_info.offset + embed_info.length) ; } ; if (lseek (fd, embed_info.offset + embed_info.length, SEEK_SET) < 0) @@ -168,7 +169,7 @@ multi_file_test (const char *filename, int *formats, int format_count) memset (&sfinfo, 0, sizeof (sfinfo)) ; if ((sndfile = sf_open_fd (fd, SFM_READ, &sfinfo, SF_FALSE)) == NULL) { printf ("\n\nLine %d: sf_open_fd failed\n", __LINE__) ; - printf ("Embedded file number : %d offset : %ld\n", file_count, SF_COUNT_TO_LONG (embed_info.offset)) ; + printf ("Embedded file number : %d offset : %" PRId64 "\n", file_count, embed_info.offset) ; puts (sf_strerror (sndfile)) ; dump_log_buffer (sndfile) ; exit (1) ; @@ -179,7 +180,7 @@ multi_file_test (const char *filename, int *formats, int format_count) sf_close (sndfile) ; if (verbose) - printf ("\nNext offset : %ld\nNext length : %ld\n", SF_COUNT_TO_LONG (embed_info.offset), SF_COUNT_TO_LONG (embed_info.length)) ; + printf ("\nNext offset : %" PRId64 "\nNext length : %" PRId64 "\n", embed_info.offset, embed_info.length) ; } ; file_count -- ; diff --git a/lib-src/libsndfile/tests/ogg_opus_test.c b/lib-src/libsndfile/tests/ogg_opus_test.c new file mode 100644 index 000000000..37532becc --- /dev/null +++ b/lib-src/libsndfile/tests/ogg_opus_test.c @@ -0,0 +1,424 @@ +/* +** Copyright (C) 2007-2018 Erik de Castro Lopo +** +** 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-1307, USA. +*/ + +#include "sfconfig.h" + +#include +#include +#include +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include +#include +#include + +#include "utils.h" + +#define SAMPLE_RATE 48000 +#define DATA_LENGTH (SAMPLE_RATE / 8) + +typedef union +{ double d [DATA_LENGTH] ; + float f [DATA_LENGTH] ; + int i [DATA_LENGTH] ; + short s [DATA_LENGTH] ; +} BUFFER ; + +static BUFFER data_out ; +static BUFFER data_in ; + +static void +ogg_opus_short_test (void) +{ const char * filename = "ogg_opus_short.opus" ; + + SNDFILE * file ; + SF_INFO sfinfo ; + short seek_data [10] ; + unsigned k ; + + print_test_name ("ogg_opus_short_test", filename) ; + + /* Generate float data. */ + gen_windowed_sine_float (data_out.f, ARRAY_LEN (data_out.f), 1.0 * 0x7F00) ; + + /* Convert to short. */ + for (k = 0 ; k < ARRAY_LEN (data_out.s) ; k++) + data_out.s [k] = lrintf (data_out.f [k]) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + /* Set up output file type. */ + sfinfo.format = SF_FORMAT_OGG | SF_FORMAT_OPUS ; + sfinfo.channels = 1 ; + sfinfo.samplerate = SAMPLE_RATE ; + + /* Write the output file. */ + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + test_write_short_or_die (file, 0, data_out.s, ARRAY_LEN (data_out.s), __LINE__) ; + sf_close (file) ; + + /* Read the file in again. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + test_read_short_or_die (file, 0, data_in.s, ARRAY_LEN (data_in.s), __LINE__) ; + sf_close (file) ; + + puts ("ok") ; + + /* Test seeking. */ + print_test_name ("ogg_opus_seek_test", filename) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + + test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; + test_read_short_or_die (file, 0, seek_data, ARRAY_LEN (seek_data), __LINE__) ; + compare_short_or_die (seek_data, data_in.s + 10, ARRAY_LEN (seek_data), __LINE__) ; + + /* Test seek to end of file. */ + test_seek_or_die (file, 0, SEEK_END, sfinfo.frames, sfinfo.channels, __LINE__) ; + + sf_close (file) ; + + puts ("ok") ; + + unlink (filename) ; +} /* ogg_opus_short_test */ + +static void +ogg_opus_int_test (void) +{ const char * filename = "ogg_opus_int.opus" ; + + SNDFILE * file ; + SF_INFO sfinfo ; + int seek_data [10] ; + unsigned k ; + + print_test_name ("ogg_opus_int_test", filename) ; + + /* Generate float data. */ + gen_windowed_sine_float (data_out.f, ARRAY_LEN (data_out.f), 1.0 * 0x7FFF0000) ; + + /* Convert to integer. */ + for (k = 0 ; k < ARRAY_LEN (data_out.i) ; k++) + data_out.i [k] = lrintf (data_out.f [k]) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + /* Set up output file type. */ + sfinfo.format = SF_FORMAT_OGG | SF_FORMAT_OPUS ; + sfinfo.channels = 1 ; + sfinfo.samplerate = SAMPLE_RATE ; + + /* Write the output file. */ + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + test_write_int_or_die (file, 0, data_out.i, ARRAY_LEN (data_out.i), __LINE__) ; + sf_close (file) ; + + /* Read the file in again. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + test_read_int_or_die (file, 0, data_in.i, ARRAY_LEN (data_in.i), __LINE__) ; + sf_close (file) ; + + puts ("ok") ; + + /* Test seeking. */ + print_test_name ("ogg_opus_seek_test", filename) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + + test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; + test_read_int_or_die (file, 0, seek_data, ARRAY_LEN (seek_data), __LINE__) ; + compare_int_or_die (seek_data, data_in.i + 10, ARRAY_LEN (seek_data), __LINE__) ; + + sf_close (file) ; + + puts ("ok") ; + + unlink (filename) ; +} /* ogg_opus_int_test */ + +static void +ogg_opus_float_test (void) +{ const char * filename = "ogg_opus_float.opus" ; + + SNDFILE * file ; + SF_INFO sfinfo ; + float seek_data [10] ; + + print_test_name ("ogg_opus_float_test", filename) ; + + gen_windowed_sine_float (data_out.f, ARRAY_LEN (data_out.f), 0.95) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + /* Set up output file type. */ + sfinfo.format = SF_FORMAT_OGG | SF_FORMAT_OPUS ; + sfinfo.channels = 1 ; + sfinfo.samplerate = SAMPLE_RATE ; + + /* Write the output file. */ + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + test_write_float_or_die (file, 0, data_out.f, ARRAY_LEN (data_out.f), __LINE__) ; + sf_close (file) ; + + /* Read the file in again. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + test_read_float_or_die (file, 0, data_in.f, ARRAY_LEN (data_in.f), __LINE__) ; + sf_close (file) ; + + puts ("ok") ; + + /* Test seeking. */ + print_test_name ("ogg_opus_seek_test", filename) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + + test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; + test_read_float_or_die (file, 0, seek_data, ARRAY_LEN (seek_data), __LINE__) ; + compare_float_or_die (seek_data, data_in.f + 10, ARRAY_LEN (seek_data), __LINE__) ; + + sf_close (file) ; + + puts ("ok") ; + + unlink (filename) ; +} /* ogg_opus_float_test */ + +static void +ogg_opus_double_test (void) +{ const char * filename = "ogg_opus_double.opus" ; + + SNDFILE * file ; + SF_INFO sfinfo ; + double seek_data [10] ; + + print_test_name ("ogg_opus_double_test", filename) ; + + gen_windowed_sine_double (data_out.d, ARRAY_LEN (data_out.d), 0.95) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + /* Set up output file type. */ + sfinfo.format = SF_FORMAT_OGG | SF_FORMAT_OPUS ; + sfinfo.channels = 1 ; + sfinfo.samplerate = SAMPLE_RATE ; + + /* Write the output file. */ + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + test_write_double_or_die (file, 0, data_out.d, ARRAY_LEN (data_out.d), __LINE__) ; + sf_close (file) ; + + /* Read the file in again. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + test_read_double_or_die (file, 0, data_in.d, ARRAY_LEN (data_in.d), __LINE__) ; + sf_close (file) ; + + puts ("ok") ; + + /* Test seeking. */ + print_test_name ("ogg_opus_seek_test", filename) ; + + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + + test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; + test_read_double_or_die (file, 0, seek_data, ARRAY_LEN (seek_data), __LINE__) ; + compare_double_or_die (seek_data, data_in.d + 10, ARRAY_LEN (seek_data), __LINE__) ; + + sf_close (file) ; + + puts ("ok") ; + + unlink (filename) ; +} /* ogg_opus_double_test */ + + +static void +ogg_opus_stereo_seek_test (const char * filename, int format) +{ static float data [SAMPLE_RATE] ; + static float stereo_out [SAMPLE_RATE * 2] ; + + SNDFILE * file ; + SF_INFO sfinfo ; + sf_count_t pos ; + unsigned k ; + + print_test_name (__func__, filename) ; + + gen_windowed_sine_float (data, ARRAY_LEN (data), 0.95) ; + for (k = 0 ; k < ARRAY_LEN (data) ; k++) + { stereo_out [2 * k] = data [k] ; + stereo_out [2 * k + 1] = data [ARRAY_LEN (data) - k - 1] ; + } ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + /* Set up output file type. */ + sfinfo.format = format ; + sfinfo.channels = 2 ; + sfinfo.samplerate = SAMPLE_RATE ; + + /* Write the output file. */ + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + test_write_float_or_die (file, 0, stereo_out, ARRAY_LEN (stereo_out), __LINE__) ; + sf_close (file) ; + + /* Open file in again for reading. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + + /* Read in the whole file. */ + test_read_float_or_die (file, 0, stereo_out, ARRAY_LEN (stereo_out), __LINE__) ; + + /* Now hammer seeking code. */ + test_seek_or_die (file, 234, SEEK_SET, 234, sfinfo.channels, __LINE__) ; + test_readf_float_or_die (file, 0, data, 10, __LINE__) ; + compare_float_or_die (data, stereo_out + (234 * sfinfo.channels), 10, __LINE__) ; + + test_seek_or_die (file, 442, SEEK_SET, 442, sfinfo.channels, __LINE__) ; + test_readf_float_or_die (file, 0, data, 10, __LINE__) ; + compare_float_or_die (data, stereo_out + (442 * sfinfo.channels), 10, __LINE__) ; + + test_seek_or_die (file, 12, SEEK_CUR, 442 + 10 + 12, sfinfo.channels, __LINE__) ; + test_readf_float_or_die (file, 0, data, 10, __LINE__) ; + compare_float_or_die (data, stereo_out + ((442 + 10 + 12) * sfinfo.channels), 10, __LINE__) ; + + test_seek_or_die (file, 12, SEEK_CUR, 442 + 20 + 24, sfinfo.channels, __LINE__) ; + test_readf_float_or_die (file, 0, data, 10, __LINE__) ; + compare_float_or_die (data, stereo_out + ((442 + 20 + 24) * sfinfo.channels), 10, __LINE__) ; + + pos = 500 - sfinfo.frames ; + test_seek_or_die (file, pos, SEEK_END, 500, sfinfo.channels, __LINE__) ; + test_readf_float_or_die (file, 0, data, 10, __LINE__) ; + compare_float_or_die (data, stereo_out + (500 * sfinfo.channels), 10, __LINE__) ; + + pos = 10 - sfinfo.frames ; + test_seek_or_die (file, pos, SEEK_END, 10, sfinfo.channels, __LINE__) ; + test_readf_float_or_die (file, 0, data, 10, __LINE__) ; + compare_float_or_die (data, stereo_out + (10 * sfinfo.channels), 10, __LINE__) ; + + sf_close (file) ; + + puts ("ok") ; + unlink (filename) ; +} /* ogg_opus_stereo_seek_test */ + + +static void +ogg_opus_original_samplerate_test (void) +{ const char * filename = "ogg_opus_original_samplerate.opus" ; + + SNDFILE * file ; + SF_INFO sfinfo ; + int original_samplerate = 54321 ; + sf_count_t frames ; + + print_test_name ("ogg_opus_original_samplerate_test", filename) ; + + gen_windowed_sine_double (data_out.d, ARRAY_LEN (data_out.d), 0.95) ; + + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + /* Set up output file type. */ + sfinfo.format = SF_FORMAT_OGG | SF_FORMAT_OPUS ; + sfinfo.channels = 1 ; + sfinfo.samplerate = SAMPLE_RATE ; + + /* Write the output file. */ + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + if (sf_command (file, SFC_SET_ORIGINAL_SAMPLERATE, &original_samplerate, sizeof (original_samplerate)) != SF_TRUE) + { printf ("\nCommand SFC_SET_ORIGINAL_SAMPLERATE failed!\n") ; + exit (1) ; + } ; + test_write_double_or_die (file, 0, data_out.d, ARRAY_LEN (data_out.d), __LINE__) ; + if (sf_command (file, SFC_SET_ORIGINAL_SAMPLERATE, &original_samplerate, sizeof (original_samplerate)) != SF_FALSE) + { printf ("\nCommand SFC_SET_ORIGINAL_SAMPLERATE succeeded when it should have failed!") ; + exit (1) ; + } ; + sf_close (file) ; + + /* Read the file in again. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + + original_samplerate = 0 ; + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + if (sf_command (file, SFC_GET_ORIGINAL_SAMPLERATE, &original_samplerate, sizeof (original_samplerate)) != SF_TRUE + || original_samplerate != 54321) + { printf ("\nCommand SFC_GET_ORIGINAL_SAMPLERATE failed!\n") ; + exit (1) ; + } ; + test_read_double_or_die (file, 0, data_in.d, 8, __LINE__) ; + if (sf_command (file, SFC_SET_ORIGINAL_SAMPLERATE, &original_samplerate, sizeof (original_samplerate)) == SF_TRUE) + { printf ("\nCommand SFC_SET_ORIGINAL_SAMPLERATE succeeded when it should have failed!\n") ; + exit (1) ; + } ; + sf_close (file) ; + + /* Test changing the decoder. */ + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + frames = sfinfo.frames ; + original_samplerate = 16000 ; + if (sf_command (file, SFC_SET_ORIGINAL_SAMPLERATE, &original_samplerate, sizeof (original_samplerate)) != SF_TRUE) + { printf ("\nCommand SFC_SET_ORIGINAL_SAMPLERATE failed!\n") ; + exit (1) ; + } ; + if (sf_command (file, SFC_GET_CURRENT_SF_INFO, &sfinfo, sizeof (sfinfo))) + { printf ("\nCommand SFC_GET_CURRENT_SF_INFO failed!\n") ; + exit (1) ; + } ; + if (frames / (48000 / 16000) != sfinfo.frames) + { printf ("\nIncorrect frame count! (%" PRId64 " vs %" PRId64")\n", frames / (48000 / 16000), sfinfo.frames) ; + exit (1) ; + } ; + test_read_double_or_die (file, 0, data_out.d, sfinfo.frames, __LINE__) ; + + sf_close (file) ; + + puts ("ok") ; + + unlink (filename) ; +} /* ogg_opus_original_samplerate_test */ + + +int +main (void) +{ + if (HAVE_EXTERNAL_XIPH_LIBS) + { ogg_opus_short_test () ; + ogg_opus_int_test () ; + ogg_opus_float_test () ; + ogg_opus_double_test () ; + + ogg_opus_stereo_seek_test ("ogg_opus_seek.opus", SF_FORMAT_OGG | SF_FORMAT_OPUS) ; + ogg_opus_original_samplerate_test () ; + } + else + puts (" No Ogg/Opus tests because Ogg/Opus support was not compiled in.") ; + + return 0 ; +} /* main */ diff --git a/lib-src/libsndfile/tests/ogg_test.c b/lib-src/libsndfile/tests/ogg_test.c index 63f3bdae5..ba3d89924 100644 --- a/lib-src/libsndfile/tests/ogg_test.c +++ b/lib-src/libsndfile/tests/ogg_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2007-2011 Erik de Castro Lopo +** Copyright (C) 2007-2016 Erik de Castro Lopo ** ** 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 @@ -21,7 +21,11 @@ #include #include #include +#if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" +#endif #include @@ -90,6 +94,9 @@ ogg_short_test (void) test_read_short_or_die (file, 0, seek_data, ARRAY_LEN (seek_data), __LINE__) ; compare_short_or_die (seek_data, data_in.s + 10, ARRAY_LEN (seek_data), __LINE__) ; + /* Test seek to end of file. */ + test_seek_or_die (file, 0, SEEK_END, sfinfo.frames, sfinfo.channels, __LINE__) ; + sf_close (file) ; puts ("ok") ; @@ -266,7 +273,7 @@ ogg_stereo_seek_test (const char * filename, int format) gen_windowed_sine_float (data, ARRAY_LEN (data), 0.95) ; for (k = 0 ; k < ARRAY_LEN (data) ; k++) { stereo_out [2 * k] = data [k] ; - stereo_out [2 * k + 1] = data [ARRAY_LEN (data) - k - 1] ; + stereo_out [2 * k + 1] = data [ARRAY_LEN (data) - k - 1] ; } ; memset (&sfinfo, 0, sizeof (sfinfo)) ; @@ -325,7 +332,7 @@ ogg_stereo_seek_test (const char * filename, int format) int main (void) { - if (HAVE_EXTERNAL_LIBS) + if (HAVE_EXTERNAL_XIPH_LIBS) { ogg_short_test () ; ogg_int_test () ; ogg_float_test () ; diff --git a/lib-src/libsndfile/tests/pcm_test.c b/lib-src/libsndfile/tests/pcm_test.c deleted file mode 100644 index 86511f65e..000000000 --- a/lib-src/libsndfile/tests/pcm_test.c +++ /dev/null @@ -1,1723 +0,0 @@ -/* -** Copyright (C) 1999-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#include - -#include "utils.h" - -#define BUFFER_SIZE (1<<12) - -static void lrintf_test (void) ; - -static void pcm_test_bits_8 (const char *filename, int filetype, uint64_t hash) ; -static void pcm_test_bits_16 (const char *filename, int filetype, uint64_t hash) ; -static void pcm_test_bits_24 (const char *filename, int filetype, uint64_t hash) ; -static void pcm_test_bits_32 (const char *filename, int filetype, uint64_t hash) ; - -static void pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_float) ; -static void pcm_test_double (const char *filename, int filetype, uint64_t hash, int replace_float) ; - -typedef union -{ double d [BUFFER_SIZE + 1] ; - float f [BUFFER_SIZE + 1] ; - int i [BUFFER_SIZE + 1] ; - short s [BUFFER_SIZE + 1] ; -} BUFFER ; - -/* Data written to the file. */ -static BUFFER data_out ; - -/* Data read back from the file. */ -static BUFFER data_in ; - -int -main (void) -{ - lrintf_test () ; - - pcm_test_bits_8 ("pcm-s8.raw", SF_FORMAT_RAW | SF_FORMAT_PCM_S8, 0x1cda335091249dbfLL) ; - pcm_test_bits_8 ("pcm-u8.raw", SF_FORMAT_RAW | SF_FORMAT_PCM_U8, 0x7f748c433d695f3fLL) ; - - pcm_test_bits_16 ("le-pcm16.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_16, 0x3a2b956c881ebf08LL) ; - pcm_test_bits_16 ("be-pcm16.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_16, 0xd9e2f840c55750f8LL) ; - - pcm_test_bits_24 ("le-pcm24.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_24, 0x933b6a759ab496f8LL) ; - pcm_test_bits_24 ("be-pcm24.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_24, 0xbb1f3eaf9c30b6f8LL) ; - - pcm_test_bits_32 ("le-pcm32.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_32, 0xa77aece1c1c17f08LL) ; - pcm_test_bits_32 ("be-pcm32.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_32, 0x3099ddf142d0b0f8LL) ; - - /* Lite remove start */ - pcm_test_float ("le-float.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x3c2ad04f7554267aLL, SF_FALSE) ; - pcm_test_float ("be-float.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x074de3e248fa9186LL, SF_FALSE) ; - - pcm_test_double ("le-double.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xc682726f958f669cLL, SF_FALSE) ; - pcm_test_double ("be-double.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xd9a3583f8ee51164LL, SF_FALSE) ; - - pcm_test_float ("le-float.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x3c2ad04f7554267aLL, SF_TRUE) ; - pcm_test_float ("be-float.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x074de3e248fa9186LL, SF_TRUE) ; - - pcm_test_double ("le-double.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xc682726f958f669cLL, SF_TRUE) ; - pcm_test_double ("be-double.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xd9a3583f8ee51164LL, SF_TRUE) ; - /* Lite remove end */ - - return 0 ; -} /* main */ - -/*============================================================================================ -** Here are the test functions. -*/ - -static void -lrintf_test (void) -{ int k, items ; - float *float_data ; - int *int_data ; - - print_test_name ("lrintf_test", "") ; - - items = 1024 ; - - float_data = data_out.f ; - int_data = data_in.i ; - - for (k = 0 ; k < items ; k++) - float_data [k] = (k * ((k % 2) ? 333333.0 : -333333.0)) ; - - for (k = 0 ; k < items ; k++) - int_data [k] = lrintf (float_data [k]) ; - - for (k = 0 ; k < items ; k++) - if (fabs (int_data [k] - float_data [k]) > 1.0) - { printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %d).\n", __LINE__, k, float_data [k], int_data [k]) ; - exit (1) ; - } ; - - printf ("ok\n") ; -} /* lrintf_test */ - -static void -pcm_test_bits_8 (const char *filename, int filetype, uint64_t hash) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k, items, zero_count ; - short *short_out, *short_in ; - int *int_out, *int_in ; - /* Lite remove start */ - float *float_out, *float_in ; - double *double_out, *double_in ; - /* Lite remove end */ - - print_test_name ("pcm_test_bits_8", filename) ; - - items = 127 ; - - short_out = data_out.s ; - short_in = data_in.s ; - - zero_count = 0 ; - for (k = 0 ; k < items ; k++) - { short_out [k] = ((k * ((k % 2) ? 1 : -1)) << 8) ; - zero_count = short_out [k] ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros.\n", __LINE__) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_short_or_die (file, 0, short_out, items, __LINE__) ; - - sf_close (file) ; - - memset (short_in, 0, items * sizeof (short)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_short_or_die (file, 0, short_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (short_out [k] != short_in [k]) - { printf ("\n\nLine %d: Incorrect sample (#%d : 0x%x => 0x%x).\n", __LINE__, k, short_out [k], short_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Finally, check the file hash. */ - check_file_hash_or_die (filename, hash, __LINE__) ; - - /*-------------------------------------------------------------------------- - ** Test sf_read/write_int () - */ - zero_count = 0 ; - - int_out = data_out.i ; - int_in = data_in.i ; - for (k = 0 ; k < items ; k++) - { int_out [k] = ((k * ((k % 2) ? 1 : -1)) << 24) ; - zero_count = int_out [k] ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros.\n", __LINE__) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_int_or_die (file, 0, int_out, items, __LINE__) ; - - sf_close (file) ; - - memset (int_in, 0, items * sizeof (int)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_int_or_die (file, 0, int_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (int_out [k] != int_in [k]) - { printf ("\n\nLine %d: int : Incorrect sample (#%d : 0x%x => 0x%x).\n", __LINE__, k, int_out [k], int_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Lite remove start */ - /*-------------------------------------------------------------------------- - ** Test sf_read/write_float () - */ - zero_count = 0 ; - - float_out = data_out.f ; - float_in = data_in.f ; - for (k = 0 ; k < items ; k++) - { float_out [k] = (k * ((k % 2) ? 1 : -1)) ; - zero_count = (fabs (float_out [k]) > 1e-10) ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros (%d/%d).\n", __LINE__, zero_count, items) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - - test_write_float_or_die (file, 0, float_out, items, __LINE__) ; - - sf_close (file) ; - - memset (float_in, 0, items * sizeof (float)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - - test_read_float_or_die (file, 0, float_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (fabs (float_out [k] - float_in [k]) > 1e-10) - { printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /*-------------------------------------------------------------------------- - ** Test sf_read/write_double () - */ - zero_count = 0 ; - - double_out = data_out.d ; - double_in = data_in.d ; - for (k = 0 ; k < items ; k++) - { double_out [k] = (k * ((k % 2) ? 1 : -1)) ; - zero_count = (fabs (double_out [k]) > 1e-10) ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros (%d/%d).\n", __LINE__, zero_count, items) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - - test_write_double_or_die (file, 0, double_out, items, __LINE__) ; - - sf_close (file) ; - - memset (double_in, 0, items * sizeof (double)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - - test_read_double_or_die (file, 0, double_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (fabs (double_out [k] - double_in [k]) > 1e-10) - { printf ("\n\nLine %d: double : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, double_out [k], double_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - /* Lite remove end */ - unlink (filename) ; - - puts ("ok") ; -} /* pcm_test_bits_8 */ - -static void -pcm_test_bits_16 (const char *filename, int filetype, uint64_t hash) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k, items, zero_count ; - short *short_out, *short_in ; - int *int_out, *int_in ; - /* Lite remove start */ - float *float_out, *float_in ; - double *double_out, *double_in ; - /* Lite remove end */ - - print_test_name ("pcm_test_bits_16", filename) ; - - items = 1024 ; - - short_out = data_out.s ; - short_in = data_in.s ; - - zero_count = 0 ; - for (k = 0 ; k < items ; k++) - { short_out [k] = (k * ((k % 2) ? 3 : -3)) ; - zero_count = short_out [k] ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros.\n", __LINE__) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_short_or_die (file, 0, short_out, items, __LINE__) ; - - sf_close (file) ; - - memset (short_in, 0, items * sizeof (short)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_short_or_die (file, 0, short_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (short_out [k] != short_in [k]) - { printf ("\n\nLine %d: Incorrect sample (#%d : 0x%x => 0x%x).\n", __LINE__, k, short_out [k], short_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Finally, check the file hash. */ - check_file_hash_or_die (filename, hash, __LINE__) ; - - /*-------------------------------------------------------------------------- - ** Test sf_read/write_int () - */ - zero_count = 0 ; - - int_out = data_out.i ; - int_in = data_in.i ; - for (k = 0 ; k < items ; k++) - { int_out [k] = ((k * ((k % 2) ? 3 : -3)) << 16) ; - zero_count = int_out [k] ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros.\n", __LINE__) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_int_or_die (file, 0, int_out, items, __LINE__) ; - - sf_close (file) ; - - memset (int_in, 0, items * sizeof (int)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_int_or_die (file, 0, int_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (int_out [k] != int_in [k]) - { printf ("\n\nLine %d: int : Incorrect sample (#%d : 0x%x => 0x%x).\n", __LINE__, k, int_out [k], int_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Lite remove start */ - /*-------------------------------------------------------------------------- - ** Test sf_read/write_float () - */ - zero_count = 0 ; - - float_out = data_out.f ; - float_in = data_in.f ; - for (k = 0 ; k < items ; k++) - { float_out [k] = (k * ((k % 2) ? 3 : -3)) ; - zero_count = (fabs (float_out [k]) > 1e-10) ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros (%d/%d).\n", __LINE__, zero_count, items) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - - test_write_float_or_die (file, 0, float_out, items, __LINE__) ; - - sf_close (file) ; - - memset (float_in, 0, items * sizeof (float)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - - test_read_float_or_die (file, 0, float_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (fabs (float_out [k] - float_in [k]) > 1e-10) - { printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /*-------------------------------------------------------------------------- - ** Test sf_read/write_double () - */ - zero_count = 0 ; - - double_out = data_out.d ; - double_in = data_in.d ; - for (k = 0 ; k < items ; k++) - { double_out [k] = (k * ((k % 2) ? 3 : -3)) ; - zero_count = (fabs (double_out [k]) > 1e-10) ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros (%d/%d).\n", __LINE__, zero_count, items) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - - test_write_double_or_die (file, 0, double_out, items, __LINE__) ; - - sf_close (file) ; - - memset (double_in, 0, items * sizeof (double)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - - test_read_double_or_die (file, 0, double_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (fabs (double_out [k] - double_in [k]) > 1e-10) - { printf ("\n\nLine %d: double : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, double_out [k], double_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - /* Lite remove end */ - unlink (filename) ; - - puts ("ok") ; -} /* pcm_test_bits_16 */ - -static void -pcm_test_bits_24 (const char *filename, int filetype, uint64_t hash) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k, items, zero_count ; - short *short_out, *short_in ; - int *int_out, *int_in ; - /* Lite remove start */ - float *float_out, *float_in ; - double *double_out, *double_in ; - /* Lite remove end */ - - print_test_name ("pcm_test_bits_24", filename) ; - - items = 1024 ; - - short_out = data_out.s ; - short_in = data_in.s ; - - zero_count = 0 ; - for (k = 0 ; k < items ; k++) - { short_out [k] = (k * ((k % 2) ? 3 : -3)) ; - zero_count = short_out [k] ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros.\n", __LINE__) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_short_or_die (file, 0, short_out, items, __LINE__) ; - - sf_close (file) ; - - memset (short_in, 0, items * sizeof (short)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_short_or_die (file, 0, short_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (short_out [k] != short_in [k]) - { printf ("\n\nLine %d: Incorrect sample (#%d : 0x%x => 0x%x).\n", __LINE__, k, short_out [k], short_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Finally, check the file hash. */ - check_file_hash_or_die (filename, hash, __LINE__) ; - - /*-------------------------------------------------------------------------- - ** Test sf_read/write_int () - */ - zero_count = 0 ; - - int_out = data_out.i ; - int_in = data_in.i ; - for (k = 0 ; k < items ; k++) - { int_out [k] = ((k * ((k % 2) ? 3333 : -3333)) << 8) ; - zero_count = int_out [k] ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros.\n", __LINE__) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_int_or_die (file, 0, int_out, items, __LINE__) ; - - sf_close (file) ; - - memset (int_in, 0, items * sizeof (int)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_int_or_die (file, 0, int_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (int_out [k] != int_in [k]) - { printf ("\n\nLine %d: int : Incorrect sample (#%d : 0x%x => 0x%x).\n", __LINE__, k, int_out [k], int_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Lite remove start */ - /*-------------------------------------------------------------------------- - ** Test sf_read/write_float () - */ - zero_count = 0 ; - - float_out = data_out.f ; - float_in = data_in.f ; - for (k = 0 ; k < items ; k++) - { float_out [k] = (k * ((k % 2) ? 3333 : -3333)) ; - zero_count = (fabs (float_out [k]) > 1e-10) ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros (%d/%d).\n", __LINE__, zero_count, items) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - - test_write_float_or_die (file, 0, float_out, items, __LINE__) ; - - sf_close (file) ; - - memset (float_in, 0, items * sizeof (float)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - - test_read_float_or_die (file, 0, float_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (fabs (float_out [k] - float_in [k]) > 1e-10) - { printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /*-------------------------------------------------------------------------- - ** Test sf_read/write_double () - */ - zero_count = 0 ; - - double_out = data_out.d ; - double_in = data_in.d ; - for (k = 0 ; k < items ; k++) - { double_out [k] = (k * ((k % 2) ? 3333 : -3333)) ; - zero_count = (fabs (double_out [k]) > 1e-10) ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros (%d/%d).\n", __LINE__, zero_count, items) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - - test_write_double_or_die (file, 0, double_out, items, __LINE__) ; - - sf_close (file) ; - - memset (double_in, 0, items * sizeof (double)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - - test_read_double_or_die (file, 0, double_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (fabs (double_out [k] - double_in [k]) > 1e-10) - { printf ("\n\nLine %d: double : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, double_out [k], double_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - /* Lite remove end */ - unlink (filename) ; - - puts ("ok") ; -} /* pcm_test_bits_24 */ - -static void -pcm_test_bits_32 (const char *filename, int filetype, uint64_t hash) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k, items, zero_count ; - short *short_out, *short_in ; - int *int_out, *int_in ; - /* Lite remove start */ - float *float_out, *float_in ; - double *double_out, *double_in ; - /* Lite remove end */ - - print_test_name ("pcm_test_bits_32", filename) ; - - items = 1024 ; - - short_out = data_out.s ; - short_in = data_in.s ; - - zero_count = 0 ; - for (k = 0 ; k < items ; k++) - { short_out [k] = (k * ((k % 2) ? 3 : -3)) ; - zero_count = short_out [k] ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros.\n", __LINE__) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_short_or_die (file, 0, short_out, items, __LINE__) ; - - sf_close (file) ; - - memset (short_in, 0, items * sizeof (short)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_short_or_die (file, 0, short_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (short_out [k] != short_in [k]) - { printf ("\n\nLine %d: Incorrect sample (#%d : 0x%x => 0x%x).\n", __LINE__, k, short_out [k], short_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Finally, check the file hash. */ - check_file_hash_or_die (filename, hash, __LINE__) ; - - /*-------------------------------------------------------------------------- - ** Test sf_read/write_int () - */ - zero_count = 0 ; - - int_out = data_out.i ; - int_in = data_in.i ; - for (k = 0 ; k < items ; k++) - { int_out [k] = (k * ((k % 2) ? 333333 : -333333)) ; - zero_count = int_out [k] ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros.\n", __LINE__) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_int_or_die (file, 0, int_out, items, __LINE__) ; - - sf_close (file) ; - - memset (int_in, 0, items * sizeof (int)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_int_or_die (file, 0, int_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (int_out [k] != int_in [k]) - { printf ("\n\nLine %d: int : Incorrect sample (#%d : 0x%x => 0x%x).\n", __LINE__, k, int_out [k], int_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Lite remove start */ - /*-------------------------------------------------------------------------- - ** Test sf_read/write_float () - */ - zero_count = 0 ; - - float_out = data_out.f ; - float_in = data_in.f ; - for (k = 0 ; k < items ; k++) - { float_out [k] = (k * ((k % 2) ? 333333 : -333333)) ; - zero_count = (fabs (float_out [k]) > 1e-10) ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros (%d/%d).\n", __LINE__, zero_count, items) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - - test_write_float_or_die (file, 0, float_out, items, __LINE__) ; - - sf_close (file) ; - - memset (float_in, 0, items * sizeof (float)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - - test_read_float_or_die (file, 0, float_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (fabs (float_out [k] - float_in [k]) > 1e-10) - { printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - - /*-------------------------------------------------------------------------- - ** Test sf_read/write_double () - */ - zero_count = 0 ; - - double_out = data_out.d ; - double_in = data_in.d ; - for (k = 0 ; k < items ; k++) - { double_out [k] = (k * ((k % 2) ? 333333 : -333333)) ; - zero_count = (fabs (double_out [k]) > 1e-10) ? zero_count : zero_count + 1 ; - } ; - - if (zero_count > items / 4) - { printf ("\n\nLine %d: too many zeros (%d/%d).\n", __LINE__, zero_count, items) ; - exit (1) ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - - test_write_double_or_die (file, 0, double_out, items, __LINE__) ; - - sf_close (file) ; - - memset (double_in, 0, items * sizeof (double)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - if (sfinfo.format != filetype) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - - test_read_double_or_die (file, 0, double_in, items, __LINE__) ; - - for (k = 0 ; k < items ; k++) - if (fabs (double_out [k] - double_in [k]) > 1e-10) - { printf ("\n\nLine %d: double : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, double_out [k], double_in [k]) ; - exit (1) ; - } ; - - sf_close (file) ; - /* Lite remove end */ - unlink (filename) ; - - puts ("ok") ; -} /* pcm_test_bits_32 */ - - - -/*============================================================================== -*/ - -static void -pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_float) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k, items, frames ; - int sign ; - double *data, error ; - - print_test_name (replace_float ? "pcm_test_float (replace)" : "pcm_test_float", filename) ; - - items = BUFFER_SIZE ; - - data = data_out.d ; - for (sign = 1, k = 0 ; k < items ; k++) - { data [k] = ((double) (k * sign)) / 100.0 ; - sign = (sign > 0) ? -1 : 1 ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = items ; - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - if (replace_float && string_in_log_buffer (file, "Using IEEE replacement") == 0) - { printf ("\n\nLine %d : Float replacement code not working.\n\n", __LINE__) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - test_write_double_or_die (file, 0, data, items, __LINE__) ; - - sf_close (file) ; - - check_file_hash_or_die (filename, hash, __LINE__) ; - - memset (data, 0, items * sizeof (double)) ; - - if ((filetype & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - if (replace_float && string_in_log_buffer (file, "Using IEEE replacement") == 0) - { printf ("\n\nLine %d : Float replacement code not working.\n\n", __LINE__) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - if (sfinfo.format != filetype) - { printf ("\n\nError (%s:%d) Mono : Returned format incorrect (0x%08X => 0x%08X).\n", __FILE__, __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nError (%s:%d) Mono : Incorrect number of channels in file.\n", __FILE__, __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_double_or_die (file, 0, data, items, __LINE__) ; - - for (sign = -1, k = 0 ; k < items ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 6, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - /* Now test Stereo. */ - - if ((filetype & SF_FORMAT_TYPEMASK) == SF_FORMAT_SVX) /* SVX is mono only */ - { printf ("ok\n") ; - return ; - } ; - - items = BUFFER_SIZE ; - - data = data_out.d ; - for (sign = -1, k = 0 ; k < items ; k++) - data [k] = ((double) k) / 100.0 * (sign *= -1) ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = items ; - sfinfo.channels = 2 ; - sfinfo.format = filetype ; - - frames = items / sfinfo.channels ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - if (replace_float && string_in_log_buffer (file, "Using IEEE replacement") == 0) - { printf ("\n\nLine %d : Float replacement code not working.\n\n", __LINE__) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - test_writef_double_or_die (file, 0, data, frames, __LINE__) ; - - sf_close (file) ; - - check_file_hash_or_die (filename, hash, __LINE__) ; - - memset (data, 0, items * sizeof (double)) ; - - if ((filetype & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - if (replace_float && string_in_log_buffer (file, "Using IEEE replacement") == 0) - { printf ("\n\nLine %d : Float replacement code not working.\n\n", __LINE__) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - if (sfinfo.format != filetype) - { printf ("\n\nError (%s:%d) Stereo : Returned format incorrect (0x%08X => 0x%08X).\n", __FILE__, __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != frames) - { printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, frames, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 2) - { printf ("\n\nError (%s:%d) Stereo : Incorrect number of channels in file.\n", __FILE__, __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_readf_double_or_die (file, 0, data, frames, __LINE__) ; - for (sign = -1, k = 0 ; k < items ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, data, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, data + 20, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 8, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, data + 40, 2, __LINE__) ; - for (k = 40 ; k < 44 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, data + 20, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - printf ("ok\n") ; - unlink (filename) ; -} /* pcm_test_float */ - -static void -pcm_test_double (const char *filename, int filetype, uint64_t hash, int replace_float) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k, items, frames ; - int sign ; - double *data, error ; - - /* This is the best test routine. Other should be brought up to this standard. */ - - print_test_name (replace_float ? "pcm_test_double (replace)" : "pcm_test_double", filename) ; - - items = BUFFER_SIZE ; - - data = data_out.d ; - for (sign = 1, k = 0 ; k < items ; k++) - { data [k] = ((double) (k * sign)) / 100.0 ; - sign = (sign > 0) ? -1 : 1 ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = items ; - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - if (replace_float && string_in_log_buffer (file, "Using IEEE replacement") == 0) - { printf ("\n\nLine %d : Float replacement code not working.\n\n", __LINE__) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - test_write_double_or_die (file, 0, data, items, __LINE__) ; - - sf_close (file) ; - -#if (defined (WIN32) || defined (_WIN32)) - /* File hashing on Win32 fails due to slighty different - ** calculated values of the sin() function. - */ - hash = hash ; /* Avoid compiler warning. */ -#else - check_file_hash_or_die (filename, hash, __LINE__) ; -#endif - - memset (data, 0, items * sizeof (double)) ; - - if ((filetype & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - if (replace_float && string_in_log_buffer (file, "Using IEEE replacement") == 0) - { printf ("\n\nLine %d : Float replacement code not working.\n\n", __LINE__) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - if (sfinfo.format != filetype) - { printf ("\n\nError (%s:%d) Mono : Returned format incorrect (0x%08X => 0x%08X).\n", __FILE__, __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != items) - { printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nError (%s:%d) Mono : Incorrect number of channels in file.\n", __FILE__, __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_double_or_die (file, 0, data, items, __LINE__) ; - - for (sign = -1, k = 0 ; k < items ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data + 10, 4, __LINE__) ; - - test_seek_or_die (file, 0, SEEK_CUR, 14, sfinfo.channels, __LINE__) ; - - for (k = 10 ; k < 14 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 6, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Mono : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - /* Now test Stereo. */ - - if ((filetype & SF_FORMAT_TYPEMASK) == SF_FORMAT_SVX) /* SVX is mono only */ - { printf ("ok\n") ; - return ; - } ; - - items = BUFFER_SIZE ; - - data = data_out.d ; - for (sign = -1, k = 0 ; k < items ; k++) - data [k] = ((double) k) / 100.0 * (sign *= -1) ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = items ; - sfinfo.channels = 2 ; - sfinfo.format = filetype ; - - frames = items / sfinfo.channels ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - if (replace_float && string_in_log_buffer (file, "Using IEEE replacement") == 0) - { printf ("\n\nLine %d : Float replacement code not working.\n\n", __LINE__) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - test_writef_double_or_die (file, 0, data, frames, __LINE__) ; - - sf_close (file) ; - -#if (defined (WIN32) || defined (_WIN32)) - /* File hashing on Win32 fails due to slighty different - ** calculated values. - */ - hash = hash ; /* Avoid compiler warning. */ -#else - check_file_hash_or_die (filename, hash, __LINE__) ; -#endif - - memset (data, 0, items * sizeof (double)) ; - - if ((filetype & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ; - if (replace_float && string_in_log_buffer (file, "Using IEEE replacement") == 0) - { printf ("\n\nLine %d : Float replacement code not working.\n\n", __LINE__) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - if (sfinfo.format != filetype) - { printf ("\n\nError (%s:%d) Stereo : Returned format incorrect (0x%08X => 0x%08X).\n", __FILE__, __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != frames) - { printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, frames, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 2) - { printf ("\n\nError (%s:%d) Stereo : Incorrect number of channels in file.\n", __FILE__, __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_readf_double_or_die (file, 0, data, frames, __LINE__) ; - - for (sign = -1, k = 0 ; k < items ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, data + 10, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 8, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, data + 40, 4, __LINE__) ; - for (k = 40 ; k < 44 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames -10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, data + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - { error = fabs (data [k] - ((double) k) / 100.0 * (sign *= -1)) ; - if (fabs (data [k]) > 1e-100 && fabs (error / data [k]) > 1e-5) - { printf ("\n\nError (%s:%d) Stereo : Incorrect sample (#%d : %f => %f).\n", __FILE__, __LINE__, k, ((double) k) / 100.0, data [k]) ; - exit (1) ; - } ; - } ; - - sf_close (file) ; - - printf ("ok\n") ; - unlink (filename) ; -} /* pcm_test_double */ - -/*============================================================================== -*/ diff --git a/lib-src/libsndfile/tests/pcm_test.def b/lib-src/libsndfile/tests/pcm_test.def index b81f05943..2cc91b5f3 100644 --- a/lib-src/libsndfile/tests/pcm_test.def +++ b/lib-src/libsndfile/tests/pcm_test.def @@ -3,8 +3,8 @@ autogen definitions pcm_test.tpl; data_type = { name = "bits_8" ; item_count = 127 ; - short_func = "((k * ((k % 2) ? 1 : -1)) << 8)" ; - int_func = "((k * ((k % 2) ? 1 : -1)) << 24)" ; + short_func = "arith_shift_left (k * ((k % 2) ? 1 : -1), 8)" ; + int_func = "arith_shift_left (k * ((k % 2) ? 1 : -1), 24)" ; float_func = "(k * ((k % 2) ? 1 : -1))" ; } ; @@ -12,7 +12,7 @@ data_type = { name = "bits_16" ; item_count = 1024 ; short_func = "(k * ((k % 2) ? 3 : -3))" ; - int_func = "((k * ((k % 2) ? 3 : -3)) << 16)" ; + int_func = "arith_shift_left (k * ((k % 2) ? 3 : -3), 16)" ; float_func = "(k * ((k % 2) ? 3 : -3))" ; } ; @@ -20,7 +20,7 @@ data_type = { name = "bits_24" ; item_count = 1024 ; short_func = "(k * ((k % 2) ? 3 : -3))" ; - int_func = "((k * ((k % 2) ? 3333 : -3333)) << 8)" ; + int_func = "arith_shift_left (k * ((k % 2) ? 3333 : -3333), 8)" ; float_func = "(k * ((k % 2) ? 3333 : -3333))" ; } ; diff --git a/lib-src/libsndfile/tests/pcm_test.tpl b/lib-src/libsndfile/tests/pcm_test.tpl index 949ad4eda..4658f1b59 100644 --- a/lib-src/libsndfile/tests/pcm_test.tpl +++ b/lib-src/libsndfile/tests/pcm_test.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2013 Erik de Castro Lopo ** ** 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 @@ -23,16 +23,19 @@ #include #include #include +#include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include #include "utils.h" -#define BUFFER_SIZE (1<<12) +#define BUFFER_SIZE (1 << 12) static void lrintf_test (void) ; @@ -61,30 +64,30 @@ main (void) { lrintf_test () ; - pcm_test_bits_8 ("pcm-s8.raw", SF_FORMAT_RAW | SF_FORMAT_PCM_S8, 0x1cda335091249dbfLL) ; - pcm_test_bits_8 ("pcm-u8.raw", SF_FORMAT_RAW | SF_FORMAT_PCM_U8, 0x7f748c433d695f3fLL) ; + pcm_test_bits_8 ("pcm-s8.raw", SF_FORMAT_RAW | SF_FORMAT_PCM_S8, 0xa335091249dbfLL) ; + pcm_test_bits_8 ("pcm-u8.raw", SF_FORMAT_RAW | SF_FORMAT_PCM_U8, 0x48c433d695f3fLL) ; - pcm_test_bits_16 ("le-pcm16.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_16, 0x3a2b956c881ebf08LL) ; - pcm_test_bits_16 ("be-pcm16.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_16, 0xd9e2f840c55750f8LL) ; + pcm_test_bits_16 ("le-pcm16.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_16, 0xb956c881ebf08LL) ; + pcm_test_bits_16 ("be-pcm16.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_16, 0x2f840c55750f8LL) ; - pcm_test_bits_24 ("le-pcm24.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_24, 0x933b6a759ab496f8LL) ; - pcm_test_bits_24 ("be-pcm24.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_24, 0xbb1f3eaf9c30b6f8LL) ; + pcm_test_bits_24 ("le-pcm24.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_24, 0xb6a759ab496f8LL) ; + pcm_test_bits_24 ("be-pcm24.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_24, 0xf3eaf9c30b6f8LL) ; - pcm_test_bits_32 ("le-pcm32.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_32, 0xa77aece1c1c17f08LL) ; - pcm_test_bits_32 ("be-pcm32.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_32, 0x3099ddf142d0b0f8LL) ; + pcm_test_bits_32 ("le-pcm32.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_32, 0xaece1c1c17f08LL) ; + pcm_test_bits_32 ("be-pcm32.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_32, 0x9ddf142d0b0f8LL) ; /* Lite remove start */ - pcm_test_float ("le-float.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x3c2ad04f7554267aLL, SF_FALSE) ; - pcm_test_float ("be-float.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x074de3e248fa9186LL, SF_FALSE) ; + pcm_test_float ("le-float.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0xad04f7554267aLL, SF_FALSE) ; + pcm_test_float ("be-float.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0xde3e248fa9186LL, SF_FALSE) ; - pcm_test_double ("le-double.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xc682726f958f669cLL, SF_FALSE) ; - pcm_test_double ("be-double.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xd9a3583f8ee51164LL, SF_FALSE) ; + pcm_test_double ("le-double.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0x2726f958f669cLL, SF_FALSE) ; + pcm_test_double ("be-double.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0x3583f8ee51164LL, SF_FALSE) ; - pcm_test_float ("le-float.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x3c2ad04f7554267aLL, SF_TRUE) ; - pcm_test_float ("be-float.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x074de3e248fa9186LL, SF_TRUE) ; + pcm_test_float ("le-float.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0xad04f7554267aLL, SF_TRUE) ; + pcm_test_float ("be-float.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0xde3e248fa9186LL, SF_TRUE) ; - pcm_test_double ("le-double.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xc682726f958f669cLL, SF_TRUE) ; - pcm_test_double ("be-double.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xd9a3583f8ee51164LL, SF_TRUE) ; + pcm_test_double ("le-double.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0x2726f958f669cLL, SF_TRUE) ; + pcm_test_double ("be-double.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0x3583f8ee51164LL, SF_TRUE) ; /* Lite remove end */ return 0 ; @@ -174,7 +177,7 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash) } ; if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %" PRId64 ")\n", __LINE__, items, sfinfo.frames) ; exit (1) ; } ; @@ -236,7 +239,7 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash) } ; if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %" PRId64 ")\n", __LINE__, items, sfinfo.frames) ; exit (1) ; } ; @@ -298,7 +301,7 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash) } ; if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %" PRId64 ")\n", __LINE__, items, sfinfo.frames) ; exit (1) ; } ; @@ -361,7 +364,7 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash) } ; if (sfinfo.frames != items) - { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %" PRId64 ")\n", __LINE__, items, sfinfo.frames) ; exit (1) ; } ; @@ -403,7 +406,7 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f int sign ; double *data, error ; - print_test_name (replace_float ? "pcm_test_float (replace)" : "pcm_test_float", filename) ; + print_test_name (replace_float ? "pcm_test_float (replace)" : "pcm_test_float", filename) ; items = BUFFER_SIZE ; @@ -451,7 +454,7 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f } ; if (sfinfo.frames != items) - { printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %" PRId64 ")\n", __FILE__, __LINE__, items, sfinfo.frames) ; exit (1) ; } ; @@ -472,6 +475,9 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f } ; } ; + /* Seek to end of file. */ + test_seek_or_die (file, 0, SEEK_END, sfinfo.frames, sfinfo.channels, __LINE__) ; + /* Seek to start of file. */ test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; @@ -575,7 +581,7 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f } ; if (sfinfo.frames != frames) - { printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, frames, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %" PRId64 ")\n", __FILE__, __LINE__, frames, sfinfo.frames) ; exit (1) ; } ; @@ -659,7 +665,7 @@ pcm_test_double (const char *filename, int filetype, uint64_t hash, int replace_ /* This is the best test routine. Other should be brought up to this standard. */ - print_test_name (replace_float ? "pcm_test_double (replace)" : "pcm_test_double", filename) ; + print_test_name (replace_float ? "pcm_test_double (replace)" : "pcm_test_double", filename) ; items = BUFFER_SIZE ; @@ -714,7 +720,7 @@ pcm_test_double (const char *filename, int filetype, uint64_t hash, int replace_ } ; if (sfinfo.frames != items) - { printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %" PRId64 ")\n", __FILE__, __LINE__, items, sfinfo.frames) ; exit (1) ; } ; @@ -848,7 +854,7 @@ pcm_test_double (const char *filename, int filetype, uint64_t hash, int replace_ } ; if (sfinfo.frames != frames) - { printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, frames, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %" PRId64 ")\n", __FILE__, __LINE__, frames, sfinfo.frames) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/peak_chunk_test.c b/lib-src/libsndfile/tests/peak_chunk_test.c index 14656aa09..3e1aa3d30 100644 --- a/lib-src/libsndfile/tests/peak_chunk_test.c +++ b/lib-src/libsndfile/tests/peak_chunk_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2016 Erik de Castro Lopo ** ** 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 @@ -22,16 +22,19 @@ #include #include #include +#include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include #include "utils.h" -#define BUFFER_LEN (1<<15) +#define BUFFER_LEN (1 << 15) #define LOG_BUFFER_SIZE 1024 @@ -87,6 +90,13 @@ main (int argc, char *argv []) test_count++ ; } ; + if (do_all || ! strcmp (argv [1], "rf64")) + { test_float_peak ("peak_float.rf64", SF_FORMAT_RF64 | SF_FORMAT_FLOAT) ; + + read_write_peak_test ("rw_peak.rf64", SF_FORMAT_RF64 | SF_FORMAT_FLOAT) ; + test_count++ ; + } ; + if (test_count == 0) { printf ("Mono : ************************************\n") ; printf ("Mono : * No '%s' test defined.\n", argv [1]) ; @@ -305,56 +315,55 @@ check_logged_peaks (char *buffer) static void read_write_peak_test (const char *filename, int filetype) { SNDFILE *file ; - SF_INFO sfinfo ; + SF_INFO sfinfo ; - double small_data [10] ; - double max_peak = 0.0 ; - unsigned k ; + double small_data [10], max_peak = 0.0 ; + unsigned k ; print_test_name (__func__, filename) ; - for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++) - small_data [k] = 0.1 ; + for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++) + small_data [k] = 0.1 ; - sfinfo.samplerate = 44100 ; - sfinfo.channels = 2 ; - sfinfo.format = filetype ; - sfinfo.frames = 0 ; + sfinfo.samplerate = 44100 ; + sfinfo.channels = 2 ; + sfinfo.format = filetype ; + sfinfo.frames = 0 ; /* Open the file, add peak chunk and write samples with value 0.1. */ - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ; - sf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_TRUE) ; + sf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_TRUE) ; test_write_double_or_die (file, 0, small_data, ARRAY_LEN (small_data), __LINE__) ; - sf_close (file) ; + sf_close (file) ; - /* Open the fiel RDWR, write sample valied 1.25. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_FALSE, __LINE__) ; + /* Open the fiel RDWR, write sample valied 1.25. */ + file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_FALSE, __LINE__) ; - for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++) - small_data [k] = 1.0 ; + for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++) + small_data [k] = 1.0 ; test_write_double_or_die (file, 0, small_data, ARRAY_LEN (small_data), __LINE__) ; - sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (max_peak)) ; + sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (max_peak)) ; - sf_close (file) ; + sf_close (file) ; - exit_if_true (max_peak < 0.1, "\n\nLine %d : max peak (%5.3f) should not be 0.1.\n\n", __LINE__, max_peak) ; + exit_if_true (max_peak < 0.1, "\n\nLine %d : max peak (%5.3f) should not be 0.1.\n\n", __LINE__, max_peak) ; - /* Open the file and test the values written to the PEAK chunk. */ - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; + /* Open the file and test the values written to the PEAK chunk. */ + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; exit_if_true (sfinfo.channels * sfinfo.frames != 2 * ARRAY_LEN (small_data), - "Line %d : frame count is %ld, should be %d\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * ARRAY_LEN (small_data)) ; + "Line %d : frame count is %" PRId64 ", should be %zd\n", __LINE__, sfinfo.frames, 2 * ARRAY_LEN (small_data)) ; - sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (double)) ; + sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (double)) ; - sf_close (file) ; + sf_close (file) ; - exit_if_true (max_peak < 1.0, "\n\nLine %d : max peak (%5.3f) should be 1.0.\n\n", __LINE__, max_peak) ; + exit_if_true (max_peak < 1.0, "\n\nLine %d : max peak (%5.3f) should be 1.0.\n\n", __LINE__, max_peak) ; unlink (filename) ; puts ("ok") ; diff --git a/lib-src/libsndfile/tests/pedantic-header-test.sh.in b/lib-src/libsndfile/tests/pedantic-header-test.sh.in index 8b1962803..d10c51b62 100644 --- a/lib-src/libsndfile/tests/pedantic-header-test.sh.in +++ b/lib-src/libsndfile/tests/pedantic-header-test.sh.in @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 Erik de Castro Lopo +# Copyright (C) 2010-2017 Erik de Castro Lopo # # All rights reserved. # @@ -42,7 +42,7 @@ if test -n "@GCC_MAJOR_VERSION@" ; then CC=`echo "@CC@" | sed "s/.*shave cc //"` # Compile with -Werror and -pedantic. - $CC -std=c99 -Werror -pedantic -I@top_builddir@/src -c @top_srcdir@/tests/sfversion.c -o /dev/null + $CC -std=c99 -Werror -pedantic -I@top_srcdir@/src -I@abs_top_builddir@/src -c @top_srcdir@/tests/sfversion.c -o /dev/null # Check compiler return status. if test $? -ne 0 ; then diff --git a/lib-src/libsndfile/tests/pipe_test.c b/lib-src/libsndfile/tests/pipe_test.c deleted file mode 100644 index 10fa5725c..000000000 --- a/lib-src/libsndfile/tests/pipe_test.c +++ /dev/null @@ -1,525 +0,0 @@ -/* -** Copyright (C) 2001-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -/*========================================================================== -** This is a test program which tests reading from and writing to pipes. -*/ - -#include "sfconfig.h" - -#include -#include -#include - -#if (OS_IS_WIN32 || HAVE_PIPE == 0 || HAVE_WAITPID == 0) - -int -main (void) -{ - puts (" pipe_test : this test doesn't work on this OS.") ; - return 0 ; -} /* main */ - -#else - -#if HAVE_UNISTD_H -#include -#endif - -#include -#include -#include -#include - -#include - -#include "utils.h" - -typedef struct -{ int format ; - const char *ext ; -} FILETYPE ; - -static int file_exists (const char *filename) ; -static void useek_pipe_rw_test (int filetype, const char *ext) ; -static void pipe_read_test (int filetype, const char *ext) ; -static void pipe_write_test (const char *ext) ; -static void pipe_test_others (FILETYPE*, FILETYPE*) ; - -static FILETYPE read_write_types [] = -{ { SF_FORMAT_RAW , "raw" }, - { SF_FORMAT_AU , "au" }, - /* Lite remove start */ - { SF_FORMAT_PAF , "paf" }, - { SF_FORMAT_IRCAM , "ircam" }, - { SF_FORMAT_PVF , "pvf" }, - /* Lite remove end */ - { 0 , NULL } -} ; - -static FILETYPE read_only_types [] = -{ { SF_FORMAT_RAW , "raw" }, - { SF_FORMAT_AU , "au" }, - { SF_FORMAT_AIFF , "aiff" }, - { SF_FORMAT_WAV , "wav" }, - { SF_FORMAT_W64 , "w64" }, - /* Lite remove start */ - { SF_FORMAT_PAF , "paf" }, - { SF_FORMAT_NIST , "nist" }, - { SF_FORMAT_IRCAM , "ircam" }, - { SF_FORMAT_MAT4 , "mat4" }, - { SF_FORMAT_MAT5 , "mat5" }, - { SF_FORMAT_SVX , "svx" }, - { SF_FORMAT_PVF , "pvf" }, - /* Lite remove end */ - { 0 , NULL } -} ; - -int -main (void) -{ int k ; - - if (file_exists ("libsndfile.spec.in")) - exit_if_true (chdir ("tests") != 0, "\n Error : chdir ('tests') failed.\n") ; - - for (k = 0 ; read_only_types [k].format ; k++) - pipe_read_test (read_only_types [k].format, read_only_types [k].ext) ; - - for (k = 0 ; read_write_types [k].format ; k++) - pipe_write_test (read_write_types [k].ext) ; - - for (k = 0 ; read_write_types [k].format ; k++) - useek_pipe_rw_test (read_write_types [k].format, read_write_types [k].ext) ; - - if (0) - pipe_test_others (read_write_types, read_only_types) ; - - return 0 ; -} /* main */ - -/*============================================================================== -*/ - -static void -pipe_read_test (int filetype, const char *ext) -{ static short data [PIPE_TEST_LEN] ; - static char buffer [256] ; - static char filename [256] ; - - SNDFILE *outfile ; - SF_INFO sfinfo ; - int k, retval ; - - snprintf (filename, sizeof (filename), "pipe_in.%s", ext) ; - print_test_name ("pipe_read_test", filename) ; - - sfinfo.format = filetype | SF_FORMAT_PCM_16 ; - sfinfo.channels = 1 ; - sfinfo.samplerate = 44100 ; - - for (k = 0 ; k < PIPE_TEST_LEN ; k++) - data [k] = PIPE_INDEX (k) ; - - outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_writef_short_or_die (outfile, 0, data, PIPE_TEST_LEN, __LINE__) ; - sf_close (outfile) ; - - snprintf (buffer, sizeof (buffer), "cat %s | ./stdin_test %s ", filename, ext) ; - if ((retval = system (buffer)) != 0) - { retval = WEXITSTATUS (retval) ; - printf ("\n\n Line %d : pipe test returned error for file type \"%s\".\n\n", __LINE__, ext) ; - exit (retval) ; - } ; - - unlink (filename) ; - puts ("ok") ; - - return ; -} /* pipe_read_test */ - -static void -pipe_write_test (const char *ext) -{ static char buffer [256] ; - - int retval ; - - print_test_name ("pipe_write_test", ext) ; - - snprintf (buffer, sizeof (buffer), "./stdout_test %s | ./stdin_test %s ", ext, ext) ; - if ((retval = system (buffer))) - { retval = WEXITSTATUS (retval) ; - printf ("\n\n Line %d : pipe test returned error file type \"%s\".\n\n", __LINE__, ext) ; - exit (retval) ; - } ; - - puts ("ok") ; - - return ; -} /* pipe_write_test */ - -/*============================================================================== -*/ - - -static void -useek_pipe_rw_short (const char * ext, SF_INFO * psfinfo_write, SF_INFO * psfinfo_read) -{ static short buffer [PIPE_TEST_LEN] ; - static short data [PIPE_TEST_LEN] ; - SNDFILE *outfile ; - SNDFILE *infile_piped ; - - int k, status = 0 ; - int pipefd [2] ; - pid_t pida ; - - for (k = 0 ; k < PIPE_TEST_LEN ; k++) - data [k] = PIPE_INDEX (k) ; - - /* - ** Create the pipe. - */ - exit_if_true (pipe (pipefd) != 0, "\n\n%s %d : pipe failed : %s\n", __func__, __LINE__, strerror (errno)) ; - - /* - ** Attach the write end of the pipe to be written to. - */ - if ((outfile = sf_open_fd (pipefd [1], SFM_WRITE, psfinfo_write, SF_TRUE)) == NULL) - { printf ("\n\n%s %d : unable to create unseekable pipe for write type \"%s\".\n", __func__, __LINE__, ext) ; - printf ("\t%s\n\n", sf_strerror (outfile)) ; - exit (1) ; - } ; - - if (sf_error (outfile) != SF_ERR_NO_ERROR) - { printf ("\n\n%s %d : unable to open unseekable pipe for write type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* - ** Attach the read end of the pipe to be read from. - */ - if ((infile_piped = sf_open_fd (pipefd [0], SFM_READ, psfinfo_read, SF_TRUE)) == NULL) - { printf ("\n\n%s %d : unable to create unseekable pipe for read type. \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - if (sf_error (infile_piped) != SF_ERR_NO_ERROR) - { printf ("\n\n%s %d : unable to open unseekable pipe for read type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* Fork a child process that will write directly into the pipe. */ - if ((pida = fork ()) == 0) /* child process */ - { test_writef_short_or_die (outfile, 0, data, PIPE_TEST_LEN, __LINE__) ; - exit (0) ; - } ; - - /* In the parent process, read from the pipe and compare what is read - ** to what is written, if they match everything went as planned. - */ - test_readf_short_or_die (infile_piped, 0, buffer, PIPE_TEST_LEN, __LINE__) ; - if (memcmp (buffer, data, sizeof (buffer)) != 0) - { printf ("\n\n%s %d : unseekable pipe test failed for file type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* Wait for the child process to return. */ - waitpid (pida, &status, 0) ; - status = WEXITSTATUS (status) ; - sf_close (outfile) ; - sf_close (infile_piped) ; - - if (status != 0) - { printf ("\n\n%s %d : status of child process is %d for file type %s.\n\n", __func__, __LINE__, status, ext) ; - exit (1) ; - } ; - - return ; -} /* useek_pipe_rw_short */ - - -static void -useek_pipe_rw_float (const char * ext, SF_INFO * psfinfo_write, SF_INFO * psfinfo_read) -{ static float buffer [PIPE_TEST_LEN] ; - static float data [PIPE_TEST_LEN] ; - SNDFILE *outfile ; - SNDFILE *infile_piped ; - - int k, status = 0 ; - int pipefd [2] ; - pid_t pida ; - - for (k = 0 ; k < PIPE_TEST_LEN ; k++) - data [k] = PIPE_INDEX (k) ; - - /* - ** Create the pipe. - */ - exit_if_true (pipe (pipefd) != 0, "\n\n%s %d : pipe failed : %s\n", __func__, __LINE__, strerror (errno)) ; - - /* - ** Attach the write end of the pipe to be written to. - */ - if ((outfile = sf_open_fd (pipefd [1], SFM_WRITE, psfinfo_write, SF_TRUE)) == NULL) - { printf ("\n\n%s %d : unable to create unseekable pipe for write type \"%s\".\n", __func__, __LINE__, ext) ; - printf ("\t%s\n\n", sf_strerror (outfile)) ; - exit (1) ; - } ; - - if (sf_error (outfile) != SF_ERR_NO_ERROR) - { printf ("\n\n%s %d : unable to open unseekable pipe for write type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* - ** Attach the read end of the pipe to be read from. - */ - if ((infile_piped = sf_open_fd (pipefd [0], SFM_READ, psfinfo_read, SF_TRUE)) == NULL) - { printf ("\n\n%s %d : unable to create unseekable pipe for read type. \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - if (sf_error (infile_piped) != SF_ERR_NO_ERROR) - { printf ("\n\n%s %d : unable to open unseekable pipe for read type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* Fork a child process that will write directly into the pipe. */ - if ((pida = fork ()) == 0) /* child process */ - { test_writef_float_or_die (outfile, 0, data, PIPE_TEST_LEN, __LINE__) ; - exit (0) ; - } ; - - /* In the parent process, read from the pipe and compare what is read - ** to what is written, if they match everything went as planned. - */ - test_readf_float_or_die (infile_piped, 0, buffer, PIPE_TEST_LEN, __LINE__) ; - if (memcmp (buffer, data, sizeof (buffer)) != 0) - { printf ("\n\n%s %d : unseekable pipe test failed for file type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* Wait for the child process to return. */ - waitpid (pida, &status, 0) ; - status = WEXITSTATUS (status) ; - sf_close (outfile) ; - sf_close (infile_piped) ; - - if (status != 0) - { printf ("\n\n%s %d : status of child process is %d for file type %s.\n\n", __func__, __LINE__, status, ext) ; - exit (1) ; - } ; - - return ; -} /* useek_pipe_rw_float */ - - -static void -useek_pipe_rw_double (const char * ext, SF_INFO * psfinfo_write, SF_INFO * psfinfo_read) -{ static double buffer [PIPE_TEST_LEN] ; - static double data [PIPE_TEST_LEN] ; - SNDFILE *outfile ; - SNDFILE *infile_piped ; - - int k, status = 0 ; - int pipefd [2] ; - pid_t pida ; - - for (k = 0 ; k < PIPE_TEST_LEN ; k++) - data [k] = PIPE_INDEX (k) ; - - /* - ** Create the pipe. - */ - exit_if_true (pipe (pipefd) != 0, "\n\n%s %d : pipe failed : %s\n", __func__, __LINE__, strerror (errno)) ; - - /* - ** Attach the write end of the pipe to be written to. - */ - if ((outfile = sf_open_fd (pipefd [1], SFM_WRITE, psfinfo_write, SF_TRUE)) == NULL) - { printf ("\n\n%s %d : unable to create unseekable pipe for write type \"%s\".\n", __func__, __LINE__, ext) ; - printf ("\t%s\n\n", sf_strerror (outfile)) ; - exit (1) ; - } ; - - if (sf_error (outfile) != SF_ERR_NO_ERROR) - { printf ("\n\n%s %d : unable to open unseekable pipe for write type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* - ** Attach the read end of the pipe to be read from. - */ - if ((infile_piped = sf_open_fd (pipefd [0], SFM_READ, psfinfo_read, SF_TRUE)) == NULL) - { printf ("\n\n%s %d : unable to create unseekable pipe for read type. \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - if (sf_error (infile_piped) != SF_ERR_NO_ERROR) - { printf ("\n\n%s %d : unable to open unseekable pipe for read type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* Fork a child process that will write directly into the pipe. */ - if ((pida = fork ()) == 0) /* child process */ - { test_writef_double_or_die (outfile, 0, data, PIPE_TEST_LEN, __LINE__) ; - exit (0) ; - } ; - - /* In the parent process, read from the pipe and compare what is read - ** to what is written, if they match everything went as planned. - */ - test_readf_double_or_die (infile_piped, 0, buffer, PIPE_TEST_LEN, __LINE__) ; - if (memcmp (buffer, data, sizeof (buffer)) != 0) - { printf ("\n\n%s %d : unseekable pipe test failed for file type \"%s\".\n\n", __func__, __LINE__, ext) ; - exit (1) ; - } ; - - /* Wait for the child process to return. */ - waitpid (pida, &status, 0) ; - status = WEXITSTATUS (status) ; - sf_close (outfile) ; - sf_close (infile_piped) ; - - if (status != 0) - { printf ("\n\n%s %d : status of child process is %d for file type %s.\n\n", __func__, __LINE__, status, ext) ; - exit (1) ; - } ; - - return ; -} /* useek_pipe_rw_double */ - - - - -static void -useek_pipe_rw_test (int filetype, const char *ext) -{ SF_INFO sfinfo_write ; - SF_INFO sfinfo_read ; - - print_test_name ("useek_pipe_rw_test", ext) ; - - /* - ** Setup the INFO structures for the filetype we will be - ** working with. - */ - sfinfo_write.format = filetype | SF_FORMAT_PCM_16 ; - sfinfo_write.channels = 1 ; - sfinfo_write.samplerate = 44100 ; - - - sfinfo_read.format = 0 ; - if (filetype == SF_FORMAT_RAW) - { sfinfo_read.format = filetype | SF_FORMAT_PCM_16 ; - sfinfo_read.channels = 1 ; - sfinfo_read.samplerate = 44100 ; - } ; - - useek_pipe_rw_short (ext, &sfinfo_write, &sfinfo_read) ; - - sfinfo_read.format = sfinfo_write.format = filetype | SF_FORMAT_FLOAT ; - if (sf_format_check (&sfinfo_read) != 0) - useek_pipe_rw_float (ext, &sfinfo_write, &sfinfo_read) ; - - sfinfo_read.format = sfinfo_write.format = filetype | SF_FORMAT_DOUBLE ; - if (sf_format_check (&sfinfo_read) != 0) - useek_pipe_rw_double (ext, &sfinfo_write, &sfinfo_read) ; - - puts ("ok") ; - return ; -} /* useek_pipe_rw_test */ - - - -static void -pipe_test_others (FILETYPE* list1, FILETYPE* list2) -{ SF_FORMAT_INFO info ; - int k, m, major_count, in_list ; - - print_test_name ("pipe_test_others", "") ; - - sf_command (NULL, SFC_GET_FORMAT_MAJOR_COUNT, &major_count, sizeof (int)) ; - - for (k = 0 ; k < major_count ; k++) - { info.format = k ; - - sf_command (NULL, SFC_GET_FORMAT_MAJOR, &info, sizeof (info)) ; - - in_list = SF_FALSE ; - for (m = 0 ; list1 [m].format ; m++) - if (info.format == list1 [m].format) - in_list = SF_TRUE ; - - for (m = 0 ; list2 [m].format ; m++) - if (info.format == list2 [m].format) - in_list = SF_TRUE ; - - if (in_list) - continue ; - - printf ("%s %x\n", info.name, info.format) ; - - if (1) - { static short data [PIPE_TEST_LEN] ; - static char buffer [256] ; - static const char *filename = "pipe_in.dat" ; - - SNDFILE *outfile ; - SF_INFO sfinfo ; - int retval ; - - sfinfo.format = info.format | SF_FORMAT_PCM_16 ; - sfinfo.channels = 1 ; - sfinfo.samplerate = 44100 ; - - outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_writef_short_or_die (outfile, 0, data, PIPE_TEST_LEN, __LINE__) ; - sf_close (outfile) ; - - snprintf (buffer, sizeof (buffer), "cat %s | ./stdin_test %s %d ", filename, info.extension, PIPE_TEST_LEN) ; - if ((retval = system (buffer)) == 0) - { retval = WEXITSTATUS (retval) ; - printf ("\n\n Line %d : pipe test should have returned error file type \"%s\" but didn't.\n\n", __LINE__, info.name) ; - exit (1) ; - } ; - - unlink (filename) ; - } ; - } ; - - - puts ("ok") ; - - return ; -} /* pipe_test_others */ - - -/*============================================================================== -*/ - -static int -file_exists (const char *filename) -{ struct stat buf ; - - if (stat (filename, &buf)) - return 0 ; - - return 1 ; -} /* file_exists */ - -#endif - diff --git a/lib-src/libsndfile/tests/pipe_test.tpl b/lib-src/libsndfile/tests/pipe_test.tpl index 52155565c..9bb30cc79 100644 --- a/lib-src/libsndfile/tests/pipe_test.tpl +++ b/lib-src/libsndfile/tests/pipe_test.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2017 Erik de Castro Lopo ** ** 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 @@ -27,7 +27,7 @@ #include #include -#if (OS_IS_WIN32 || HAVE_PIPE == 0 || HAVE_WAITPID == 0) +#if (OS_IS_WIN32 || defined __OS2__ || HAVE_PIPE == 0 || HAVE_WAITPID == 0) int main (void) @@ -56,7 +56,6 @@ typedef struct const char *ext ; } FILETYPE ; -static int file_exists (const char *filename) ; static void useek_pipe_rw_test (int filetype, const char *ext) ; static void pipe_read_test (int filetype, const char *ext) ; static void pipe_write_test (const char *ext) ; @@ -95,9 +94,6 @@ int main (void) { int k ; - if (file_exists ("libsndfile.spec.in")) - exit_if_true (chdir ("tests") != 0, "\n Error : chdir ('tests') failed.\n") ; - for (k = 0 ; read_only_types [k].format ; k++) pipe_read_test (read_only_types [k].format, read_only_types [k].ext) ; @@ -129,6 +125,7 @@ pipe_read_test (int filetype, const char *ext) snprintf (filename, sizeof (filename), "pipe_in.%s", ext) ; print_test_name ("pipe_read_test", filename) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.format = filetype | SF_FORMAT_PCM_16 ; sfinfo.channels = 1 ; sfinfo.samplerate = 44100 ; @@ -140,7 +137,7 @@ pipe_read_test (int filetype, const char *ext) test_writef_short_or_die (outfile, 0, data, PIPE_TEST_LEN, __LINE__) ; sf_close (outfile) ; - snprintf (buffer, sizeof (buffer), "cat %s | ./stdin_test %s ", filename, ext) ; + snprintf (buffer, sizeof (buffer), "cat %s | ./tests/stdin_test %s ", filename, ext) ; if ((retval = system (buffer)) != 0) { retval = WEXITSTATUS (retval) ; printf ("\n\n Line %d : pipe test returned error for file type \"%s\".\n\n", __LINE__, ext) ; @@ -161,7 +158,7 @@ pipe_write_test (const char *ext) print_test_name ("pipe_write_test", ext) ; - snprintf (buffer, sizeof (buffer), "./stdout_test %s | ./stdin_test %s ", ext, ext) ; + snprintf (buffer, sizeof (buffer), "./tests/stdout_test %s | ./tests/stdin_test %s ", ext, ext) ; if ((retval = system (buffer))) { retval = WEXITSTATUS (retval) ; printf ("\n\n Line %d : pipe test returned error file type \"%s\".\n\n", __LINE__, ext) ; @@ -331,6 +328,7 @@ pipe_test_others (FILETYPE* list1, FILETYPE* list2) SF_INFO sfinfo ; int retval ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.format = info.format | SF_FORMAT_PCM_16 ; sfinfo.channels = 1 ; sfinfo.samplerate = 44100 ; @@ -339,7 +337,7 @@ pipe_test_others (FILETYPE* list1, FILETYPE* list2) test_writef_short_or_die (outfile, 0, data, PIPE_TEST_LEN, __LINE__) ; sf_close (outfile) ; - snprintf (buffer, sizeof (buffer), "cat %s | ./stdin_test %s %d ", filename, info.extension, PIPE_TEST_LEN) ; + snprintf (buffer, sizeof (buffer), "cat %s | ./tests/stdin_test %s %d ", filename, info.extension, PIPE_TEST_LEN) ; if ((retval = system (buffer)) == 0) { retval = WEXITSTATUS (retval) ; printf ("\n\n Line %d : pipe test should have returned error file type \"%s\" but didn't.\n\n", __LINE__, info.name) ; @@ -360,15 +358,5 @@ pipe_test_others (FILETYPE* list1, FILETYPE* list2) /*============================================================================== */ -static int -file_exists (const char *filename) -{ struct stat buf ; - - if (stat (filename, &buf)) - return 0 ; - - return 1 ; -} /* file_exists */ - #endif diff --git a/lib-src/libsndfile/tests/raw_test.c b/lib-src/libsndfile/tests/raw_test.c index 9c788d107..be0f94dcf 100644 --- a/lib-src/libsndfile/tests/raw_test.c +++ b/lib-src/libsndfile/tests/raw_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2014 Erik de Castro Lopo ** ** 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 @@ -22,16 +22,19 @@ #include #include #include +#include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include #include "utils.h" -#define BUFFER_LEN (1<<10) +#define BUFFER_LEN (1 << 10) #define LOG_BUFFER_SIZE 1024 static void raw_offset_test (const char *filename, int typeminor) ; @@ -60,7 +63,7 @@ raw_offset_test (const char *filename, int typeminor) { SNDFILE *sndfile ; SF_INFO sfinfo ; sf_count_t start ; - int k, frames ; + int k ; print_test_name ("raw_offset_test", filename) ; @@ -69,8 +72,6 @@ raw_offset_test (const char *filename, int typeminor) sfinfo.channels = 1 ; sfinfo.frames = 0 ; - frames = BUFFER_LEN / sfinfo.channels ; - sndfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; start = 0 ; @@ -85,8 +86,8 @@ raw_offset_test (const char *filename, int typeminor) sndfile = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; check_log_buffer_or_die (sndfile, __LINE__) ; - if (abs (BUFFER_LEN - sfinfo.frames) > 1) - { printf ("\n\nLine %d : Incorrect sample count (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), BUFFER_LEN) ; + if (ABS (BUFFER_LEN - sfinfo.frames) > 1) + { printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, BUFFER_LEN) ; dump_log_buffer (sndfile) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/rdwr_test.c b/lib-src/libsndfile/tests/rdwr_test.c deleted file mode 100644 index d6f12220a..000000000 --- a/lib-src/libsndfile/tests/rdwr_test.c +++ /dev/null @@ -1,240 +0,0 @@ -/* -** Copyright (C) 2010-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include -#include - -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#if (HAVE_DECL_S_IRGRP == 0) -#include -#endif - -#if (defined (WIN32) || defined (_WIN32)) -#include -#include -#endif - -#include - -#include "utils.h" - -static void rdwr_short_test (const char *filename) ; -static void rdwr_int_test (const char *filename) ; -static void rdwr_float_test (const char *filename) ; -static void rdwr_double_test (const char *filename) ; -static void rdwr_raw_test (const char *filename) ; - - -int -main (void) -{ - rdwr_short_test ("rdwr_short.wav") ; - rdwr_int_test ("rdwr_int.wav") ; - rdwr_float_test ("rdwr_float.wav") ; - rdwr_double_test ("rdwr_double.wav") ; - rdwr_raw_test ("rdwr_raw.wav") ; - - return 0 ; -} /* main */ - - -/*============================================================================================ -** Here are the test functions. -*/ - -static void -rdwr_short_test (const char *filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - sf_count_t frames ; - short buffer [160] ; - - print_test_name ("rdwr_short_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound file with no data. */ - sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 ; - sfinfo.samplerate = 16000 ; - sfinfo.channels = 1 ; - - unlink (filename) ; - - frames = ARRAY_LEN (buffer) ; - - /* Open again for read/write. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_short_or_die (file, 0, buffer, frames, __LINE__) ; - - test_read_short_or_die (file, 0, buffer, frames, __LINE__) ; - - sf_close (file) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* rdwr_short_test */ - -static void -rdwr_int_test (const char *filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - sf_count_t frames ; - int buffer [160] ; - - print_test_name ("rdwr_int_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound file with no data. */ - sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM_32 ; - sfinfo.samplerate = 16000 ; - sfinfo.channels = 1 ; - - unlink (filename) ; - - frames = ARRAY_LEN (buffer) ; - - /* Open again for read/write. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_int_or_die (file, 0, buffer, frames, __LINE__) ; - - test_read_int_or_die (file, 0, buffer, frames, __LINE__) ; - - sf_close (file) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* rdwr_int_test */ - -static void -rdwr_float_test (const char *filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - sf_count_t frames ; - float buffer [160] ; - - print_test_name ("rdwr_float_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound file with no data. */ - sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_FLOAT ; - sfinfo.samplerate = 16000 ; - sfinfo.channels = 1 ; - - unlink (filename) ; - - frames = ARRAY_LEN (buffer) ; - - /* Open again for read/write. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_float_or_die (file, 0, buffer, frames, __LINE__) ; - - test_read_float_or_die (file, 0, buffer, frames, __LINE__) ; - - sf_close (file) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* rdwr_float_test */ - -static void -rdwr_double_test (const char *filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - sf_count_t frames ; - double buffer [160] ; - - print_test_name ("rdwr_double_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound file with no data. */ - sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_DOUBLE ; - sfinfo.samplerate = 16000 ; - sfinfo.channels = 1 ; - - unlink (filename) ; - - frames = ARRAY_LEN (buffer) ; - - /* Open again for read/write. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_double_or_die (file, 0, buffer, frames, __LINE__) ; - - test_read_double_or_die (file, 0, buffer, frames, __LINE__) ; - - sf_close (file) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* rdwr_double_test */ - -static void -rdwr_raw_test (const char *filename) -{ SNDFILE *file ; - SF_INFO sfinfo ; - sf_count_t frames ; - unsigned char buffer [160] ; - - print_test_name ("rdwr_raw_test", filename) ; - - memset (buffer, 0, sizeof (buffer)) ; - - /* Create sound file with no data. */ - sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM_U8 ; - sfinfo.samplerate = 16000 ; - sfinfo.channels = 1 ; - - unlink (filename) ; - - frames = ARRAY_LEN (buffer) ; - - /* Open again for read/write. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; - - test_write_raw_or_die (file, 0, buffer, frames, __LINE__) ; - - test_read_raw_or_die (file, 0, buffer, frames, __LINE__) ; - - sf_close (file) ; - unlink (filename) ; - - puts ("ok") ; - return ; -} /* rdwr_raw_test */ - - - diff --git a/lib-src/libsndfile/tests/rdwr_test.tpl b/lib-src/libsndfile/tests/rdwr_test.tpl index dc862e2fb..8cfdd3687 100644 --- a/lib-src/libsndfile/tests/rdwr_test.tpl +++ b/lib-src/libsndfile/tests/rdwr_test.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 2010-2011 Erik de Castro Lopo +** Copyright (C) 2010-2012 Erik de Castro Lopo ** ** 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 @@ -70,8 +70,8 @@ main (void) rdwr_[+ (get "name") +]_test (const char *filename) { SNDFILE *file ; SF_INFO sfinfo ; - sf_count_t frames ; - [+ (get "type") +] buffer [160] ; + sf_count_t frames ; + [+ (get "type") +] buffer [160] ; print_test_name ("rdwr_[+ (get "name") +]_test", filename) ; diff --git a/lib-src/libsndfile/tests/scale_clip_test.c b/lib-src/libsndfile/tests/scale_clip_test.c deleted file mode 100644 index 57b0b9607..000000000 --- a/lib-src/libsndfile/tests/scale_clip_test.c +++ /dev/null @@ -1,1853 +0,0 @@ -/* -** Copyright (C) 1999-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#include - -#include - -#include "utils.h" - -#ifndef M_PI -#define M_PI 3.14159265358979323846264338 -#endif - -#define HALF_BUFFER_SIZE (1 << 12) -#define BUFFER_SIZE (2 * HALF_BUFFER_SIZE) - -#define SINE_AMP 1.1 -#define MAX_ERROR 0.0202 - - -static void flt_scale_clip_test_16 (const char *filename, int filetype, float maxval) ; -static void flt_scale_clip_test_24 (const char *filename, int filetype, float maxval) ; -static void flt_scale_clip_test_32 (const char *filename, int filetype, float maxval) ; -static void flt_scale_clip_test_08 (const char *filename, int filetype, float maxval) ; - -static void dbl_scale_clip_test_16 (const char *filename, int filetype, float maxval) ; -static void dbl_scale_clip_test_24 (const char *filename, int filetype, float maxval) ; -static void dbl_scale_clip_test_32 (const char *filename, int filetype, float maxval) ; -static void dbl_scale_clip_test_08 (const char *filename, int filetype, float maxval) ; - - - -static void flt_short_clip_read_test (const char *filename, int filetype) ; -static void flt_int_clip_read_test (const char *filename, int filetype) ; - -static void dbl_short_clip_read_test (const char *filename, int filetype) ; -static void dbl_int_clip_read_test (const char *filename, int filetype) ; - - - -static void short_flt_scale_write_test (const char *filename, int filetype) ; -static void short_dbl_scale_write_test (const char *filename, int filetype) ; - -static void int_flt_scale_write_test (const char *filename, int filetype) ; -static void int_dbl_scale_write_test (const char *filename, int filetype) ; - - -typedef union -{ double dbl [BUFFER_SIZE] ; - float flt [BUFFER_SIZE] ; - int i [BUFFER_SIZE] ; - short s [BUFFER_SIZE] ; -} BUFFER ; - -/* Data buffer. */ -static BUFFER buffer_out ; -static BUFFER buffer_in ; - -int -main (void) -{ - flt_scale_clip_test_08 ("scale_clip_s8.au", SF_FORMAT_AU | SF_FORMAT_PCM_S8, 1.0 * 0x80) ; - flt_scale_clip_test_08 ("scale_clip_u8.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_U8, 1.0 * 0x80) ; - - dbl_scale_clip_test_08 ("scale_clip_s8.au", SF_FORMAT_AU | SF_FORMAT_PCM_S8, 1.0 * 0x80) ; - dbl_scale_clip_test_08 ("scale_clip_u8.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_U8, 1.0 * 0x80) ; - - /* - ** Now use SF_FORMAT_AU where possible because it allows both - ** big and little endian files. - */ - - flt_scale_clip_test_16 ("scale_clip_be16.au", SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_PCM_16, 1.0 * 0x8000) ; - flt_scale_clip_test_16 ("scale_clip_le16.au", SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_16, 1.0 * 0x8000) ; - flt_scale_clip_test_24 ("scale_clip_be24.au", SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_PCM_24, 1.0 * 0x800000) ; - flt_scale_clip_test_24 ("scale_clip_le24.au", SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_24, 1.0 * 0x800000) ; - flt_scale_clip_test_32 ("scale_clip_be32.au", SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_PCM_32, 1.0 * 0x80000000) ; - flt_scale_clip_test_32 ("scale_clip_le32.au", SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_32, 1.0 * 0x80000000) ; - - dbl_scale_clip_test_16 ("scale_clip_be16.au", SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_PCM_16, 1.0 * 0x8000) ; - dbl_scale_clip_test_16 ("scale_clip_le16.au", SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_16, 1.0 * 0x8000) ; - dbl_scale_clip_test_24 ("scale_clip_be24.au", SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_PCM_24, 1.0 * 0x800000) ; - dbl_scale_clip_test_24 ("scale_clip_le24.au", SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_24, 1.0 * 0x800000) ; - dbl_scale_clip_test_32 ("scale_clip_be32.au", SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_PCM_32, 1.0 * 0x80000000) ; - dbl_scale_clip_test_32 ("scale_clip_le32.au", SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_32, 1.0 * 0x80000000) ; - - flt_short_clip_read_test ("flt_short.au" , SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_FLOAT) ; - flt_int_clip_read_test ("flt_int.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_FLOAT) ; - dbl_short_clip_read_test ("dbl_short.au" , SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_DOUBLE) ; - dbl_int_clip_read_test ("dbl_int.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_DOUBLE) ; - - short_flt_scale_write_test ("short_flt.au" , SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_FLOAT) ; - int_flt_scale_write_test ("int_flt.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_FLOAT) ; - short_dbl_scale_write_test ("short_dbl.au" , SF_ENDIAN_BIG | SF_FORMAT_AU | SF_FORMAT_DOUBLE) ; - int_dbl_scale_write_test ("int_dbl.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_DOUBLE) ; - - return 0 ; -} /* main */ - -/*============================================================================================ -** Here are the test functions. -*/ - - -static void -flt_scale_clip_test_16 (const char *filename, int filetype, float maxval) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k ; - float *data_out, *data_in ; - double diff, clip_max_diff ; - - print_test_name ("flt_scale_clip_test_16", filename) ; - - data_out = buffer_out.flt ; - data_in = buffer_in.flt ; - - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { data_out [k] = 1.2 * sin (2 * M_PI * k / HALF_BUFFER_SIZE) ; - data_out [k + HALF_BUFFER_SIZE] = data_out [k] * maxval ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* - ** Write two versions of the data: - ** normalized and clipped - ** un-normalized and clipped. - */ - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_write_float_or_die (file, 0, data_out, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - test_write_float_or_die (file, 0, data_out + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&buffer_in, 0, sizeof (buffer_in)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_float_or_die (file, 0, data_in, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - test_read_float_or_die (file, 0, data_in + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - /* Check normalized version. */ - clip_max_diff = 0.0 ; - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > 1.0) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > 1.0) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0 / 0x8000) - { printf ("\n\nLine %d: Clipping difference (%e) too large (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - /* Check the un-normalized data. */ - clip_max_diff = 0.0 ; - for (k = HALF_BUFFER_SIZE ; k < BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > maxval) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > maxval) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (un-normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0) - { printf ("\n\nLine %d: Clipping difference (%e) too large (un-normalised).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - printf ("ok\n") ; - unlink (filename) ; -} /* flt_scale_clip_test_16 */ - -static void -flt_scale_clip_test_24 (const char *filename, int filetype, float maxval) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k ; - float *data_out, *data_in ; - double diff, clip_max_diff ; - - print_test_name ("flt_scale_clip_test_24", filename) ; - - data_out = buffer_out.flt ; - data_in = buffer_in.flt ; - - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { data_out [k] = 1.2 * sin (2 * M_PI * k / HALF_BUFFER_SIZE) ; - data_out [k + HALF_BUFFER_SIZE] = data_out [k] * maxval ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* - ** Write two versions of the data: - ** normalized and clipped - ** un-normalized and clipped. - */ - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_write_float_or_die (file, 0, data_out, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - test_write_float_or_die (file, 0, data_out + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&buffer_in, 0, sizeof (buffer_in)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_float_or_die (file, 0, data_in, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - test_read_float_or_die (file, 0, data_in + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - /* Check normalized version. */ - clip_max_diff = 0.0 ; - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > 1.0) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > 1.0) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0 / 0x800000) - { printf ("\n\nLine %d: Clipping difference (%e) too large (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - /* Check the un-normalized data. */ - clip_max_diff = 0.0 ; - for (k = HALF_BUFFER_SIZE ; k < BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > maxval) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > maxval) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (un-normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0) - { printf ("\n\nLine %d: Clipping difference (%e) too large (un-normalised).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - printf ("ok\n") ; - unlink (filename) ; -} /* flt_scale_clip_test_24 */ - -static void -flt_scale_clip_test_32 (const char *filename, int filetype, float maxval) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k ; - float *data_out, *data_in ; - double diff, clip_max_diff ; - - print_test_name ("flt_scale_clip_test_32", filename) ; - - data_out = buffer_out.flt ; - data_in = buffer_in.flt ; - - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { data_out [k] = 1.2 * sin (2 * M_PI * k / HALF_BUFFER_SIZE) ; - data_out [k + HALF_BUFFER_SIZE] = data_out [k] * maxval ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* - ** Write two versions of the data: - ** normalized and clipped - ** un-normalized and clipped. - */ - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_write_float_or_die (file, 0, data_out, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - test_write_float_or_die (file, 0, data_out + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&buffer_in, 0, sizeof (buffer_in)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_float_or_die (file, 0, data_in, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - test_read_float_or_die (file, 0, data_in + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - /* Check normalized version. */ - clip_max_diff = 0.0 ; - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > 1.0) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > 1.0) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0 / 0x80000000) - { printf ("\n\nLine %d: Clipping difference (%e) too large (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - /* Check the un-normalized data. */ - clip_max_diff = 0.0 ; - for (k = HALF_BUFFER_SIZE ; k < BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > maxval) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > maxval) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (un-normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0) - { printf ("\n\nLine %d: Clipping difference (%e) too large (un-normalised).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - printf ("ok\n") ; - unlink (filename) ; -} /* flt_scale_clip_test_32 */ - -static void -flt_scale_clip_test_08 (const char *filename, int filetype, float maxval) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k ; - float *data_out, *data_in ; - double diff, clip_max_diff ; - - print_test_name ("flt_scale_clip_test_08", filename) ; - - data_out = buffer_out.flt ; - data_in = buffer_in.flt ; - - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { data_out [k] = 1.2 * sin (2 * M_PI * k / HALF_BUFFER_SIZE) ; - data_out [k + HALF_BUFFER_SIZE] = data_out [k] * maxval ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* - ** Write two versions of the data: - ** normalized and clipped - ** un-normalized and clipped. - */ - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_write_float_or_die (file, 0, data_out, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - test_write_float_or_die (file, 0, data_out + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&buffer_in, 0, sizeof (buffer_in)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_float_or_die (file, 0, data_in, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ; - test_read_float_or_die (file, 0, data_in + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - /* Check normalized version. */ - clip_max_diff = 0.0 ; - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > 1.0) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > 1.0) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0 / 0x80) - { printf ("\n\nLine %d: Clipping difference (%e) too large (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - /* Check the un-normalized data. */ - clip_max_diff = 0.0 ; - for (k = HALF_BUFFER_SIZE ; k < BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > maxval) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > maxval) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (un-normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0) - { printf ("\n\nLine %d: Clipping difference (%e) too large (un-normalised).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - printf ("ok\n") ; - unlink (filename) ; -} /* flt_scale_clip_test_08 */ - - - -static void -dbl_scale_clip_test_16 (const char *filename, int filetype, float maxval) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k ; - double *data_out, *data_in ; - double diff, clip_max_diff ; - - print_test_name ("dbl_scale_clip_test_16", filename) ; - - data_out = buffer_out.dbl ; - data_in = buffer_in.dbl ; - - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { data_out [k] = 1.2 * sin (2 * M_PI * k / HALF_BUFFER_SIZE) ; - data_out [k + HALF_BUFFER_SIZE] = data_out [k] * maxval ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* - ** Write two versions of the data: - ** normalized and clipped - ** un-normalized and clipped. - */ - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_write_double_or_die (file, 0, data_out, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - test_write_double_or_die (file, 0, data_out + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&buffer_in, 0, sizeof (buffer_in)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_double_or_die (file, 0, data_in, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - test_read_double_or_die (file, 0, data_in + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - /* Check normalized version. */ - clip_max_diff = 0.0 ; - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > 1.0) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > 1.0) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0 / 0x8000) - { printf ("\n\nLine %d: Clipping difference (%e) too large (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - /* Check the un-normalized data. */ - clip_max_diff = 0.0 ; - for (k = HALF_BUFFER_SIZE ; k < BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > maxval) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > maxval) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (un-normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0) - { printf ("\n\nLine %d: Clipping difference (%e) too large (un-normalised).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - printf ("ok\n") ; - unlink (filename) ; -} /* dbl_scale_clip_test_16 */ - -static void -dbl_scale_clip_test_24 (const char *filename, int filetype, float maxval) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k ; - double *data_out, *data_in ; - double diff, clip_max_diff ; - - print_test_name ("dbl_scale_clip_test_24", filename) ; - - data_out = buffer_out.dbl ; - data_in = buffer_in.dbl ; - - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { data_out [k] = 1.2 * sin (2 * M_PI * k / HALF_BUFFER_SIZE) ; - data_out [k + HALF_BUFFER_SIZE] = data_out [k] * maxval ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* - ** Write two versions of the data: - ** normalized and clipped - ** un-normalized and clipped. - */ - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_write_double_or_die (file, 0, data_out, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - test_write_double_or_die (file, 0, data_out + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&buffer_in, 0, sizeof (buffer_in)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_double_or_die (file, 0, data_in, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - test_read_double_or_die (file, 0, data_in + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - /* Check normalized version. */ - clip_max_diff = 0.0 ; - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > 1.0) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > 1.0) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0 / 0x800000) - { printf ("\n\nLine %d: Clipping difference (%e) too large (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - /* Check the un-normalized data. */ - clip_max_diff = 0.0 ; - for (k = HALF_BUFFER_SIZE ; k < BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > maxval) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > maxval) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (un-normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0) - { printf ("\n\nLine %d: Clipping difference (%e) too large (un-normalised).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - printf ("ok\n") ; - unlink (filename) ; -} /* dbl_scale_clip_test_24 */ - -static void -dbl_scale_clip_test_32 (const char *filename, int filetype, float maxval) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k ; - double *data_out, *data_in ; - double diff, clip_max_diff ; - - print_test_name ("dbl_scale_clip_test_32", filename) ; - - data_out = buffer_out.dbl ; - data_in = buffer_in.dbl ; - - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { data_out [k] = 1.2 * sin (2 * M_PI * k / HALF_BUFFER_SIZE) ; - data_out [k + HALF_BUFFER_SIZE] = data_out [k] * maxval ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* - ** Write two versions of the data: - ** normalized and clipped - ** un-normalized and clipped. - */ - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_write_double_or_die (file, 0, data_out, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - test_write_double_or_die (file, 0, data_out + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&buffer_in, 0, sizeof (buffer_in)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_double_or_die (file, 0, data_in, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - test_read_double_or_die (file, 0, data_in + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - /* Check normalized version. */ - clip_max_diff = 0.0 ; - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > 1.0) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > 1.0) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0 / 0x80000000) - { printf ("\n\nLine %d: Clipping difference (%e) too large (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - /* Check the un-normalized data. */ - clip_max_diff = 0.0 ; - for (k = HALF_BUFFER_SIZE ; k < BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > maxval) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > maxval) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (un-normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0) - { printf ("\n\nLine %d: Clipping difference (%e) too large (un-normalised).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - printf ("ok\n") ; - unlink (filename) ; -} /* dbl_scale_clip_test_32 */ - -static void -dbl_scale_clip_test_08 (const char *filename, int filetype, float maxval) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int k ; - double *data_out, *data_in ; - double diff, clip_max_diff ; - - print_test_name ("dbl_scale_clip_test_08", filename) ; - - data_out = buffer_out.dbl ; - data_in = buffer_in.dbl ; - - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { data_out [k] = 1.2 * sin (2 * M_PI * k / HALF_BUFFER_SIZE) ; - data_out [k + HALF_BUFFER_SIZE] = data_out [k] * maxval ; - } ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* - ** Write two versions of the data: - ** normalized and clipped - ** un-normalized and clipped. - */ - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_write_double_or_die (file, 0, data_out, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - test_write_double_or_die (file, 0, data_out + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&buffer_in, 0, sizeof (buffer_in)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_double_or_die (file, 0, data_in, HALF_BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ; - test_read_double_or_die (file, 0, data_in + HALF_BUFFER_SIZE, HALF_BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - /* Check normalized version. */ - clip_max_diff = 0.0 ; - for (k = 0 ; k < HALF_BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > 1.0) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > 1.0) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0 / 0x80) - { printf ("\n\nLine %d: Clipping difference (%e) too large (normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - /* Check the un-normalized data. */ - clip_max_diff = 0.0 ; - for (k = HALF_BUFFER_SIZE ; k < BUFFER_SIZE ; k++) - { if (fabs (data_in [k]) > maxval) - { printf ("\n\nLine %d: Input sample %d/%d (%f) has not been clipped.\n\n", __LINE__, k, BUFFER_SIZE, data_in [k]) ; - exit (1) ; - } ; - - if (data_out [k] * data_in [k] < 0.0) - { printf ("\n\nLine %d: Data wrap around at index %d/%d.\n\n", __LINE__, k, BUFFER_SIZE) ; - exit (1) ; - } ; - - if (fabs (data_out [k]) > maxval) - continue ; - - diff = fabs (data_out [k] - data_in [k]) ; - if (diff > clip_max_diff) - clip_max_diff = diff ; - } ; - - if (clip_max_diff < 1e-20) - { printf ("\n\nLine %d: Clipping difference (%e) too small (un-normalized).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - if (clip_max_diff > 1.0) - { printf ("\n\nLine %d: Clipping difference (%e) too large (un-normalised).\n\n", __LINE__, clip_max_diff) ; - exit (1) ; - } ; - - printf ("ok\n") ; - unlink (filename) ; -} /* dbl_scale_clip_test_08 */ - - - - -/*============================================================================== -*/ - - -static void flt_short_clip_read_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; - float *data_out ; - short *data_in, max_value ; - int k ; - - print_test_name ("flt_short_clip_read_test", filename) ; - - data_out = buffer_out.flt ; - data_in = buffer_in.s ; - - for (k = 0 ; k < BUFFER_SIZE ; k++) - data_out [k] = 0.995 * sin (4 * M_PI * k / BUFFER_SIZE) ; - data_out [BUFFER_SIZE / 8] = 1.0 ; - data_out [3 * BUFFER_SIZE / 8] = -1.000000001 ; - data_out [5 * BUFFER_SIZE / 8] = 1.0 ; - data_out [7 * BUFFER_SIZE / 8] = -1.000000001 ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* Save unclipped data to the file. */ - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_float_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_read_short_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - /*-sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ;-*/ - sf_close (file) ; - - /* Check the first half. */ - max_value = 0 ; - for (k = 0 ; k < sfinfo.frames ; k++) - { /* Check if data_out has different sign from data_in. */ - if ((data_out [k] < 0.0 && data_in [k] > 0) || (data_out [k] > 0.0 && data_in [k] < 0)) - { printf ("\n\nLine %d: Data wrap around at index %d/%d (%f -> %d).\n\n", __LINE__, k, BUFFER_SIZE, data_out [k], data_in [k]) ; - exit (1) ; - } ; - max_value = (max_value > abs (data_in [k])) ? max_value : abs (data_in [k]) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* flt_short_clip_read_test */ -static void flt_int_clip_read_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; - float *data_out ; - int *data_in, max_value ; - int k ; - - print_test_name ("flt_int_clip_read_test", filename) ; - - data_out = buffer_out.flt ; - data_in = buffer_in.i ; - - for (k = 0 ; k < BUFFER_SIZE ; k++) - data_out [k] = 0.995 * sin (4 * M_PI * k / BUFFER_SIZE) ; - data_out [BUFFER_SIZE / 8] = 1.0 ; - data_out [3 * BUFFER_SIZE / 8] = -1.000000001 ; - data_out [5 * BUFFER_SIZE / 8] = 1.0 ; - data_out [7 * BUFFER_SIZE / 8] = -1.000000001 ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* Save unclipped data to the file. */ - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_float_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_read_int_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - /*-sf_command (file, SFC_SET_NORM_FLOAT, NULL, SF_FALSE) ;-*/ - sf_close (file) ; - - /* Check the first half. */ - max_value = 0 ; - for (k = 0 ; k < sfinfo.frames ; k++) - { /* Check if data_out has different sign from data_in. */ - if ((data_out [k] < 0.0 && data_in [k] > 0) || (data_out [k] > 0.0 && data_in [k] < 0)) - { printf ("\n\nLine %d: Data wrap around at index %d/%d (%f -> %d).\n\n", __LINE__, k, BUFFER_SIZE, data_out [k], data_in [k]) ; - exit (1) ; - } ; - max_value = (max_value > abs (data_in [k])) ? max_value : abs (data_in [k]) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* flt_int_clip_read_test */ - -static void dbl_short_clip_read_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; - double *data_out ; - short *data_in, max_value ; - int k ; - - print_test_name ("dbl_short_clip_read_test", filename) ; - - data_out = buffer_out.dbl ; - data_in = buffer_in.s ; - - for (k = 0 ; k < BUFFER_SIZE ; k++) - data_out [k] = 0.995 * sin (4 * M_PI * k / BUFFER_SIZE) ; - data_out [BUFFER_SIZE / 8] = 1.0 ; - data_out [3 * BUFFER_SIZE / 8] = -1.000000001 ; - data_out [5 * BUFFER_SIZE / 8] = 1.0 ; - data_out [7 * BUFFER_SIZE / 8] = -1.000000001 ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* Save unclipped data to the file. */ - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_double_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_read_short_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - /*-sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ;-*/ - sf_close (file) ; - - /* Check the first half. */ - max_value = 0 ; - for (k = 0 ; k < sfinfo.frames ; k++) - { /* Check if data_out has different sign from data_in. */ - if ((data_out [k] < 0.0 && data_in [k] > 0) || (data_out [k] > 0.0 && data_in [k] < 0)) - { printf ("\n\nLine %d: Data wrap around at index %d/%d (%f -> %d).\n\n", __LINE__, k, BUFFER_SIZE, data_out [k], data_in [k]) ; - exit (1) ; - } ; - max_value = (max_value > abs (data_in [k])) ? max_value : abs (data_in [k]) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* dbl_short_clip_read_test */ -static void dbl_int_clip_read_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; - double *data_out ; - int *data_in, max_value ; - int k ; - - print_test_name ("dbl_int_clip_read_test", filename) ; - - data_out = buffer_out.dbl ; - data_in = buffer_in.i ; - - for (k = 0 ; k < BUFFER_SIZE ; k++) - data_out [k] = 0.995 * sin (4 * M_PI * k / BUFFER_SIZE) ; - data_out [BUFFER_SIZE / 8] = 1.0 ; - data_out [3 * BUFFER_SIZE / 8] = -1.000000001 ; - data_out [5 * BUFFER_SIZE / 8] = 1.0 ; - data_out [7 * BUFFER_SIZE / 8] = -1.000000001 ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - /* Save unclipped data to the file. */ - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_double_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - sf_command (file, SFC_SET_CLIPPING, NULL, SF_TRUE) ; - test_read_int_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - /*-sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ;-*/ - sf_close (file) ; - - /* Check the first half. */ - max_value = 0 ; - for (k = 0 ; k < sfinfo.frames ; k++) - { /* Check if data_out has different sign from data_in. */ - if ((data_out [k] < 0.0 && data_in [k] > 0) || (data_out [k] > 0.0 && data_in [k] < 0)) - { printf ("\n\nLine %d: Data wrap around at index %d/%d (%f -> %d).\n\n", __LINE__, k, BUFFER_SIZE, data_out [k], data_in [k]) ; - exit (1) ; - } ; - max_value = (max_value > abs (data_in [k])) ? max_value : abs (data_in [k]) ; - } ; - - unlink (filename) ; - puts ("ok") ; -} /* dbl_int_clip_read_test */ - - -/*============================================================================== -*/ - - -static void short_flt_scale_write_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; - short *data_out ; - float *data_in, max_value ; - int k ; - - print_test_name ("short_flt_clip_write_test", filename) ; - - data_out = buffer_out.s ; - data_in = buffer_in.flt ; - - for (k = 0 ; k < BUFFER_SIZE ; k++) - data_out [k] = lrintf (0x7FFFF * 0.995 * sin (4 * M_PI * k / BUFFER_SIZE)) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_short_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_TRUE) ; - test_write_short_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_FALSE) ; - test_write_short_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != 3 * BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, 3 * BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - /* Check the first section. */ - test_read_float_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value < 1000.0) - { printf ("\n\nLine %d: Max value (%f) < 1000.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - /* Check the second section. */ - test_read_float_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value > 1.0) - { printf ("\n\nLine %d: Max value (%f) > 1.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - /* Check the third section. */ - test_read_float_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value < 1000.0) - { printf ("\n\nLine %d: Max value (%f) < 1000.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - sf_close (file) ; - - unlink (filename) ; - puts ("ok") ; -} /* short_flt_scale_write_test */ -static void short_dbl_scale_write_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; - short *data_out ; - double *data_in, max_value ; - int k ; - - print_test_name ("short_dbl_clip_write_test", filename) ; - - data_out = buffer_out.s ; - data_in = buffer_in.dbl ; - - for (k = 0 ; k < BUFFER_SIZE ; k++) - data_out [k] = lrint (0x7FFFF * 0.995 * sin (4 * M_PI * k / BUFFER_SIZE)) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_short_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_TRUE) ; - test_write_short_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_FALSE) ; - test_write_short_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != 3 * BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, 3 * BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - /* Check the first section. */ - test_read_double_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value < 1000.0) - { printf ("\n\nLine %d: Max value (%f) < 1000.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - /* Check the second section. */ - test_read_double_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value > 1.0) - { printf ("\n\nLine %d: Max value (%f) > 1.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - /* Check the third section. */ - test_read_double_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value < 1000.0) - { printf ("\n\nLine %d: Max value (%f) < 1000.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - sf_close (file) ; - - unlink (filename) ; - puts ("ok") ; -} /* short_dbl_scale_write_test */ - -static void int_flt_scale_write_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int *data_out ; - float *data_in, max_value ; - int k ; - - print_test_name ("int_flt_clip_write_test", filename) ; - - data_out = buffer_out.i ; - data_in = buffer_in.flt ; - - for (k = 0 ; k < BUFFER_SIZE ; k++) - data_out [k] = lrintf (0x7FFFFFFF * 0.995 * sin (4 * M_PI * k / BUFFER_SIZE)) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_int_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_TRUE) ; - test_write_int_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_FALSE) ; - test_write_int_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != 3 * BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, 3 * BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - /* Check the first section. */ - test_read_float_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value < 1000.0) - { printf ("\n\nLine %d: Max value (%f) < 1000.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - /* Check the second section. */ - test_read_float_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value > 1.0) - { printf ("\n\nLine %d: Max value (%f) > 1.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - /* Check the third section. */ - test_read_float_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value < 1000.0) - { printf ("\n\nLine %d: Max value (%f) < 1000.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - sf_close (file) ; - - unlink (filename) ; - puts ("ok") ; -} /* int_flt_scale_write_test */ -static void int_dbl_scale_write_test (const char *filename, int filetype) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int *data_out ; - double *data_in, max_value ; - int k ; - - print_test_name ("int_dbl_clip_write_test", filename) ; - - data_out = buffer_out.i ; - data_in = buffer_in.dbl ; - - for (k = 0 ; k < BUFFER_SIZE ; k++) - data_out [k] = lrint (0x7FFFFFFF * 0.995 * sin (4 * M_PI * k / BUFFER_SIZE)) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - sfinfo.samplerate = 44100 ; - sfinfo.frames = 123456789 ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = filetype ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; - test_write_int_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_TRUE) ; - test_write_int_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_command (file, SFC_SET_SCALE_INT_FLOAT_WRITE, NULL, SF_FALSE) ; - test_write_int_or_die (file, 0, data_out, BUFFER_SIZE, __LINE__) ; - sf_close (file) ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; - - sfinfo.format &= (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ; - - if (sfinfo.format != (filetype & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK))) - { printf ("\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n\n", __LINE__, filetype, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames != 3 * BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, 3 * BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d: Incorrect number of channels in file.\n\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - /* Check the first section. */ - test_read_double_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value < 1000.0) - { printf ("\n\nLine %d: Max value (%f) < 1000.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - /* Check the second section. */ - test_read_double_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value > 1.0) - { printf ("\n\nLine %d: Max value (%f) > 1.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - /* Check the third section. */ - test_read_double_or_die (file, 0, data_in, BUFFER_SIZE, __LINE__) ; - - max_value = 0.0 ; - for (k = 0 ; k < BUFFER_SIZE ; k++) - max_value = (max_value > fabs (data_in [k])) ? max_value : fabs (data_in [k]) ; - - if (max_value < 1000.0) - { printf ("\n\nLine %d: Max value (%f) < 1000.0.\n\n", __LINE__, max_value) ; - exit (1) ; - } ; - - sf_close (file) ; - - unlink (filename) ; - puts ("ok") ; -} /* int_dbl_scale_write_test */ - - - diff --git a/lib-src/libsndfile/tests/scale_clip_test.def b/lib-src/libsndfile/tests/scale_clip_test.def index 345981912..9974f116d 100644 --- a/lib-src/libsndfile/tests/scale_clip_test.def +++ b/lib-src/libsndfile/tests/scale_clip_test.def @@ -19,13 +19,13 @@ float_type = { int_type = { int_type_name = "short" ; int_short_name = "s" ; - int_max_value = 0x7FFFF ; + int_max_value = "0x7FFFF" ; } ; int_type = { int_type_name = "int" ; int_short_name = "i" ; - int_max_value = 0x7FFFFFFF ; + int_max_value = "0x7FFFFFFF" ; } ; diff --git a/lib-src/libsndfile/tests/scale_clip_test.tpl b/lib-src/libsndfile/tests/scale_clip_test.tpl index d8a8b32de..ad59ce16d 100644 --- a/lib-src/libsndfile/tests/scale_clip_test.tpl +++ b/lib-src/libsndfile/tests/scale_clip_test.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2012 Erik de Castro Lopo ** ** 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 @@ -22,13 +22,15 @@ #include #include #include +#include +#include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif -#include - #include #include "utils.h" @@ -167,7 +169,7 @@ main (void) } ; if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %" PRId64 ").\n\n", __LINE__, BUFFER_SIZE, sfinfo.frames) ; exit (1) ; } ; @@ -301,7 +303,7 @@ main (void) } ; if (sfinfo.frames != BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %" PRId64 ").\n\n", __LINE__, BUFFER_SIZE, sfinfo.frames) ; exit (1) ; } ; @@ -380,7 +382,7 @@ main (void) } ; if (sfinfo.frames != 3 * BUFFER_SIZE) - { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, 3 * BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ; + { printf ("\n\nLine %d: Incorrect number of frames in file (%d => %" PRId64 ").\n\n", __LINE__, 3 * BUFFER_SIZE, sfinfo.frames) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/sftest.c b/lib-src/libsndfile/tests/sftest.c new file mode 100644 index 000000000..497265c92 --- /dev/null +++ b/lib-src/libsndfile/tests/sftest.c @@ -0,0 +1,67 @@ +/* +** Copyright (C) 1999-2011 Erik de Castro Lopo +** +** 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-1307, USA. +*/ + +#include "sfconfig.h" + +#include + +#if HAVE_UNISTD_H +#include +#else +#include "sf_unistd.h" +#endif + +#include + +#define BUFFER_SIZE (1024) + + +static short buffer [BUFFER_SIZE] ; + +int +main (int argc, char *argv []) +{ SNDFILE *file ; + SF_INFO sfinfo ; + int k, count, max = 0, total = 0 ; + + if (argc < 2) + { printf ("Expecting input file name.\n") ; + return 0 ; + } ; + + if (! (file = sf_open (argv [1], SFM_READ, &sfinfo))) + { printf ("sf_open_read failed with error : ") ; + puts (sf_strerror (NULL)) ; + exit (1) ; + } ; + + while ((count = sf_read_short (file, buffer, BUFFER_SIZE))) + { for (k = 0 ; k < count ; k++) + if (abs (buffer [k]) > max) + max = abs (buffer [k]) ; + total += count ; + } ; + + printf ("Total : %d\n", total) ; + printf ("Maximun value : %d\n", max) ; + + sf_close (file) ; + + return 0 ; +} /* main */ + diff --git a/lib-src/libsndfile/tests/sfversion.c b/lib-src/libsndfile/tests/sfversion.c index c464f0864..6caa77ae2 100644 --- a/lib-src/libsndfile/tests/sfversion.c +++ b/lib-src/libsndfile/tests/sfversion.c @@ -16,9 +16,12 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "sfconfig.h" + #include #include #include +#include #include diff --git a/lib-src/libsndfile/tests/stdin_test.c b/lib-src/libsndfile/tests/stdin_test.c index 1d941bd3a..651614aeb 100644 --- a/lib-src/libsndfile/tests/stdin_test.c +++ b/lib-src/libsndfile/tests/stdin_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2012 Erik de Castro Lopo ** ** 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 @@ -25,13 +25,15 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include #include "utils.h" -#define BUFFER_LEN (1<<16) +#define BUFFER_LEN (1 << 16) static void stdin_test (int typemajor, int count) ; @@ -123,9 +125,9 @@ main (int argc, char *argv []) } ; if (test_count == 0) - { fprintf (stderr, "************************************\n") ; - fprintf (stderr, "* No '%s' test defined.\n", argv [1]) ; - fprintf (stderr, "************************************\n") ; + { fprintf (stderr, "\n*****************************************\n") ; + fprintf (stderr, "* stdin_test : No '%s' test defined.\n", argv [1]) ; + fprintf (stderr, "*****************************************\n") ; return 1 ; } ; @@ -149,7 +151,7 @@ stdin_test (int typemajor, int count) else memset (&sfinfo, 0, sizeof (sfinfo)) ; - if ((file = sf_open_fd (STDIN_FILENO, SFM_READ, &sfinfo, SF_TRUE)) == NULL) + if ((file = sf_open_fd (fileno (stdin), SFM_READ, &sfinfo, SF_TRUE)) == NULL) { fprintf (stderr, "sf_open_fd failed with error : ") ; puts (sf_strerror (NULL)) ; dump_log_buffer (NULL) ; diff --git a/lib-src/libsndfile/tests/stdio_test.c b/lib-src/libsndfile/tests/stdio_test.c index 80a696cf5..a065a040f 100644 --- a/lib-src/libsndfile/tests/stdio_test.c +++ b/lib-src/libsndfile/tests/stdio_test.c @@ -29,6 +29,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -61,7 +63,6 @@ main (void) static size_t file_length (const char *filename) ; -static int file_exists (const char *filename) ; static void stdio_test (const char *filetype) ; static const char *filetypes [] = @@ -74,9 +75,6 @@ int main (void) { int k ; - if (file_exists ("libsndfile.spec.in")) - exit_if_true (chdir ("tests") != 0, "\n Error : chdir ('tests') failed.\n") ; - for (k = 0 ; filetypes [k] ; k++) stdio_test (filetypes [k]) ; @@ -92,7 +90,7 @@ stdio_test (const char *filetype) print_test_name ("stdio_test", filetype) ; - snprintf (buffer, sizeof (buffer), "./stdout_test %s > stdio.%s", filetype, filetype) ; + snprintf (buffer, sizeof (buffer), "./tests/stdout_test %s > stdio.%s", filetype, filetype) ; if ((retval = system (buffer))) { retval = WIFEXITED (retval) ? WEXITSTATUS (retval) : 1 ; printf ("%s : %s", buffer, (strerror (retval))) ; @@ -105,7 +103,7 @@ stdio_test (const char *filetype) exit (1) ; } ; - snprintf (buffer, sizeof (buffer), "./stdin_test %s < stdio.%s", filetype, filetype) ; + snprintf (buffer, sizeof (buffer), "./tests/stdin_test %s < stdio.%s", filetype, filetype) ; if ((retval = system (buffer))) { retval = WIFEXITED (retval) ? WEXITSTATUS (retval) : 1 ; printf ("%s : %s", buffer, (strerror (retval))) ; @@ -139,15 +137,5 @@ file_length (const char *filename) return buf.st_size ; } /* file_length */ -static int -file_exists (const char *filename) -{ struct stat buf ; - - if (stat (filename, &buf)) - return 0 ; - - return 1 ; -} /* file_exists */ - #endif diff --git a/lib-src/libsndfile/tests/stdout_test.c b/lib-src/libsndfile/tests/stdout_test.c index 042a59a3c..a71ed643f 100644 --- a/lib-src/libsndfile/tests/stdout_test.c +++ b/lib-src/libsndfile/tests/stdout_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2011 Erik de Castro Lopo +** Copyright (C) 2001-2014 Erik de Castro Lopo ** ** 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 @@ -25,6 +25,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -43,7 +45,7 @@ main (int argc, char *argv []) exit (1) ; } ; - do_all =! strcmp (argv [1], "all") ; + do_all = ! strcmp (argv [1], "all") ; if (do_all || ! strcmp (argv [1], "raw")) { stdout_test (SF_FORMAT_RAW, PIPE_TEST_LEN) ; @@ -111,9 +113,9 @@ main (int argc, char *argv []) } ; if (test_count == 0) - { fprintf (stderr, "************************************\n") ; - fprintf (stderr, "* No '%s' test defined.\n", argv [1]) ; - fprintf (stderr, "************************************\n") ; + { fprintf (stderr, "\n******************************************\n") ; + fprintf (stderr, "* stdout_test : No '%s' test defined.\n", argv [1]) ; + fprintf (stderr, "******************************************\n") ; return 1 ; } ; @@ -138,8 +140,14 @@ stdout_test (int typemajor, int count) data [k] = PIPE_INDEX (k) ; if ((file = sf_open ("-", SFM_WRITE, &sfinfo)) == NULL) - { fprintf (stderr, "sf_open_write failed with error : ") ; - fprintf (stderr, "%s\n", sf_strerror (NULL)) ; + { fprintf (stderr, "%s % d: sf_open_write failed with error : %s\n", + __func__, __LINE__, sf_strerror (NULL)) ; + exit (1) ; + } ; + + if (sfinfo.frames != 0) + { fprintf (stderr, "%s % d: Frames is %d (should be 0).\n", + __func__, __LINE__, (int) sfinfo.frames) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/string_test.c b/lib-src/libsndfile/tests/string_test.c index 11e2efd33..70a0dfbf4 100644 --- a/lib-src/libsndfile/tests/string_test.c +++ b/lib-src/libsndfile/tests/string_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2003-2011 Erik de Castro Lopo +** Copyright (C) 2003-2016 Erik de Castro Lopo ** ** 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 @@ -22,9 +22,12 @@ #include #include #include +#include #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -39,6 +42,10 @@ static void string_start_end_test (const char *filename, int typemajor) ; static void string_multi_set_test (const char *filename, int typemajor) ; static void string_rdwr_test (const char *filename, int typemajor) ; static void string_short_rdwr_test (const char *filename, int typemajor) ; +static void string_rdwr_grow_test (const char *filename, int typemajor) ; +static void string_header_update (const char *filename, int typemajor) ; + +static void software_string_test (const char *filename) ; static int str_count (const char * haystack, const char * needle) ; @@ -54,17 +61,20 @@ main (int argc, char *argv []) printf (" aiff - test adding strings to AIFF files\n") ; printf (" flac - test adding strings to FLAC files\n") ; printf (" ogg - test adding strings to OGG files\n") ; + printf (" opus - test adding strings to OPUS files\n") ; printf (" all - perform all tests\n") ; exit (1) ; } ; - do_all =! strcmp (argv [1], "all") ; + do_all = ! strcmp (argv [1], "all") ; if (do_all || ! strcmp (argv [1], "wav")) { string_start_end_test ("strings.wav", SF_FORMAT_WAV) ; string_multi_set_test ("multi.wav", SF_FORMAT_WAV) ; string_rdwr_test ("rdwr.wav", SF_FORMAT_WAV) ; string_short_rdwr_test ("short_rdwr.wav", SF_FORMAT_WAV) ; + string_rdwr_grow_test ("rdwr_grow.wav", SF_FORMAT_WAV) ; + string_header_update ("header_update.wav", SF_FORMAT_WAV) ; string_start_end_test ("strings.wavex", SF_FORMAT_WAVEX) ; string_multi_set_test ("multi.wavex", SF_FORMAT_WAVEX) ; @@ -75,21 +85,28 @@ main (int argc, char *argv []) string_multi_set_test ("multi.rifx", SF_ENDIAN_BIG | SF_FORMAT_WAV) ; string_rdwr_test ("rdwr.rifx", SF_ENDIAN_BIG | SF_FORMAT_WAV) ; string_short_rdwr_test ("short_rdwr.rifx", SF_ENDIAN_BIG | SF_FORMAT_WAV) ; + + software_string_test ("software_string.wav") ; test_count++ ; } ; if (do_all || ! strcmp (argv [1], "aiff")) - { string_start_end_test ("strings.aiff", SF_FORMAT_AIFF) ; + { string_start_test ("strings.aiff", SF_FORMAT_AIFF) ; + string_start_end_test ("strings.aiff", SF_FORMAT_AIFF) ; /* + TODO : Fix src/aiff.c so these tests pass. string_multi_set_test ("multi.aiff", SF_FORMAT_AIFF) ; string_rdwr_test ("rdwr.aiff", SF_FORMAT_AIFF) ; string_short_rdwr_test ("short_rdwr.aiff", SF_FORMAT_AIFF) ; + string_rdwr_grow_test ("rdwr_grow.aiff", SF_FORMAT_AIFF) ; + string_header_update ("header_update.aiff", SF_FORMAT_AIFF) ; */ + test_count++ ; } ; if (do_all || ! strcmp (argv [1], "flac")) - { if (HAVE_EXTERNAL_LIBS) + { if (HAVE_EXTERNAL_XIPH_LIBS) string_start_test ("strings.flac", SF_FORMAT_FLAC) ; else puts (" No FLAC tests because FLAC support was not compiled in.") ; @@ -97,20 +114,56 @@ main (int argc, char *argv []) } ; if (do_all || ! strcmp (argv [1], "ogg")) - { if (HAVE_EXTERNAL_LIBS) - string_start_test ("vorbis.oga", SF_FORMAT_OGG) ; + { if (HAVE_EXTERNAL_XIPH_LIBS) + string_start_test ("vorbis.oga", SF_FORMAT_OGG | SF_FORMAT_VORBIS) ; else puts (" No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.") ; test_count++ ; } ; - if (do_all || ! strcmp (argv [1], "rf64")) - { puts ("\n\n **** String test not working yet for RF64 format. ****\n") ; + if (do_all || ! strcmp (argv [1], "opus")) + { if (HAVE_EXTERNAL_XIPH_LIBS) + string_start_test ("opus.opus", SF_FORMAT_OGG | SF_FORMAT_OPUS) ; + else + puts (" No Ogg/Opus tests because Ogg/Opus support was not compiled in.") ; + test_count++ ; + } ; + + if (do_all || ! strcmp (argv [1], "caf")) + { string_start_test ("strings.caf", SF_FORMAT_CAF) ; + string_start_end_test ("strings.caf", SF_FORMAT_CAF) ; + string_multi_set_test ("multi.caf", SF_FORMAT_CAF) ; /* + TODO : Fix src/caf.c so these tests pass. + string_rdwr_test ("rdwr.caf", SF_FORMAT_CAF) ; + string_short_rdwr_test ("short_rdwr.caf", SF_FORMAT_CAF) ; + string_header_update ("header_update.caf", SF_FORMAT_CAF) ; + */ + test_count++ ; + } ; + + if (do_all || ! strcmp (argv [1], "rf64")) + { string_start_test ("strings.rf64", SF_FORMAT_RF64) ; string_start_end_test ("strings.rf64", SF_FORMAT_RF64) ; string_multi_set_test ("multi.rf64", SF_FORMAT_RF64) ; + /* + TODO : Fix src/rf64.c so these tests pass. string_rdwr_test ("rdwr.rf64", SF_FORMAT_RF64) ; string_short_rdwr_test ("short_rdwr.rf64", SF_FORMAT_RF64) ; + string_header_update ("header_update.rf64", SF_FORMAT_RF64) ; + */ + test_count++ ; + } ; + + if (do_all || ! strcmp (argv [1], "w64")) + { puts ("\n\n **** String test not working yet for W64 format. ****\n") ; + /* + string_start_test ("strings.w64", SF_FORMAT_W64) ; + string_start_end_test ("strings.w64", SF_FORMAT_W64) ; + string_multi_set_test ("multi.w64", SF_FORMAT_W64) ; + string_rdwr_test ("rdwr.w64", SF_FORMAT_W64) ; + string_short_rdwr_test ("short_rdwr.w64", SF_FORMAT_W64) ; + string_header_update ("header_update.w64", SF_FORMAT_W64) ; */ test_count++ ; } ; @@ -152,19 +205,16 @@ string_start_end_test (const char *filename, int typemajor) { const char *cptr ; SNDFILE *file ; SF_INFO sfinfo ; - int frames, errors = 0 ; - - typemajor = typemajor ; + int errors = 0 ; print_test_name ("string_start_end_test", filename) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = 44100 ; sfinfo.channels = 1 ; sfinfo.frames = 0 ; sfinfo.format = typemajor | SF_FORMAT_PCM_16 ; - frames = BUFFER_LEN / sfinfo.channels ; - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; /* Write stuff at start of file. */ @@ -258,6 +308,8 @@ string_start_end_test (const char *filename, int typemajor) case SF_FORMAT_WAV : case SF_FORMAT_WAVEX : case SF_ENDIAN_BIG | SF_FORMAT_WAV : + case SF_FORMAT_RF64 : + /* These formats do not support the following. */ break ; default : @@ -265,18 +317,18 @@ string_start_end_test (const char *filename, int typemajor) if (cptr == NULL || strcmp (album, cptr) != 0) { if (errors++ == 0) puts ("\n") ; - printf (" Bad album : %s\n", cptr) ; + printf (" Bad album : %s\n", cptr) ; } ; cptr = sf_get_string (file, SF_STR_LICENSE) ; if (cptr == NULL || strcmp (license, cptr) != 0) { if (errors++ == 0) puts ("\n") ; - printf (" Bad license : %s\n", cptr) ; + printf (" Bad license : %s\n", cptr) ; } ; cptr = sf_get_string (file, SF_STR_TRACKNUMBER) ; - if (cptr == NULL || strcmp (genre, cptr) != 0) + if (cptr == NULL || strcmp (trackno, cptr) != 0) { if (errors++ == 0) puts ("\n") ; printf (" Bad track no. : %s\n", cptr) ; @@ -297,29 +349,34 @@ string_start_end_test (const char *filename, int typemajor) } /* string_start_end_test */ static void -string_start_test (const char *filename, int typemajor) +string_start_test (const char *filename, int formattype) { const char *cptr ; SNDFILE *file ; SF_INFO sfinfo ; - int frames, errors = 0 ; + int errors = 0 ; + int typemajor = SF_FORMAT_TYPEMASK & formattype ; print_test_name ("string_start_test", filename) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = 44100 ; sfinfo.channels = 1 ; sfinfo.frames = 0 ; - switch (typemajor) - { case SF_FORMAT_OGG : - sfinfo.format = typemajor | SF_FORMAT_VORBIS ; + switch (formattype) + { case SF_FORMAT_OGG | SF_FORMAT_OPUS : + /* Opus only supports some discrete sample rates. */ + sfinfo.samplerate = 48000 ; + break ; + + case SF_FORMAT_OGG | SF_FORMAT_VORBIS : break ; default : - sfinfo.format = typemajor | SF_FORMAT_PCM_16 ; + formattype |= SF_FORMAT_PCM_16 ; break ; } ; - - frames = BUFFER_LEN / sfinfo.channels ; + sfinfo.format = formattype ; file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; @@ -368,7 +425,7 @@ string_start_test (const char *filename, int typemajor) printf (" Bad software : %s\n", cptr) ; } ; - if (str_count (cptr, "libsndfile") != 1) + if (cptr && str_count (cptr, "libsndfile") != 1) { if (errors++ == 0) puts ("\n") ; printf (" Bad software : %s\n", cptr) ; @@ -406,7 +463,7 @@ string_start_test (const char *filename, int typemajor) } ; } ; - if (typemajor != SF_FORMAT_WAV && typemajor != SF_FORMAT_AIFF) + if (typemajor != SF_FORMAT_WAV && typemajor != SF_FORMAT_AIFF && typemajor != SF_FORMAT_RF64) { cptr = sf_get_string (file, SF_STR_LICENSE) ; if (cptr == NULL || strcmp (license, cptr) != 0) { if (errors++ == 0) @@ -442,6 +499,7 @@ string_multi_set_test (const char *filename, int typemajor) print_test_name (__func__, filename) ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.format = typemajor | SF_FORMAT_PCM_16 ; sfinfo.samplerate = 44100 ; sfinfo.channels = 1 ; @@ -518,7 +576,7 @@ string_rdwr_test (const char *filename, int typemajor) sf_close (file) ; file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ; - exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %lld should be %lld.\n", __LINE__, sfinfo.frames, frames) ; + exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ; str = sf_get_string (file, SF_STR_TITLE) ; exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ; exit_if_true (strcmp (str, title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ; @@ -545,7 +603,7 @@ string_rdwr_test (const char *filename, int typemajor) exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ; exit_if_true (strcmp (str, title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ; - exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %lld should be %lld.\n", __LINE__, sfinfo.frames, frames) ; + exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ; sf_close (file) ; unlink (filename) ; @@ -579,7 +637,7 @@ string_short_rdwr_test (const char *filename, int typemajor) /* Open the file RDWR. */ file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_FALSE, __LINE__) ; - exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %lld should be %lld.\n", __LINE__, sfinfo.frames, frames) ; + exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ; str = sf_get_string (file, SF_STR_TITLE) ; exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ; exit_if_true (strcmp (str, long_title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ; @@ -623,3 +681,163 @@ str_count (const char * haystack, const char * needle) return count ; } /* str_count */ +#define MIN(a, b) ((a) < (b) ? (a) : (b)) + +static void +software_string_test (const char *filename) +{ size_t k ; + + print_test_name (__func__, filename) ; + + for (k = 0 ; k < 50 ; k++) + { const char *result ; + char sfname [64] = "" ; + SNDFILE *file ; + SF_INFO info ; + + sf_info_setup (&info, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 44100, 1) ; + file = test_open_file_or_die (filename, SFM_WRITE, &info, SF_TRUE, __LINE__) ; + + snprintf (sfname, MIN (k, sizeof (sfname)), "%s", "abcdefghijklmnopqrestvwxyz0123456789abcdefghijklmnopqrestvwxyz") ; + + exit_if_true (sf_set_string (file, SF_STR_SOFTWARE, sfname), + "\n\nLine %d : sf_set_string (f, SF_STR_SOFTWARE, '%s') failed : %s\n", __LINE__, sfname, sf_strerror (file)) ; + + sf_close (file) ; + + file = test_open_file_or_die (filename, SFM_READ, &info, SF_TRUE, __LINE__) ; + result = sf_get_string (file, SF_STR_SOFTWARE) ; + + exit_if_true (result == NULL, "\n\nLine %d : sf_get_string (file, SF_STR_SOFTWARE) returned NULL.\n\n", __LINE__) ; + + exit_if_true (strstr (result, sfname) != result, + "\n\nLine %d : Can't fine string '%s' in '%s'\n\n", __LINE__, sfname, result) ; + sf_close (file) ; + } ; + + unlink (filename) ; + puts ("ok") ; +} /* software_string_test */ + + +static void +string_rdwr_grow_test (const char *filename, int typemajor) +{ SNDFILE *file ; + SF_INFO sfinfo ; + sf_count_t frames ; + const char * str ; + + print_test_name (__func__, filename) ; + + /* Create a file that contains some strings. Then open the file in RDWR mode and + grow the file by writing more audio data to it. Check that the audio data has + been added to the file, and that the strings are still there. */ + + /* Create a short file that contains a string. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + sfinfo.samplerate = 44100 ; + sfinfo.channels = 2 ; + sfinfo.frames = 0 ; + sfinfo.format = typemajor | SF_FORMAT_PCM_16 ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + /* Write data to file. */ + test_write_short_or_die (file, 0, data_out, BUFFER_LEN, __LINE__) ; + + /* Write some strings at end of file. */ + sf_set_string (file, SF_STR_TITLE , title) ; + sf_set_string (file, SF_STR_COMMENT, comment) ; + sf_close (file) ; + + + /* Now open file again in SFM_RDWR mode and write more audio data to it. */ + file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; + /* Write more data to file. */ + test_write_short_or_die (file, 0, data_out, BUFFER_LEN, __LINE__) ; + sf_close (file) ; + + + /* Now open file again. It should now contain two BUFFER_LEN's worth of frames and the strings. */ + frames = 2 * BUFFER_LEN / sfinfo.channels ; + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ; + + /* Check the strings */ + str = sf_get_string (file, SF_STR_TITLE) ; + exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ; + exit_if_true (strcmp (str, title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ; + + str = sf_get_string (file, SF_STR_COMMENT) ; + exit_if_true (str == NULL, "\n\nLine %d : SF_STR_COMMENT string is NULL.\n", __LINE__) ; + exit_if_true (strcmp (str, comment) != 0, "\n\nLine %d : SF_STR_COMMENT doesn't match what was written.\n", __LINE__) ; + + sf_close (file) ; + unlink (filename) ; + + puts ("ok") ; +} /* string_rdwr_grow_test */ + +static void +string_header_update (const char *filename, int typemajor) +{ SNDFILE *file , *file1 ; + SF_INFO sfinfo , sfinfo1 ; + sf_count_t frames ; + const char * str ; + const int GROW_BUFFER_AMOUNT = 4 ; /* this should be less than half the size of the string header */ + + print_test_name (__func__, filename) ; + + /* Create a short file. */ + memset (&sfinfo, 0, sizeof (sfinfo)) ; + sfinfo.samplerate = 44100 ; + sfinfo.channels = 2 ; + sfinfo.frames = 0 ; + sfinfo.format = typemajor | SF_FORMAT_PCM_16 ; + + file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ; + test_write_short_or_die (file, 0, data_out, BUFFER_LEN, __LINE__) ; + sf_set_string (file, SF_STR_TITLE, long_title) ; + sf_close (file) ; + + + /* Check that SFC_UPDATE_HEADER_NOW correctly calculates datalength. */ + file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; + /* Write a very small amount of new audio data that doesn't completely overwrite the existing header. */ + test_write_short_or_die (file, 0, data_out, GROW_BUFFER_AMOUNT, __LINE__) ; + + /* Update the header without closing the file. */ + sf_command (file, SFC_UPDATE_HEADER_NOW, NULL, 0) ; + + /* The file should now contain BUFFER_LEN + GROW_BUFFER_AMOUNT frames. + Open a second handle to the file and check the reported length. */ + memset (&sfinfo1, 0, sizeof (sfinfo1)) ; + file1 = test_open_file_or_die (filename, SFM_READ, &sfinfo1, SF_TRUE, __LINE__) ; + + frames = (BUFFER_LEN + GROW_BUFFER_AMOUNT) / sfinfo.channels ; + exit_if_true (frames != sfinfo1.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo1.frames, frames) ; + + /* The strings are probably not readable by the second soundfile handle because write_tailer has not yet been called. + It's a design decision whether SFC_UPDATE_HEADER_NOW should write the tailer. I think it's fine that it doesn't. */ + + sf_close (file1) ; + sf_close (file) ; + + + /* Check that sf_close correctly calculates datalength. */ + file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ; + /* Write a very small amount of new audio data that doesn't completely overwrite the existing header. */ + test_write_short_or_die (file, 0, data_out, GROW_BUFFER_AMOUNT, __LINE__) ; + sf_close (file) ; + + + /* Open file again and verify data and string. */ + file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ; + frames = (BUFFER_LEN + 2*GROW_BUFFER_AMOUNT) / sfinfo.channels ; + exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ; + str = sf_get_string (file, SF_STR_TITLE) ; + exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ; + exit_if_true (strcmp (str, long_title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ; + sf_close (file) ; + unlink (filename) ; + puts ("ok") ; +} /* string_header_update */ diff --git a/lib-src/libsndfile/tests/test_wrapper.sh.in b/lib-src/libsndfile/tests/test_wrapper.sh.in index 331d9961d..b06a17886 100644 --- a/lib-src/libsndfile/tests/test_wrapper.sh.in +++ b/lib-src/libsndfile/tests/test_wrapper.sh.in @@ -1,6 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh -# Copyright (C) 2008-2011 Erik de Castro Lopo +# Copyright (C) 2008-2017 Erik de Castro Lopo # # All rights reserved. # @@ -33,29 +33,13 @@ HOST_TRIPLET=@HOST_TRIPLET@ PACKAGE_VERSION=@PACKAGE_VERSION@ -LIB_VERSION=`echo $PACKAGE_VERSION | sed "s/[a-z].*//"` +LIB_VERSION=$(echo $PACKAGE_VERSION | sed "s/[a-z].*//") +ABS_TOP_SRCDIR=@abs_top_srcdir@ +PYTHON=@PYTHON@ -if test -f tests/sfversion@EXEEXT@ ; then - cd tests - fi +sfversion=$(./tests/sfversion@EXEEXT@ | grep libsndfile | sed "s/-exp$//") -if test ! -f sfversion@EXEEXT@ ; then - echo "Not able to find test executables." - exit 1 - fi - -if test -f libsndfile.so.$LIB_VERSION ; then - # This will work on Linux, but not on Mac. - # Windows is already sorted out. - export LD_LIBRARY_PATH=`pwd` - if test ! -f libsndfile.so.1 ; then - ln -s libsndfile.so.$LIB_VERSION libsndfile.so.1 - fi - fi - -sfversion=`./sfversion@EXEEXT@` - -if test $sfversion != libsndfile-$PACKAGE_VERSION ; then +if test "$sfversion" != libsndfile-$PACKAGE_VERSION ; then echo "Error : sfversion ($sfversion) and PACKAGE_VERSION ($PACKAGE_VERSION) don't match." exit 1 fi @@ -63,44 +47,44 @@ if test $sfversion != libsndfile-$PACKAGE_VERSION ; then # Force exit on errors. set -e -# Generic-tests -uname -a - # Check the header file. -sh pedantic-header-test.sh +/usr/bin/env sh tests/pedantic-header-test.sh # Need this for when we're running from files collected into the # libsndfile-testsuite-@PACKAGE_VERSION@ tarball. -if test -x test_main@EXEEXT@ ; then - echo "Running unit tests from src/ directory of source code tree." - ./test_main@EXEEXT@ - echo - echo "Running end-to-end tests from tests/ directory." - fi +echo "Running unit tests from src/ directory of source code tree." +./src/test_main@EXEEXT@ -./error_test@EXEEXT@ -./pcm_test@EXEEXT@ -./ulaw_test@EXEEXT@ -./alaw_test@EXEEXT@ -./dwvw_test@EXEEXT@ -./command_test@EXEEXT@ ver -./command_test@EXEEXT@ norm -./command_test@EXEEXT@ format -./command_test@EXEEXT@ peak -./command_test@EXEEXT@ trunc -./command_test@EXEEXT@ inst -./command_test@EXEEXT@ current_sf_info -./command_test@EXEEXT@ bext -./command_test@EXEEXT@ bextch -./command_test@EXEEXT@ chanmap -./floating_point_test@EXEEXT@ -./checksum_test@EXEEXT@ -./scale_clip_test@EXEEXT@ -./headerless_test@EXEEXT@ -./rdwr_test@EXEEXT@ -./locale_test@EXEEXT@ -./win32_ordinal_test@EXEEXT@ -./external_libs_test@EXEEXT@ +echo +echo "Running end-to-end tests from tests/ directory." + +./tests/error_test@EXEEXT@ +./tests/pcm_test@EXEEXT@ +./tests/ulaw_test@EXEEXT@ +./tests/alaw_test@EXEEXT@ +./tests/dwvw_test@EXEEXT@ +./tests/command_test@EXEEXT@ ver +./tests/command_test@EXEEXT@ norm +./tests/command_test@EXEEXT@ format +./tests/command_test@EXEEXT@ peak +./tests/command_test@EXEEXT@ trunc +./tests/command_test@EXEEXT@ inst +./tests/command_test@EXEEXT@ cue +./tests/command_test@EXEEXT@ current_sf_info +./tests/command_test@EXEEXT@ bext +./tests/command_test@EXEEXT@ bextch +./tests/command_test@EXEEXT@ chanmap +./tests/command_test@EXEEXT@ cart +./tests/floating_point_test@EXEEXT@ +./tests/checksum_test@EXEEXT@ +./tests/scale_clip_test@EXEEXT@ +./tests/headerless_test@EXEEXT@ +./tests/rdwr_test@EXEEXT@ +./tests/locale_test@EXEEXT@ +./tests/win32_ordinal_test@EXEEXT@ +./tests/external_libs_test@EXEEXT@ +./tests/format_check_test@EXEEXT@ +./tests/channel_test@EXEEXT@ # The w64 G++ compiler requires an extra runtime DLL which we don't have, # so skip this test. @@ -110,7 +94,7 @@ case "$HOST_TRIPLET" in i686-w64-mingw32) ;; *) - ./cpp_test@EXEEXT@ + ./tests/cpp_test@EXEEXT@ ;; esac @@ -119,240 +103,269 @@ echo " $sfversion passed common tests." echo "----------------------------------------------------------------------" # aiff-tests -./write_read_test@EXEEXT@ aiff -./lossy_comp_test@EXEEXT@ aiff_ulaw -./lossy_comp_test@EXEEXT@ aiff_alaw -./lossy_comp_test@EXEEXT@ aiff_gsm610 -echo "==========================" -echo "./lossy_comp_test@EXEEXT@ aiff_ima" -echo "==========================" -./peak_chunk_test@EXEEXT@ aiff -./header_test@EXEEXT@ aiff -./misc_test@EXEEXT@ aiff -./string_test@EXEEXT@ aiff -./multi_file_test@EXEEXT@ aiff -./aiff_rw_test@EXEEXT@ +./tests/write_read_test@EXEEXT@ aiff +./tests/lossy_comp_test@EXEEXT@ aiff_ulaw +./tests/lossy_comp_test@EXEEXT@ aiff_alaw +./tests/lossy_comp_test@EXEEXT@ aiff_gsm610 +echo "----------------------------------------------------------------------" +echo " lossy_comp_test@EXEEXT@ aiff_ima" +echo "----------------------------------------------------------------------" + +./tests/peak_chunk_test@EXEEXT@ aiff +./tests/header_test@EXEEXT@ aiff +./tests/misc_test@EXEEXT@ aiff +./tests/string_test@EXEEXT@ aiff +./tests/multi_file_test@EXEEXT@ aiff +./tests/aiff_rw_test@EXEEXT@ +./tests/chunk_test@EXEEXT@ aiff echo "----------------------------------------------------------------------" echo " $sfversion passed tests on AIFF files." echo "----------------------------------------------------------------------" # au-tests -./write_read_test@EXEEXT@ au -./lossy_comp_test@EXEEXT@ au_ulaw -./lossy_comp_test@EXEEXT@ au_alaw -./lossy_comp_test@EXEEXT@ au_g721 -./lossy_comp_test@EXEEXT@ au_g723 -./header_test@EXEEXT@ au -./misc_test@EXEEXT@ au -./multi_file_test@EXEEXT@ au +./tests/write_read_test@EXEEXT@ au +./tests/lossy_comp_test@EXEEXT@ au_ulaw +./tests/lossy_comp_test@EXEEXT@ au_alaw +./tests/lossy_comp_test@EXEEXT@ au_g721 +./tests/lossy_comp_test@EXEEXT@ au_g723 +./tests/header_test@EXEEXT@ au +./tests/misc_test@EXEEXT@ au +./tests/multi_file_test@EXEEXT@ au echo "----------------------------------------------------------------------" echo " $sfversion passed tests on AU files." echo "----------------------------------------------------------------------" # caf-tests -./write_read_test@EXEEXT@ caf -./lossy_comp_test@EXEEXT@ caf_ulaw -./lossy_comp_test@EXEEXT@ caf_alaw -./header_test@EXEEXT@ caf -./peak_chunk_test@EXEEXT@ caf -./misc_test@EXEEXT@ caf +./tests/write_read_test@EXEEXT@ caf +./tests/lossy_comp_test@EXEEXT@ caf_ulaw +./tests/lossy_comp_test@EXEEXT@ caf_alaw +./tests/header_test@EXEEXT@ caf +./tests/peak_chunk_test@EXEEXT@ caf +./tests/misc_test@EXEEXT@ caf +./tests/chunk_test@EXEEXT@ caf +./tests/string_test@EXEEXT@ caf +./tests/long_read_write_test@EXEEXT@ alac echo "----------------------------------------------------------------------" echo " $sfversion passed tests on CAF files." echo "----------------------------------------------------------------------" # wav-tests -./write_read_test@EXEEXT@ wav -./lossy_comp_test@EXEEXT@ wav_pcm -./lossy_comp_test@EXEEXT@ wav_ima -./lossy_comp_test@EXEEXT@ wav_msadpcm -./lossy_comp_test@EXEEXT@ wav_ulaw -./lossy_comp_test@EXEEXT@ wav_alaw -./lossy_comp_test@EXEEXT@ wav_gsm610 -./lossy_comp_test@EXEEXT@ wav_g721 -./peak_chunk_test@EXEEXT@ wav -./header_test@EXEEXT@ wav -./misc_test@EXEEXT@ wav -./string_test@EXEEXT@ wav -./multi_file_test@EXEEXT@ wav +./tests/write_read_test@EXEEXT@ wav +./tests/lossy_comp_test@EXEEXT@ wav_pcm +./tests/lossy_comp_test@EXEEXT@ wav_ima +./tests/lossy_comp_test@EXEEXT@ wav_msadpcm +./tests/lossy_comp_test@EXEEXT@ wav_ulaw +./tests/lossy_comp_test@EXEEXT@ wav_alaw +./tests/lossy_comp_test@EXEEXT@ wav_gsm610 +./tests/lossy_comp_test@EXEEXT@ wav_g721 +./tests/peak_chunk_test@EXEEXT@ wav +./tests/header_test@EXEEXT@ wav +./tests/misc_test@EXEEXT@ wav +./tests/string_test@EXEEXT@ wav +./tests/multi_file_test@EXEEXT@ wav +./tests/chunk_test@EXEEXT@ wav echo "----------------------------------------------------------------------" echo " $sfversion passed tests on WAV files." echo "----------------------------------------------------------------------" # w64-tests -./write_read_test@EXEEXT@ w64 -./lossy_comp_test@EXEEXT@ w64_ima -./lossy_comp_test@EXEEXT@ w64_msadpcm -./lossy_comp_test@EXEEXT@ w64_ulaw -./lossy_comp_test@EXEEXT@ w64_alaw -./lossy_comp_test@EXEEXT@ w64_gsm610 -./header_test@EXEEXT@ w64 -./misc_test@EXEEXT@ w64 +./tests/write_read_test@EXEEXT@ w64 +./tests/lossy_comp_test@EXEEXT@ w64_ima +./tests/lossy_comp_test@EXEEXT@ w64_msadpcm +./tests/lossy_comp_test@EXEEXT@ w64_ulaw +./tests/lossy_comp_test@EXEEXT@ w64_alaw +./tests/lossy_comp_test@EXEEXT@ w64_gsm610 +./tests/header_test@EXEEXT@ w64 +./tests/misc_test@EXEEXT@ w64 echo "----------------------------------------------------------------------" echo " $sfversion passed tests on W64 files." echo "----------------------------------------------------------------------" # rf64-tests -./write_read_test@EXEEXT@ rf64 -./header_test@EXEEXT@ rf64 -./misc_test@EXEEXT@ rf64 +./tests/write_read_test@EXEEXT@ rf64 +./tests/header_test@EXEEXT@ rf64 +./tests/misc_test@EXEEXT@ rf64 +./tests/string_test@EXEEXT@ rf64 +./tests/peak_chunk_test@EXEEXT@ rf64 +./tests/chunk_test@EXEEXT@ rf64 echo "----------------------------------------------------------------------" echo " $sfversion passed tests on RF64 files." echo "----------------------------------------------------------------------" # raw-tests -./write_read_test@EXEEXT@ raw -./lossy_comp_test@EXEEXT@ raw_ulaw -./lossy_comp_test@EXEEXT@ raw_alaw -./lossy_comp_test@EXEEXT@ raw_gsm610 -./lossy_comp_test@EXEEXT@ vox_adpcm -./raw_test@EXEEXT@ +./tests/write_read_test@EXEEXT@ raw +./tests/lossy_comp_test@EXEEXT@ raw_ulaw +./tests/lossy_comp_test@EXEEXT@ raw_alaw +./tests/lossy_comp_test@EXEEXT@ raw_gsm610 +./tests/lossy_comp_test@EXEEXT@ vox_adpcm +./tests/raw_test@EXEEXT@ echo "----------------------------------------------------------------------" echo " $sfversion passed tests on RAW (header-less) files." echo "----------------------------------------------------------------------" # paf-tests -./write_read_test@EXEEXT@ paf -./header_test@EXEEXT@ paf -./misc_test@EXEEXT@ paf +./tests/write_read_test@EXEEXT@ paf +./tests/header_test@EXEEXT@ paf +./tests/misc_test@EXEEXT@ paf echo "----------------------------------------------------------------------" echo " $sfversion passed tests on PAF files." echo "----------------------------------------------------------------------" # svx-tests -./write_read_test@EXEEXT@ svx -./header_test@EXEEXT@ svx -./misc_test@EXEEXT@ svx +./tests/write_read_test@EXEEXT@ svx +./tests/header_test@EXEEXT@ svx +./tests/misc_test@EXEEXT@ svx echo "----------------------------------------------------------------------" echo " $sfversion passed tests on SVX files." echo "----------------------------------------------------------------------" # nist-tests -./write_read_test@EXEEXT@ nist -./lossy_comp_test@EXEEXT@ nist_ulaw -./lossy_comp_test@EXEEXT@ nist_alaw -./header_test@EXEEXT@ nist -./misc_test@EXEEXT@ nist +./tests/write_read_test@EXEEXT@ nist +./tests/lossy_comp_test@EXEEXT@ nist_ulaw +./tests/lossy_comp_test@EXEEXT@ nist_alaw +./tests/header_test@EXEEXT@ nist +./tests/misc_test@EXEEXT@ nist echo "----------------------------------------------------------------------" echo " $sfversion passed tests on NIST files." echo "----------------------------------------------------------------------" # ircam-tests -./write_read_test@EXEEXT@ ircam -./lossy_comp_test@EXEEXT@ ircam_ulaw -./lossy_comp_test@EXEEXT@ ircam_alaw -./header_test@EXEEXT@ ircam -./misc_test@EXEEXT@ ircam +./tests/write_read_test@EXEEXT@ ircam +./tests/lossy_comp_test@EXEEXT@ ircam_ulaw +./tests/lossy_comp_test@EXEEXT@ ircam_alaw +./tests/header_test@EXEEXT@ ircam +./tests/misc_test@EXEEXT@ ircam echo "----------------------------------------------------------------------" echo " $sfversion passed tests on IRCAM files." echo "----------------------------------------------------------------------" # voc-tests -./write_read_test@EXEEXT@ voc -./lossy_comp_test@EXEEXT@ voc_ulaw -./lossy_comp_test@EXEEXT@ voc_alaw -./header_test@EXEEXT@ voc -./misc_test@EXEEXT@ voc +./tests/write_read_test@EXEEXT@ voc +./tests/lossy_comp_test@EXEEXT@ voc_ulaw +./tests/lossy_comp_test@EXEEXT@ voc_alaw +./tests/header_test@EXEEXT@ voc +./tests/misc_test@EXEEXT@ voc echo "----------------------------------------------------------------------" echo " $sfversion passed tests on VOC files." echo "----------------------------------------------------------------------" # mat4-tests -./write_read_test@EXEEXT@ mat4 -./header_test@EXEEXT@ mat4 -./misc_test@EXEEXT@ mat4 +./tests/write_read_test@EXEEXT@ mat4 +./tests/header_test@EXEEXT@ mat4 +./tests/misc_test@EXEEXT@ mat4 echo "----------------------------------------------------------------------" echo " $sfversion passed tests on MAT4 files." echo "----------------------------------------------------------------------" # mat5-tests -./write_read_test@EXEEXT@ mat5 -./header_test@EXEEXT@ mat5 -./misc_test@EXEEXT@ mat5 +./tests/write_read_test@EXEEXT@ mat5 +./tests/header_test@EXEEXT@ mat5 +./tests/misc_test@EXEEXT@ mat5 echo "----------------------------------------------------------------------" echo " $sfversion passed tests on MAT5 files." echo "----------------------------------------------------------------------" # pvf-tests -./write_read_test@EXEEXT@ pvf -./header_test@EXEEXT@ pvf -./misc_test@EXEEXT@ pvf +./tests/write_read_test@EXEEXT@ pvf +./tests/header_test@EXEEXT@ pvf +./tests/misc_test@EXEEXT@ pvf echo "----------------------------------------------------------------------" echo " $sfversion passed tests on PVF files." echo "----------------------------------------------------------------------" # xi-tests -./lossy_comp_test@EXEEXT@ xi_dpcm +./tests/lossy_comp_test@EXEEXT@ xi_dpcm echo "----------------------------------------------------------------------" echo " $sfversion passed tests on XI files." echo "----------------------------------------------------------------------" # htk-tests -./write_read_test@EXEEXT@ htk -./header_test@EXEEXT@ htk -./misc_test@EXEEXT@ htk +./tests/write_read_test@EXEEXT@ htk +./tests/header_test@EXEEXT@ htk +./tests/misc_test@EXEEXT@ htk echo "----------------------------------------------------------------------" echo " $sfversion passed tests on HTK files." echo "----------------------------------------------------------------------" # avr-tests -./write_read_test@EXEEXT@ avr -./header_test@EXEEXT@ avr -./misc_test@EXEEXT@ avr +./tests/write_read_test@EXEEXT@ avr +./tests/header_test@EXEEXT@ avr +./tests/misc_test@EXEEXT@ avr echo "----------------------------------------------------------------------" echo " $sfversion passed tests on AVR files." echo "----------------------------------------------------------------------" # sds-tests -./write_read_test@EXEEXT@ sds -./header_test@EXEEXT@ sds -./misc_test@EXEEXT@ sds +./tests/write_read_test@EXEEXT@ sds +./tests/header_test@EXEEXT@ sds +./tests/misc_test@EXEEXT@ sds echo "----------------------------------------------------------------------" echo " $sfversion passed tests on SDS files." echo "----------------------------------------------------------------------" # sd2-tests -./write_read_test@EXEEXT@ sd2 +./tests/write_read_test@EXEEXT@ sd2 echo "----------------------------------------------------------------------" echo " $sfversion passed tests on SD2 files." echo "----------------------------------------------------------------------" # wve-tests -./lossy_comp_test@EXEEXT@ wve +./tests/lossy_comp_test@EXEEXT@ wve echo "----------------------------------------------------------------------" echo " $sfversion passed tests on WVE files." echo "----------------------------------------------------------------------" # mpc2k-tests -./write_read_test@EXEEXT@ mpc2k -./header_test@EXEEXT@ mpc2k -./misc_test@EXEEXT@ mpc2k +./tests/write_read_test@EXEEXT@ mpc2k +./tests/header_test@EXEEXT@ mpc2k +./tests/misc_test@EXEEXT@ mpc2k echo "----------------------------------------------------------------------" echo " $sfversion passed tests on MPC 2000 files." echo "----------------------------------------------------------------------" # flac-tests -./write_read_test@EXEEXT@ flac -./string_test@EXEEXT@ flac +./tests/write_read_test@EXEEXT@ flac +./tests/compression_size_test@EXEEXT@ flac +./tests/string_test@EXEEXT@ flac +./tests/header_test@EXEEXT@ flac echo "----------------------------------------------------------------------" echo " $sfversion passed tests on FLAC files." echo "----------------------------------------------------------------------" # vorbis-tests -./ogg_test@EXEEXT@ -./vorbis_test@EXEEXT@ -./lossy_comp_test@EXEEXT@ ogg_vorbis -./string_test@EXEEXT@ ogg -./misc_test@EXEEXT@ ogg +./tests/ogg_test@EXEEXT@ +./tests/compression_size_test@EXEEXT@ vorbis +./tests/lossy_comp_test@EXEEXT@ ogg_vorbis +./tests/string_test@EXEEXT@ ogg +./tests/misc_test@EXEEXT@ ogg echo "----------------------------------------------------------------------" echo " $sfversion passed tests on OGG/VORBIS files." echo "----------------------------------------------------------------------" +# opus-tests +./tests/ogg_opus_test@EXEEXT@ +./tests/compression_size_test@EXEEXT@ opus +./tests/lossy_comp_test@EXEEXT@ ogg_opus +./tests/string_test@EXEEXT@ opus + +echo "----------------------------------------------------------------------" +echo " $sfversion passed tests on OPUS files." +echo "----------------------------------------------------------------------" + # io-tests -./stdio_test@EXEEXT@ -./pipe_test@EXEEXT@ -./virtual_io_test@EXEEXT@ +./tests/stdio_test@EXEEXT@ +./tests/pipe_test@EXEEXT@ +./tests/virtual_io_test@EXEEXT@ echo "----------------------------------------------------------------------" echo " $sfversion passed stdio/pipe/vio tests." echo "----------------------------------------------------------------------" +"${PYTHON}" "${ABS_TOP_SRCDIR}/src/binheader_writef_check.py" "${ABS_TOP_SRCDIR}/src"/*.c +echo "----------------------------------------------------------------------" +echo " $sfversion passed binary header tests." +echo "----------------------------------------------------------------------" +"${PYTHON}" "${ABS_TOP_SRCDIR}/programs/test-sndfile-metadata-set.py" "${HOST_TRIPLET}" +echo "----------------------------------------------------------------------" +echo " $sfversion passed sndfile metadata tests." +echo "----------------------------------------------------------------------" diff --git a/lib-src/libsndfile/tests/ulaw_test.c b/lib-src/libsndfile/tests/ulaw_test.c index c2644f10e..9e0eba9b0 100644 --- a/lib-src/libsndfile/tests/ulaw_test.c +++ b/lib-src/libsndfile/tests/ulaw_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2012 Erik de Castro Lopo ** ** 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 @@ -24,6 +24,8 @@ #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif #include @@ -203,21 +205,21 @@ unsigned char ulaw_encode (int sample) 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 } ; - int sign, exponent, mantissa ; - unsigned char ulawbyte ; + int sign, exponent, mantissa ; + unsigned char ulawbyte ; - /* Get the sample into sign-magnitude. */ - sign = (sample >> 8) & 0x80 ; /* set aside the sign */ - if ( sign != 0 ) + /* Get the sample into sign-magnitude. */ + sign = (sample >> 8) & 0x80 ; /* set aside the sign */ + if (sign != 0) sample = -sample ; /* get magnitude */ - if ( sample > uCLIP ) + if (sample > uCLIP) sample = uCLIP ; /* clip the magnitude */ - /* Convert from 16 bit linear to ulaw. */ - sample = sample + uBIAS ; - exponent = exp_lut [( sample >> 7 ) & 0xFF] ; - mantissa = (sample >> ( exponent + 3 ) ) & 0x0F ; - ulawbyte = ~ (sign | ( exponent << 4 ) | mantissa) ; + /* Convert from 16 bit linear to ulaw. */ + sample = sample + uBIAS ; + exponent = exp_lut [(sample >> 7) & 0xFF] ; + mantissa = (sample >> (exponent + 3)) & 0x0F ; + ulawbyte = ~ (sign | (exponent << 4) | mantissa) ; return ulawbyte ; } /* ulaw_encode */ @@ -242,16 +244,16 @@ unsigned char ulaw_encode (int sample) static int ulaw_decode (unsigned int ulawbyte) { static int exp_lut [8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 } ; - int sign, exponent, mantissa, sample ; + int sign, exponent, mantissa, sample ; - ulawbyte = ~ ulawbyte ; - sign = (ulawbyte & 0x80) ; - exponent = (ulawbyte >> 4) & 0x07 ; - mantissa = ulawbyte & 0x0F ; - sample = exp_lut [exponent] + (mantissa << (exponent + 3)) ; - if (sign != 0) + ulawbyte = ~ ulawbyte ; + sign = (ulawbyte & 0x80) ; + exponent = (ulawbyte >> 4) & 0x07 ; + mantissa = ulawbyte & 0x0F ; + sample = exp_lut [exponent] + (mantissa << (exponent + 3)) ; + if (sign != 0) sample = -sample ; - return sample ; + return sample ; } /* ulaw_decode */ diff --git a/lib-src/libsndfile/tests/utils.c b/lib-src/libsndfile/tests/utils.c deleted file mode 100644 index db0adf177..000000000 --- a/lib-src/libsndfile/tests/utils.c +++ /dev/null @@ -1,1163 +0,0 @@ -/* -** Copyright (C) 2002-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -/* -** Utility functions to make writing the test suite easier. -** -** The .c and .h files were generated automagically with Autogen from -** the files utils.def and utils.tpl. -*/ - - - -#include "sfconfig.h" - -#include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#if (HAVE_DECL_S_IRGRP == 0) -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include - -#include "utils.h" - -#ifndef M_PI -#define M_PI 3.14159265358979323846264338 -#endif - -#define LOG_BUFFER_SIZE 2048 - -/* -** Neat solution to the Win32/OS2 binary file flage requirement. -** If O_BINARY isn't already defined by the inclusion of the system -** headers, set it to zero. -*/ -#ifndef O_BINARY -#define O_BINARY 0 -#endif - - -void -gen_windowed_sine_float (float *data, int len, double maximum) -{ int k ; - - memset (data, 0, len * sizeof (float)) ; - /* - ** Choose a frequency of 1/32 so that it aligns perfectly with a DFT - ** bucket to minimise spreading of energy over more than one bucket. - ** Also do not want to make the frequency too high as some of the - ** codecs (ie gsm610) have a quite severe high frequency roll off. - */ - len /= 2 ; - - for (k = 0 ; k < len ; k++) - { data [k] = sin (2.0 * k * M_PI * 1.0 / 32.0 + 0.4) ; - - /* Apply Hanning Window. */ - data [k] *= maximum * (0.5 - 0.5 * cos (2.0 * M_PI * k / ((len) - 1))) ; - } - - return ; -} /* gen_windowed_sine_float */ - -void -gen_windowed_sine_double (double *data, int len, double maximum) -{ int k ; - - memset (data, 0, len * sizeof (double)) ; - /* - ** Choose a frequency of 1/32 so that it aligns perfectly with a DFT - ** bucket to minimise spreading of energy over more than one bucket. - ** Also do not want to make the frequency too high as some of the - ** codecs (ie gsm610) have a quite severe high frequency roll off. - */ - len /= 2 ; - - for (k = 0 ; k < len ; k++) - { data [k] = sin (2.0 * k * M_PI * 1.0 / 32.0 + 0.4) ; - - /* Apply Hanning Window. */ - data [k] *= maximum * (0.5 - 0.5 * cos (2.0 * M_PI * k / ((len) - 1))) ; - } - - return ; -} /* gen_windowed_sine_double */ - - -void -create_short_sndfile (const char *filename, int format, int channels) -{ short data [2 * 3 * 4 * 5 * 6 * 7] = { 0, } ; - SNDFILE *file ; - SF_INFO sfinfo ; - - sfinfo.samplerate = 44100 ; - sfinfo.channels = channels ; - sfinfo.format = format ; - - if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL) - { printf ("Error (%s, %d) : sf_open failed : %s\n", __FILE__, __LINE__, sf_strerror (file)) ; - exit (1) ; - } ; - - sf_write_short (file, data, ARRAY_LEN (data)) ; - - sf_close (file) ; -} /* create_short_sndfile */ - -void -check_file_hash_or_die (const char *filename, uint64_t target_hash, int line_num) -{ static unsigned char buf [4096] ; - uint64_t cksum ; - FILE *file ; - int k, read_count ; - - memset (buf, 0, sizeof (buf)) ; - - /* The 'b' in the mode string means binary for Win32. */ - if ((file = fopen (filename, "rb")) == NULL) - { printf ("\n\nLine %d: could not open file '%s'\n\n", line_num, filename) ; - exit (1) ; - } ; - - cksum = 0 ; - - while ((read_count = fread (buf, 1, sizeof (buf), file))) - for (k = 0 ; k < read_count ; k++) - cksum = cksum * 511 + buf [k] ; - - fclose (file) ; - - if (target_hash == 0) - { printf (" 0x%016" PRIx64 "\n", cksum) ; - return ; - } ; - - if (cksum != target_hash) - { printf ("\n\nLine %d: incorrect hash value 0x%016" PRIx64 " should be 0x%016" PRIx64 ".\n\n", line_num, cksum, target_hash) ; - exit (1) ; - } ; - - return ; -} /* check_file_hash_or_die */ - -void -print_test_name (const char *test, const char *filename) -{ int count ; - - if (test == NULL) - { printf (__FILE__ ": bad test of filename parameter.\n") ; - exit (1) ; - } ; - - if (filename == NULL || strlen (filename) == 0) - { printf (" %-30s : ", test) ; - count = 25 ; - } - else - { printf (" %-30s : %s ", test, filename) ; - count = 24 - strlen (filename) ; - } ; - - while (count -- > 0) - putchar ('.') ; - putchar (' ') ; - - fflush (stdout) ; -} /* print_test_name */ - -void -dump_data_to_file (const char *filename, const void *data, unsigned int datalen) -{ FILE *file ; - - if ((file = fopen (filename, "wb")) == NULL) - { printf ("\n\nLine %d : could not open file : %s\n\n", __LINE__, filename) ; - exit (1) ; - } ; - - if (fwrite (data, 1, datalen, file) != datalen) - { printf ("\n\nLine %d : fwrite failed.\n\n", __LINE__) ; - exit (1) ; - } ; - - fclose (file) ; - -} /* dump_data_to_file */ - -/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -*/ - -static char octfilename [] = "error.dat" ; - -int -oct_save_short (const short *a, const short *b, int len) -{ FILE *file ; - int k ; - - if (! (file = fopen (octfilename, "w"))) - return 1 ; - - fprintf (file, "# Not created by Octave\n") ; - - fprintf (file, "# name: a\n") ; - fprintf (file, "# type: matrix\n") ; - fprintf (file, "# rows: %d\n", len) ; - fprintf (file, "# columns: 1\n") ; - - for (k = 0 ; k < len ; k++) - fprintf (file, "% d" "\n", a [k]) ; - - fprintf (file, "# name: b\n") ; - fprintf (file, "# type: matrix\n") ; - fprintf (file, "# rows: %d\n", len) ; - fprintf (file, "# columns: 1\n") ; - - for (k = 0 ; k < len ; k++) - fprintf (file, "% d" "\n", b [k]) ; - - fclose (file) ; - return 0 ; -} /* oct_save_short */ -int -oct_save_int (const int *a, const int *b, int len) -{ FILE *file ; - int k ; - - if (! (file = fopen (octfilename, "w"))) - return 1 ; - - fprintf (file, "# Not created by Octave\n") ; - - fprintf (file, "# name: a\n") ; - fprintf (file, "# type: matrix\n") ; - fprintf (file, "# rows: %d\n", len) ; - fprintf (file, "# columns: 1\n") ; - - for (k = 0 ; k < len ; k++) - fprintf (file, "% d" "\n", a [k]) ; - - fprintf (file, "# name: b\n") ; - fprintf (file, "# type: matrix\n") ; - fprintf (file, "# rows: %d\n", len) ; - fprintf (file, "# columns: 1\n") ; - - for (k = 0 ; k < len ; k++) - fprintf (file, "% d" "\n", b [k]) ; - - fclose (file) ; - return 0 ; -} /* oct_save_int */ -int -oct_save_float (const float *a, const float *b, int len) -{ FILE *file ; - int k ; - - if (! (file = fopen (octfilename, "w"))) - return 1 ; - - fprintf (file, "# Not created by Octave\n") ; - - fprintf (file, "# name: a\n") ; - fprintf (file, "# type: matrix\n") ; - fprintf (file, "# rows: %d\n", len) ; - fprintf (file, "# columns: 1\n") ; - - for (k = 0 ; k < len ; k++) - fprintf (file, "% g" "\n", a [k]) ; - - fprintf (file, "# name: b\n") ; - fprintf (file, "# type: matrix\n") ; - fprintf (file, "# rows: %d\n", len) ; - fprintf (file, "# columns: 1\n") ; - - for (k = 0 ; k < len ; k++) - fprintf (file, "% g" "\n", b [k]) ; - - fclose (file) ; - return 0 ; -} /* oct_save_float */ -int -oct_save_double (const double *a, const double *b, int len) -{ FILE *file ; - int k ; - - if (! (file = fopen (octfilename, "w"))) - return 1 ; - - fprintf (file, "# Not created by Octave\n") ; - - fprintf (file, "# name: a\n") ; - fprintf (file, "# type: matrix\n") ; - fprintf (file, "# rows: %d\n", len) ; - fprintf (file, "# columns: 1\n") ; - - for (k = 0 ; k < len ; k++) - fprintf (file, "% g" "\n", a [k]) ; - - fprintf (file, "# name: b\n") ; - fprintf (file, "# type: matrix\n") ; - fprintf (file, "# rows: %d\n", len) ; - fprintf (file, "# columns: 1\n") ; - - for (k = 0 ; k < len ; k++) - fprintf (file, "% g" "\n", b [k]) ; - - fclose (file) ; - return 0 ; -} /* oct_save_double */ - - -void -check_log_buffer_or_die (SNDFILE *file, int line_num) -{ static char buffer [LOG_BUFFER_SIZE] ; - int count ; - - memset (buffer, 0, LOG_BUFFER_SIZE) ; - - /* Get the log buffer data. */ - count = sf_command (file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ; - - if (LOG_BUFFER_SIZE - count < 2) - { printf ("\n\nLine %d : Possible long log buffer.\n", line_num) ; - exit (1) ; - } - - /* Look for "Should" */ - if (strstr (buffer, "ould")) - { printf ("\n\nLine %d : Log buffer contains `ould'. Dumping.\n", line_num) ; - puts (buffer) ; - exit (1) ; - } ; - - /* Look for "**" */ - if (strstr (buffer, "*")) - { printf ("\n\nLine %d : Log buffer contains `*'. Dumping.\n", line_num) ; - puts (buffer) ; - exit (1) ; - } ; - - /* Look for "Should" */ - if (strstr (buffer, "nknown marker")) - { printf ("\n\nLine %d : Log buffer contains `nknown marker'. Dumping.\n", line_num) ; - puts (buffer) ; - exit (1) ; - } ; - - return ; -} /* check_log_buffer_or_die */ - -int -string_in_log_buffer (SNDFILE *file, const char *s) -{ static char buffer [LOG_BUFFER_SIZE] ; - int count ; - - memset (buffer, 0, LOG_BUFFER_SIZE) ; - - /* Get the log buffer data. */ - count = sf_command (file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ; - - if (LOG_BUFFER_SIZE - count < 2) - { printf ("Possible long log buffer.\n") ; - exit (1) ; - } - - /* Look for string */ - return strstr (buffer, s) ? SF_TRUE : SF_FALSE ; -} /* string_in_log_buffer */ - -void -hexdump_file (const char * filename, sf_count_t offset, sf_count_t length) -{ - FILE * file ; - char buffer [16] ; - int k, m, ch, readcount ; - - if (length > 1000000) - { printf ("\n\nError : length (%ld) too long.\n\n", SF_COUNT_TO_LONG (offset)) ; - exit (1) ; - } ; - - if ((file = fopen (filename, "r")) == NULL) - { printf ("\n\nError : hexdump_file (%s) could not open file for read.\n\n", filename) ; - exit (1) ; - } ; - - if (fseek (file, offset, SEEK_SET) != 0) - { printf ("\n\nError : fseek(file, %ld, SEEK_SET) failed : %s\n\n", SF_COUNT_TO_LONG (offset), strerror (errno)) ; - exit (1) ; - } ; - - puts ("\n\n") ; - - for (k = 0 ; k < length ; k+= sizeof (buffer)) - { readcount = fread (buffer, 1, sizeof (buffer), file) ; - - printf ("%08lx : ", SF_COUNT_TO_LONG (offset + k)) ; - - for (m = 0 ; m < readcount ; m++) - printf ("%02x ", buffer [m] & 0xFF) ; - - for (m = readcount ; m < SIGNED_SIZEOF (buffer) ; m++) - printf (" ") ; - - printf (" ") ; - for (m = 0 ; m < readcount ; m++) - { ch = isprint (buffer [m]) ? buffer [m] : '.' ; - putchar (ch) ; - } ; - - if (readcount < SIGNED_SIZEOF (buffer)) - break ; - - putchar ('\n') ; - } ; - - puts ("\n") ; - - fclose (file) ; -} /* hexdump_file */ - -void -dump_log_buffer (SNDFILE *file) -{ static char buffer [LOG_BUFFER_SIZE] ; - int count ; - - memset (buffer, 0, LOG_BUFFER_SIZE) ; - - /* Get the log buffer data. */ - count = sf_command (file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ; - - if (strlen (buffer) < 1) - puts ("Log buffer empty.\n") ; - else - puts (buffer) ; - - return ; -} /* dump_log_buffer */ - -SNDFILE * -test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allow_fd, int line_num) -{ static int count = 0 ; - - SNDFILE *file ; - const char *modestr, *func_name ; - int oflags = 0, omode = 0, err ; - - /* - ** Need to test both sf_open() and sf_open_fd(). - ** Do so alternately. - */ - switch (mode) - { case SFM_READ : - modestr = "SFM_READ" ; - oflags = O_RDONLY | O_BINARY ; - omode = 0 ; - break ; - - case SFM_WRITE : - modestr = "SFM_WRITE" ; - oflags = O_WRONLY | O_CREAT | O_TRUNC | O_BINARY ; - omode = S_IRUSR | S_IWUSR | S_IRGRP ; - break ; - - case SFM_RDWR : - modestr = "SFM_RDWR" ; - oflags = O_RDWR | O_CREAT | O_BINARY ; - omode = S_IRUSR | S_IWUSR | S_IRGRP ; - break ; - default : - printf ("\n\nLine %d: Bad mode.\n", line_num) ; - fflush (stdout) ; - exit (1) ; - } ; - - if (OS_IS_WIN32) - { /* Windows does not understand and ignores the S_IRGRP flag, but Wine - ** gives a run time warning message, so just clear it. - */ - omode &= ~S_IRGRP ; - } ; - - if (allow_fd && ((++count) & 1) == 1) - { int fd ; - - /* Only use the three argument open() function if omode != 0. */ - fd = (omode == 0) ? open (filename, oflags) : open (filename, oflags, omode) ; - - if (fd < 0) - { printf ("\n\n%s : open failed : %s\n", __func__, strerror (errno)) ; - exit (1) ; - } ; - - func_name = "sf_open_fd" ; - file = sf_open_fd (fd, mode, sfinfo, SF_TRUE) ; - } - else - { func_name = "sf_open" ; - file = sf_open (filename, mode, sfinfo) ; - } ; - - if (file == NULL) - { printf ("\n\nLine %d: %s (%s) failed : %s\n\n", line_num, func_name, modestr, sf_strerror (NULL)) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - err = sf_error (file) ; - if (err != SF_ERR_NO_ERROR) - { printf ("\n\nLine %d : sf_error : %s\n\n", line_num, sf_error_number (err)) ; - dump_log_buffer (file) ; - exit (1) ; - } ; - - return file ; -} /* test_open_file_or_die */ - -void -test_read_write_position_or_die (SNDFILE *file, int line_num, int pass, sf_count_t read_pos, sf_count_t write_pos) -{ sf_count_t pos ; - - /* Check the current read position. */ - if (read_pos >= 0 && (pos = sf_seek (file, 0, SEEK_CUR | SFM_READ)) != read_pos) - { printf ("\n\nLine %d ", line_num) ; - if (pass > 0) - printf ("(pass %d): ", pass) ; - printf ("Read position (%ld) should be %ld.\n", SF_COUNT_TO_LONG (pos), SF_COUNT_TO_LONG (read_pos)) ; - exit (1) ; - } ; - - /* Check the current write position. */ - if (write_pos >= 0 && (pos = sf_seek (file, 0, SEEK_CUR | SFM_WRITE)) != write_pos) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : Write position (%ld) should be %ld.\n", - SF_COUNT_TO_LONG (pos), SF_COUNT_TO_LONG (write_pos)) ; - exit (1) ; - } ; - - return ; -} /* test_read_write_position */ - -void -test_seek_or_die (SNDFILE *file, sf_count_t offset, int whence, sf_count_t new_pos, int channels, int line_num) -{ sf_count_t position ; - const char *channel_name, *whence_name ; - - switch (whence) - { case SEEK_SET : - whence_name = "SEEK_SET" ; - break ; - case SEEK_CUR : - whence_name = "SEEK_CUR" ; - break ; - case SEEK_END : - whence_name = "SEEK_END" ; - break ; - - /* SFM_READ */ - case SEEK_SET | SFM_READ : - whence_name = "SFM_READ | SEEK_SET" ; - break ; - case SEEK_CUR | SFM_READ : - whence_name = "SFM_READ | SEEK_CUR" ; - break ; - case SEEK_END | SFM_READ : - whence_name = "SFM_READ | SEEK_END" ; - break ; - - /* SFM_WRITE */ - case SEEK_SET | SFM_WRITE : - whence_name = "SFM_WRITE | SEEK_SET" ; - break ; - case SEEK_CUR | SFM_WRITE : - whence_name = "SFM_WRITE | SEEK_CUR" ; - break ; - case SEEK_END | SFM_WRITE : - whence_name = "SFM_WRITE | SEEK_END" ; - break ; - - default : - printf ("\n\nLine %d: bad whence parameter.\n", line_num) ; - exit (1) ; - } ; - - channel_name = (channels == 1) ? "Mono" : "Stereo" ; - - if ((position = sf_seek (file, offset, whence)) != new_pos) - { printf ("\n\nLine %d : %s : sf_seek (file, %ld, %s) returned %ld (should be %ld).\n\n", - line_num, channel_name, SF_COUNT_TO_LONG (offset), whence_name, - SF_COUNT_TO_LONG (position), SF_COUNT_TO_LONG (new_pos)) ; - exit (1) ; - } ; - -} /* test_seek_or_die */ - - - -void -test_read_short_or_die (SNDFILE *file, int pass, short *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_read_short (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_read_short failed with short read (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_read_short_or_die */ - -void -test_read_int_or_die (SNDFILE *file, int pass, int *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_read_int (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_read_int failed with short read (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_read_int_or_die */ - -void -test_read_float_or_die (SNDFILE *file, int pass, float *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_read_float (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_read_float failed with short read (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_read_float_or_die */ - -void -test_read_double_or_die (SNDFILE *file, int pass, double *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_read_double (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_read_double failed with short read (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_read_double_or_die */ - - -void -test_readf_short_or_die (SNDFILE *file, int pass, short *test, sf_count_t frames, int line_num) -{ sf_count_t count ; - - if ((count = sf_readf_short (file, test, frames)) != frames) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_readf_short failed with short readf (%ld => %ld).\n", - SF_COUNT_TO_LONG (frames), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_readf_short_or_die */ - -void -test_readf_int_or_die (SNDFILE *file, int pass, int *test, sf_count_t frames, int line_num) -{ sf_count_t count ; - - if ((count = sf_readf_int (file, test, frames)) != frames) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_readf_int failed with short readf (%ld => %ld).\n", - SF_COUNT_TO_LONG (frames), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_readf_int_or_die */ - -void -test_readf_float_or_die (SNDFILE *file, int pass, float *test, sf_count_t frames, int line_num) -{ sf_count_t count ; - - if ((count = sf_readf_float (file, test, frames)) != frames) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_readf_float failed with short readf (%ld => %ld).\n", - SF_COUNT_TO_LONG (frames), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_readf_float_or_die */ - -void -test_readf_double_or_die (SNDFILE *file, int pass, double *test, sf_count_t frames, int line_num) -{ sf_count_t count ; - - if ((count = sf_readf_double (file, test, frames)) != frames) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_readf_double failed with short readf (%ld => %ld).\n", - SF_COUNT_TO_LONG (frames), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_readf_double_or_die */ - - -void -test_read_raw_or_die (SNDFILE *file, int pass, void *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_read_raw (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_read_raw failed with short read (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_read_raw_or_die */ - - - -void -test_write_short_or_die (SNDFILE *file, int pass, const short *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_write_short (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_write_short failed with short write (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_write_short_or_die */ - -void -test_write_int_or_die (SNDFILE *file, int pass, const int *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_write_int (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_write_int failed with short write (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_write_int_or_die */ - -void -test_write_float_or_die (SNDFILE *file, int pass, const float *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_write_float (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_write_float failed with short write (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_write_float_or_die */ - -void -test_write_double_or_die (SNDFILE *file, int pass, const double *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_write_double (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_write_double failed with short write (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_write_double_or_die */ - - -void -test_writef_short_or_die (SNDFILE *file, int pass, const short *test, sf_count_t frames, int line_num) -{ sf_count_t count ; - - if ((count = sf_writef_short (file, test, frames)) != frames) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_writef_short failed with short writef (%ld => %ld).\n", - SF_COUNT_TO_LONG (frames), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_writef_short_or_die */ - -void -test_writef_int_or_die (SNDFILE *file, int pass, const int *test, sf_count_t frames, int line_num) -{ sf_count_t count ; - - if ((count = sf_writef_int (file, test, frames)) != frames) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_writef_int failed with short writef (%ld => %ld).\n", - SF_COUNT_TO_LONG (frames), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_writef_int_or_die */ - -void -test_writef_float_or_die (SNDFILE *file, int pass, const float *test, sf_count_t frames, int line_num) -{ sf_count_t count ; - - if ((count = sf_writef_float (file, test, frames)) != frames) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_writef_float failed with short writef (%ld => %ld).\n", - SF_COUNT_TO_LONG (frames), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_writef_float_or_die */ - -void -test_writef_double_or_die (SNDFILE *file, int pass, const double *test, sf_count_t frames, int line_num) -{ sf_count_t count ; - - if ((count = sf_writef_double (file, test, frames)) != frames) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_writef_double failed with short writef (%ld => %ld).\n", - SF_COUNT_TO_LONG (frames), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_writef_double_or_die */ - - -void -test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t items, int line_num) -{ sf_count_t count ; - - if ((count = sf_write_raw (file, test, items)) != items) - { printf ("\n\nLine %d", line_num) ; - if (pass > 0) - printf (" (pass %d)", pass) ; - printf (" : sf_write_raw failed with short write (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; - fflush (stdout) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - return ; -} /* test_write_raw_or_die */ - - -void -compare_short_or_die (const short *left, const short *right, unsigned count, int line_num) -{ - unsigned k ; - - for (k = 0 ; k < count ;k++) - if (left [k] != right [k]) - { printf ("\n\nLine %d : Error at index %d, " "% d" " should be " "% d" ".\n\n", line_num, k, left [k], right [k]) ; - exit (1) ; - } ; - - return ; -} /* compare_short_or_die */ -void -compare_int_or_die (const int *left, const int *right, unsigned count, int line_num) -{ - unsigned k ; - - for (k = 0 ; k < count ;k++) - if (left [k] != right [k]) - { printf ("\n\nLine %d : Error at index %d, " "% d" " should be " "% d" ".\n\n", line_num, k, left [k], right [k]) ; - exit (1) ; - } ; - - return ; -} /* compare_int_or_die */ -void -compare_float_or_die (const float *left, const float *right, unsigned count, int line_num) -{ - unsigned k ; - - for (k = 0 ; k < count ;k++) - if (left [k] != right [k]) - { printf ("\n\nLine %d : Error at index %d, " "% g" " should be " "% g" ".\n\n", line_num, k, left [k], right [k]) ; - exit (1) ; - } ; - - return ; -} /* compare_float_or_die */ -void -compare_double_or_die (const double *left, const double *right, unsigned count, int line_num) -{ - unsigned k ; - - for (k = 0 ; k < count ;k++) - if (left [k] != right [k]) - { printf ("\n\nLine %d : Error at index %d, " "% g" " should be " "% g" ".\n\n", line_num, k, left [k], right [k]) ; - exit (1) ; - } ; - - return ; -} /* compare_double_or_die */ - - - -void -delete_file (int format, const char *filename) -{ char rsrc_name [512], *fname ; - - unlink (filename) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_SD2) - return ; - - /* - ** Now try for a resource fork stored as a separate file. - ** Grab the un-adulterated filename again. - */ - snprintf (rsrc_name, sizeof (rsrc_name), "%s", filename) ; - - if ((fname = strrchr (rsrc_name, '/')) != NULL) - fname ++ ; - else if ((fname = strrchr (rsrc_name, '\\')) != NULL) - fname ++ ; - else - fname = rsrc_name ; - - memmove (fname + 2, fname, strlen (fname) + 1) ; - fname [0] = '.' ; - fname [1] = '_' ; - - unlink (rsrc_name) ; -} /* delete_file */ - -static int allowed_open_files = -1 ; - -void -count_open_files (void) -{ -#if OS_IS_WIN32 - return ; -#else - int k, count = 0 ; - struct stat statbuf ; - - if (allowed_open_files > 0) - return ; - - for (k = 0 ; k < 1024 ; k++) - if (fstat (k, &statbuf) == 0) - count ++ ; - - allowed_open_files = count ; -#endif -} /* count_open_files */ - -void -increment_open_file_count (void) -{ allowed_open_files ++ ; -} /* increment_open_file_count */ - -void -check_open_file_count_or_die (int lineno) -{ -#if OS_IS_WIN32 - lineno = 0 ; - return ; -#else - int k, count = 0 ; - struct stat statbuf ; - - if (allowed_open_files < 0) - count_open_files () ; - - for (k = 0 ; k < 1024 ; k++) - if (fstat (k, &statbuf) == 0) - count ++ ; - - if (count > allowed_open_files) - { printf ("\nLine %d : number of open files (%d) > allowed (%d).\n\n", lineno, count, allowed_open_files) ; - exit (1) ; - } ; -#endif -} /* check_open_file_count_or_die */ - -void -write_mono_file (const char * filename, int format, int srate, float * output, int len) -{ SNDFILE * file ; - SF_INFO sfinfo ; - - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - sfinfo.samplerate = srate ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL) - { printf ("sf_open (%s) : %s\n", filename, sf_strerror (NULL)) ; - exit (1) ; - } ; - - sf_write_float (file, output, len) ; - - sf_close (file) ; -} /* write_mono_file */ - -void -gen_lowpass_noise_float (float *data, int len) -{ int32_t value = 0x1243456 ; - double sample, last_val = 0.0 ; - int k ; - - for (k = 0 ; k < len ; k++) - { /* Not a crypto quality RNG. */ - value = 11117 * value + 211231 ; - value = 11117 * value + 211231 ; - value = 11117 * value + 211231 ; - - sample = value / (0x7fffffff * 1.000001) ; - sample = 0.2 * sample - 0.9 * last_val ; - - data [k] = last_val = sample ; - } ; - -} /* gen_lowpass_noise_float */ - - -/* -** Windows is fucked. -** If a file is opened R/W and data is written to it, then fstat will return -** the correct file length, but stat will return zero. -*/ - -sf_count_t -file_length (const char * fname) -{ struct stat data ; - - if (stat (fname, &data) != 0) - return 0 ; - - return (sf_count_t) data.st_size ; -} /* file_length */ - -sf_count_t -file_length_fd (int fd) -{ struct stat data ; - - memset (&data, 0, sizeof (data)) ; - if (fstat (fd, &data) != 0) - return 0 ; - - return (sf_count_t) data.st_size ; -} /* file_length_fd */ - - - - diff --git a/lib-src/libsndfile/tests/utils.h b/lib-src/libsndfile/tests/utils.h deleted file mode 100644 index 8eb703c37..000000000 --- a/lib-src/libsndfile/tests/utils.h +++ /dev/null @@ -1,182 +0,0 @@ -/* -** Copyright (C) 2002-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -/* -** Utility functions to make writing the test suite easier. -** -** The .c and .h files were generated automagically with Autogen from -** the files utils.def and utils.tpl. -*/ - - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include -#include - -#define SF_COUNT_TO_LONG(x) ((long) (x)) -#define ARRAY_LEN(x) ((int) (sizeof (x)) / (sizeof ((x) [0]))) -#define SIGNED_SIZEOF(x) ((int64_t) (sizeof (x))) - -#define PIPE_INDEX(x) ((x) + 500) -#define PIPE_TEST_LEN 12345 - - -void gen_windowed_sine_float (float *data, int len, double maximum) ; -void gen_windowed_sine_double (double *data, int len, double maximum) ; - - -void create_short_sndfile (const char *filename, int format, int channels) ; - -void check_file_hash_or_die (const char *filename, uint64_t target_hash, int line_num) ; - -void print_test_name (const char *test, const char *filename) ; - -void dump_data_to_file (const char *filename, const void *data, unsigned int datalen) ; - -void write_mono_file (const char * filename, int format, int srate, float * output, int len) ; - -static inline void -exit_if_true (int test, const char *format, ...) -{ if (test) - { va_list argptr ; - va_start (argptr, format) ; - vprintf (format, argptr) ; - va_end (argptr) ; - exit (1) ; - } ; -} /* exit_if_true */ - -/* -** Functions for saving two vectors of data in an ascii text file which -** can then be loaded into GNU octave for comparison. -*/ - -int oct_save_short (const short *a, const short *b, int len) ; -int oct_save_int (const int *a, const int *b, int len) ; -int oct_save_float (const float *a, const float *b, int len) ; -int oct_save_double (const double *a, const double *b, int len) ; - - -void delete_file (int format, const char *filename) ; - -void count_open_files (void) ; -void increment_open_file_count (void) ; -void check_open_file_count_or_die (int lineno) ; - -#ifdef SNDFILE_H - -static inline void -sf_info_clear (SF_INFO * info) -{ memset (info, 0, sizeof (SF_INFO)) ; -} /* sf_info_clear */ - -static inline void -sf_info_setup (SF_INFO * info, int format, int samplerate, int channels) -{ sf_info_clear (info) ; - - info->format = format ; - info->samplerate = samplerate ; - info->channels = channels ; -} /* sf_info_setup */ - - -void dump_log_buffer (SNDFILE *file) ; -void check_log_buffer_or_die (SNDFILE *file, int line_num) ; -int string_in_log_buffer (SNDFILE *file, const char *s) ; -void hexdump_file (const char * filename, sf_count_t offset, sf_count_t length) ; - - -SNDFILE *test_open_file_or_die - (const char *filename, int mode, SF_INFO *sfinfo, int allow_fd, int line_num) ; - -void test_read_write_position_or_die - (SNDFILE *file, int line_num, int pass, sf_count_t read_pos, sf_count_t write_pos) ; - -void test_seek_or_die - (SNDFILE *file, sf_count_t offset, int whence, sf_count_t new_pos, int channels, int line_num) ; - - -void test_read_short_or_die - (SNDFILE *file, int pass, short *test, sf_count_t items, int line_num) ; -void test_read_int_or_die - (SNDFILE *file, int pass, int *test, sf_count_t items, int line_num) ; -void test_read_float_or_die - (SNDFILE *file, int pass, float *test, sf_count_t items, int line_num) ; -void test_read_double_or_die - (SNDFILE *file, int pass, double *test, sf_count_t items, int line_num) ; - -void test_readf_short_or_die - (SNDFILE *file, int pass, short *test, sf_count_t frames, int line_num) ; -void test_readf_int_or_die - (SNDFILE *file, int pass, int *test, sf_count_t frames, int line_num) ; -void test_readf_float_or_die - (SNDFILE *file, int pass, float *test, sf_count_t frames, int line_num) ; -void test_readf_double_or_die - (SNDFILE *file, int pass, double *test, sf_count_t frames, int line_num) ; - - -void -test_read_raw_or_die (SNDFILE *file, int pass, void *test, sf_count_t items, int line_num) ; - - -void test_write_short_or_die - (SNDFILE *file, int pass, const short *test, sf_count_t items, int line_num) ; -void test_write_int_or_die - (SNDFILE *file, int pass, const int *test, sf_count_t items, int line_num) ; -void test_write_float_or_die - (SNDFILE *file, int pass, const float *test, sf_count_t items, int line_num) ; -void test_write_double_or_die - (SNDFILE *file, int pass, const double *test, sf_count_t items, int line_num) ; - -void test_writef_short_or_die - (SNDFILE *file, int pass, const short *test, sf_count_t frames, int line_num) ; -void test_writef_int_or_die - (SNDFILE *file, int pass, const int *test, sf_count_t frames, int line_num) ; -void test_writef_float_or_die - (SNDFILE *file, int pass, const float *test, sf_count_t frames, int line_num) ; -void test_writef_double_or_die - (SNDFILE *file, int pass, const double *test, sf_count_t frames, int line_num) ; - - -void -test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t items, int line_num) ; - -void compare_short_or_die (const short *left, const short *right, unsigned count, int line_num) ; -void compare_int_or_die (const int *left, const int *right, unsigned count, int line_num) ; -void compare_float_or_die (const float *left, const float *right, unsigned count, int line_num) ; -void compare_double_or_die (const double *left, const double *right, unsigned count, int line_num) ; - - - -void gen_lowpass_noise_float (float *data, int len) ; - -sf_count_t file_length (const char * fname) ; -sf_count_t file_length_fd (int fd) ; - -#endif - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ - - - diff --git a/lib-src/libsndfile/tests/utils.tpl b/lib-src/libsndfile/tests/utils.tpl index 2358706b7..4206098d6 100644 --- a/lib-src/libsndfile/tests/utils.tpl +++ b/lib-src/libsndfile/tests/utils.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template h c +] /* -** Copyright (C) 2002-2011 Erik de Castro Lopo +** Copyright (C) 2002-2018 Erik de Castro Lopo ** ** 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 @@ -31,12 +31,15 @@ extern "C" { #endif /* __cplusplus */ +#include "sfconfig.h" + #include #include -#define SF_COUNT_TO_LONG(x) ((long) (x)) #define ARRAY_LEN(x) ((int) (sizeof (x)) / (sizeof ((x) [0]))) #define SIGNED_SIZEOF(x) ((int64_t) (sizeof (x))) +#define NOT(x) (! (x)) +#define ABS(x) ((x) >= 0 ? (x) : - (x)) #define PIPE_INDEX(x) ((x) + 500) #define PIPE_TEST_LEN 12345 @@ -57,6 +60,16 @@ void dump_data_to_file (const char *filename, const void *data, unsigned int dat void write_mono_file (const char * filename, int format, int srate, float * output, int len) ; +#ifdef __GNUC__ +static inline void +exit_if_true (int test, const char *format, ...) +#if (defined (__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO) + __attribute__ ((format (gnu_printf, 2, 3))) ; +#else + __attribute__ ((format (printf, 2, 3))) ; +#endif +#endif + static inline void exit_if_true (int test, const char *format, ...) { if (test) @@ -68,6 +81,11 @@ exit_if_true (int test, const char *format, ...) } ; } /* exit_if_true */ +static inline int32_t +arith_shift_left (int32_t x, int shift) +{ return (int32_t) (((uint32_t) x) << shift) ; +} /* arith_shift_left */ + /* ** Functions for saving two vectors of data in an ascii text file which ** can then be loaded into GNU octave for comparison. @@ -80,6 +98,8 @@ exit_if_true (int test, const char *format, ...) void delete_file (int format, const char *filename) ; +int truncate_file_to_zero (const char *fname) ; + void count_open_files (void) ; void increment_open_file_count (void) ; void check_open_file_count_or_die (int lineno) ; @@ -106,6 +126,7 @@ void check_log_buffer_or_die (SNDFILE *file, int line_num) ; int string_in_log_buffer (SNDFILE *file, const char *s) ; void hexdump_file (const char * filename, sf_count_t offset, sf_count_t length) ; +void test_sf_format_or_die (const SF_INFO *info, int line_num) ; SNDFILE *test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allow_fd, int line_num) ; @@ -135,11 +156,11 @@ void test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t items, int line_num) ; [+ FOR io_type -+]void compare_[+ (get "io_element") +]_or_die (const [+ (get "io_element") +] *left, const [+ (get "io_element") +] *right, unsigned count, int line_num) ; ++]void compare_[+ (get "io_element") +]_or_die (const [+ (get "io_element") +] *expected, const [+ (get "io_element") +] *actual, unsigned count, int line_num) ; [+ ENDFOR io_type +] -void gen_lowpass_noise_float (float *data, int len) ; +void gen_lowpass_signal_float (float *data, int len) ; sf_count_t file_length (const char * fname) ; sf_count_t file_length_fd (int fd) ; @@ -181,7 +202,7 @@ sf_count_t file_length_fd (int fd) ; #define M_PI 3.14159265358979323846264338 #endif -#define LOG_BUFFER_SIZE 2048 +#define LOG_BUFFER_SIZE 4096 /* ** Neat solution to the Win32/OS2 binary file flage requirement. @@ -198,13 +219,8 @@ gen_windowed_sine_[+ (get "name") +] ([+ (get "name") +] *data, int len, double { int k ; memset (data, 0, len * sizeof ([+ (get "name") +])) ; - /* - ** Choose a frequency of 1/32 so that it aligns perfectly with a DFT - ** bucket to minimise spreading of energy over more than one bucket. - ** Also do not want to make the frequency too high as some of the - ** codecs (ie gsm610) have a quite severe high frequency roll off. - */ - len /= 2 ; + + len = (5 * len) / 6 ; for (k = 0 ; k < len ; k++) { data [k] = sin (2.0 * k * M_PI * 1.0 / 32.0 + 0.4) ; @@ -223,6 +239,7 @@ create_short_sndfile (const char *filename, int format, int channels) SNDFILE *file ; SF_INFO sfinfo ; + memset (&sfinfo, 0, sizeof (sfinfo)) ; sfinfo.samplerate = 44100 ; sfinfo.channels = channels ; sfinfo.format = format ; @@ -256,17 +273,17 @@ check_file_hash_or_die (const char *filename, uint64_t target_hash, int line_num while ((read_count = fread (buf, 1, sizeof (buf), file))) for (k = 0 ; k < read_count ; k++) - cksum = cksum * 511 + buf [k] ; + cksum = (cksum * 511 + buf [k]) & 0xfffffffffffff ; fclose (file) ; if (target_hash == 0) - { printf (" 0x%016" PRIx64 "\n", cksum) ; + { printf (" 0x%" PRIx64 "\n", cksum) ; return ; } ; if (cksum != target_hash) - { printf ("\n\nLine %d: incorrect hash value 0x%016" PRIx64 " should be 0x%016" PRIx64 ".\n\n", line_num, cksum, target_hash) ; + { printf ("\n\nLine %d: incorrect hash value 0x%" PRIx64 " should be 0x%" PRIx64 ".\n\n", line_num, cksum, target_hash) ; exit (1) ; } ; @@ -359,7 +376,7 @@ check_log_buffer_or_die (SNDFILE *file, int line_num) { static char buffer [LOG_BUFFER_SIZE] ; int count ; - memset (buffer, 0, LOG_BUFFER_SIZE) ; + memset (buffer, 0, sizeof (buffer)) ; /* Get the log buffer data. */ count = sf_command (file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ; @@ -398,7 +415,7 @@ string_in_log_buffer (SNDFILE *file, const char *s) { static char buffer [LOG_BUFFER_SIZE] ; int count ; - memset (buffer, 0, LOG_BUFFER_SIZE) ; + memset (buffer, 0, sizeof (buffer)) ; /* Get the log buffer data. */ count = sf_command (file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ; @@ -420,7 +437,7 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length) int k, m, ch, readcount ; if (length > 1000000) - { printf ("\n\nError : length (%ld) too long.\n\n", SF_COUNT_TO_LONG (offset)) ; + { printf ("\n\nError : length (%" PRId64 ") too long.\n\n", offset) ; exit (1) ; } ; @@ -430,7 +447,7 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length) } ; if (fseek (file, offset, SEEK_SET) != 0) - { printf ("\n\nError : fseek(file, %ld, SEEK_SET) failed : %s\n\n", SF_COUNT_TO_LONG (offset), strerror (errno)) ; + { printf ("\n\nError : fseek(file, %" PRId64 ", SEEK_SET) failed : %s\n\n", offset, strerror (errno)) ; exit (1) ; } ; @@ -439,7 +456,7 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length) for (k = 0 ; k < length ; k+= sizeof (buffer)) { readcount = fread (buffer, 1, sizeof (buffer), file) ; - printf ("%08lx : ", SF_COUNT_TO_LONG (offset + k)) ; + printf ("%08" PRIx64 " : ", offset + k) ; for (m = 0 ; m < readcount ; m++) printf ("%02x ", buffer [m] & 0xFF) ; @@ -467,12 +484,11 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length) void dump_log_buffer (SNDFILE *file) { static char buffer [LOG_BUFFER_SIZE] ; - int count ; - memset (buffer, 0, LOG_BUFFER_SIZE) ; + memset (buffer, 0, sizeof (buffer)) ; /* Get the log buffer data. */ - count = sf_command (file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ; + sf_command (file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ; if (strlen (buffer) < 1) puts ("Log buffer empty.\n") ; @@ -482,6 +498,18 @@ dump_log_buffer (SNDFILE *file) return ; } /* dump_log_buffer */ +void +test_sf_format_or_die (const SF_INFO *info, int line_num) +{ int res ; + + if ((res = sf_format_check (info)) != 1) + { printf ("\n\nLine %d : sf_format_check returned error (%d)\n\n", line_num, res) ; + exit (1) ; + } ; + + return ; +} /* test_sf_format_or_die */ + SNDFILE * test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allow_fd, int line_num) { static int count = 0 ; @@ -569,7 +597,7 @@ test_read_write_position_or_die (SNDFILE *file, int line_num, int pass, sf_count { printf ("\n\nLine %d ", line_num) ; if (pass > 0) printf ("(pass %d): ", pass) ; - printf ("Read position (%ld) should be %ld.\n", SF_COUNT_TO_LONG (pos), SF_COUNT_TO_LONG (read_pos)) ; + printf ("Read position (%" PRId64 ") should be %" PRId64 ".\n", pos, read_pos) ; exit (1) ; } ; @@ -578,8 +606,7 @@ test_read_write_position_or_die (SNDFILE *file, int line_num, int pass, sf_count { printf ("\n\nLine %d", line_num) ; if (pass > 0) printf (" (pass %d)", pass) ; - printf (" : Write position (%ld) should be %ld.\n", - SF_COUNT_TO_LONG (pos), SF_COUNT_TO_LONG (write_pos)) ; + printf (" : Write position (%" PRId64 ") should be %" PRId64 ".\n", pos, write_pos) ; exit (1) ; } ; @@ -632,9 +659,8 @@ test_seek_or_die (SNDFILE *file, sf_count_t offset, int whence, sf_count_t new_p channel_name = (channels == 1) ? "Mono" : "Stereo" ; if ((position = sf_seek (file, offset, whence)) != new_pos) - { printf ("\n\nLine %d : %s : sf_seek (file, %ld, %s) returned %ld (should be %ld).\n\n", - line_num, channel_name, SF_COUNT_TO_LONG (offset), whence_name, - SF_COUNT_TO_LONG (position), SF_COUNT_TO_LONG (new_pos)) ; + { printf ("\n\nLine %d : %s : sf_seek (file, %" PRId64 ", %s) returned %" PRId64 " (should be %" PRId64 ").\n\n", + line_num, channel_name, offset, whence_name, position, new_pos) ; exit (1) ; } ; @@ -650,8 +676,8 @@ test_[+ (get "op_element") +]_[+ (get "io_element") +]_or_die (SNDFILE *file, in { printf ("\n\nLine %d", line_num) ; if (pass > 0) printf (" (pass %d)", pass) ; - printf (" : sf_[+ (get "op_element") +]_[+ (get "io_element") +] failed with short [+ (get "op_element") +] (%ld => %ld).\n", - SF_COUNT_TO_LONG ([+ (get "count_name") +]), SF_COUNT_TO_LONG (count)) ; + printf (" : sf_[+ (get "op_element") +]_[+ (get "io_element") +] failed with short [+ (get "op_element") +] (%" PRId64 " => %" PRId64 ").\n", + [+ (get "count_name") +], count) ; fflush (stdout) ; puts (sf_strerror (file)) ; exit (1) ; @@ -669,8 +695,7 @@ test_read_raw_or_die (SNDFILE *file, int pass, void *test, sf_count_t items, int { printf ("\n\nLine %d", line_num) ; if (pass > 0) printf (" (pass %d)", pass) ; - printf (" : sf_read_raw failed with short read (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; + printf (" : sf_read_raw failed with short read (%" PRId64 " => %" PRId64 ").\n", items, count) ; fflush (stdout) ; puts (sf_strerror (file)) ; exit (1) ; @@ -689,8 +714,8 @@ test_[+ (get "op_element") +]_[+ (get "io_element") +]_or_die (SNDFILE *file, in { printf ("\n\nLine %d", line_num) ; if (pass > 0) printf (" (pass %d)", pass) ; - printf (" : sf_[+ (get "op_element") +]_[+ (get "io_element") +] failed with short [+ (get "op_element") +] (%ld => %ld).\n", - SF_COUNT_TO_LONG ([+ (get "count_name") +]), SF_COUNT_TO_LONG (count)) ; + printf (" : sf_[+ (get "op_element") +]_[+ (get "io_element") +] failed with short [+ (get "op_element") +] (%" PRId64 " => %" PRId64 ").\n", + [+ (get "count_name") +], count) ; fflush (stdout) ; puts (sf_strerror (file)) ; exit (1) ; @@ -708,8 +733,7 @@ test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t ite { printf ("\n\nLine %d", line_num) ; if (pass > 0) printf (" (pass %d)", pass) ; - printf (" : sf_write_raw failed with short write (%ld => %ld).\n", - SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ; + printf (" : sf_write_raw failed with short write (%" PRId64 " => %" PRId64 ").\n", items, count) ; fflush (stdout) ; puts (sf_strerror (file)) ; exit (1) ; @@ -721,13 +745,13 @@ test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t ite [+ FOR io_type +]void -compare_[+ (get "io_element") +]_or_die (const [+ (get "io_element") +] *left, const [+ (get "io_element") +] *right, unsigned count, int line_num) +compare_[+ (get "io_element") +]_or_die (const [+ (get "io_element") +] *expected, const [+ (get "io_element") +] *actual, unsigned count, int line_num) { unsigned k ; - for (k = 0 ; k < count ;k++) - if (left [k] != right [k]) - { printf ("\n\nLine %d : Error at index %d, " [+ (get "format_str") +] " should be " [+ (get "format_str") +] ".\n\n", line_num, k, left [k], right [k]) ; + for (k = 0 ; k < count ; k++) + if (expected [k] != actual [k]) + { printf ("\n\nLine %d : Error at index %d, got " [+ (get "format_str") +] ", should be " [+ (get "format_str") +] ".\n\n", line_num, k, actual [k], expected [k]) ; exit (1) ; } ; @@ -765,6 +789,17 @@ delete_file (int format, const char *filename) unlink (rsrc_name) ; } /* delete_file */ +int +truncate_file_to_zero (const char * fname) +{ FILE * file ; + + if ((file = fopen (fname, "w")) == NULL) + return errno ; + fclose (file) ; + + return 0 ; +} /* truncate_file_to_zero */ + static int allowed_open_files = -1 ; void @@ -796,7 +831,7 @@ void check_open_file_count_or_die (int lineno) { #if OS_IS_WIN32 - lineno = 0 ; + (void) lineno ; return ; #else int k, count = 0 ; @@ -838,24 +873,26 @@ write_mono_file (const char * filename, int format, int srate, float * output, i } /* write_mono_file */ void -gen_lowpass_noise_float (float *data, int len) -{ int32_t value = 0x1243456 ; +gen_lowpass_signal_float (float *data, int len) +{ int64_t value = 0x1243456 ; double sample, last_val = 0.0 ; int k ; for (k = 0 ; k < len ; k++) { /* Not a crypto quality RNG. */ - value = 11117 * value + 211231 ; - value = 11117 * value + 211231 ; - value = 11117 * value + 211231 ; + value = (11117 * value + 211231) & 0xffffffff ; + value = (11117 * value + 211231) & 0xffffffff ; + value = (11117 * value + 211231) & 0xffffffff ; sample = value / (0x7fffffff * 1.000001) ; sample = 0.2 * sample - 0.9 * last_val ; - data [k] = last_val = sample ; + last_val = sample ; + + data [k] = 0.5 * (sample + sin (2.0 * k * M_PI * 1.0 / 32.0)) ; } ; -} /* gen_lowpass_noise_float */ +} /* gen_lowpass_signal_float */ /* diff --git a/lib-src/libsndfile/tests/virtual_io_test.c b/lib-src/libsndfile/tests/virtual_io_test.c index 1aae063df..854bc3023 100644 --- a/lib-src/libsndfile/tests/virtual_io_test.c +++ b/lib-src/libsndfile/tests/virtual_io_test.c @@ -87,7 +87,7 @@ vfread (void *ptr, sf_count_t count, void *user_data) { VIO_DATA *vf = (VIO_DATA *) user_data ; /* - ** This will brack badly for files over 2Gig in length, but + ** This will break badly for files over 2Gig in length, but ** is sufficient for testing. */ if (vf->offset + count > vf->length) diff --git a/lib-src/libsndfile/tests/win32_ordinal_test.c b/lib-src/libsndfile/tests/win32_ordinal_test.c index ce8723f9b..7c9adb153 100644 --- a/lib-src/libsndfile/tests/win32_ordinal_test.c +++ b/lib-src/libsndfile/tests/win32_ordinal_test.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2006-2011 Erik de Castro Lopo +** Copyright (C) 2006-2017 Erik de Castro Lopo ** ** 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 @@ -17,7 +17,6 @@ */ #include "sfconfig.h" -#include "sndfile.h" #include #include @@ -32,6 +31,9 @@ #include #include +#ifdef HAVE_DIRECT_H +#include +#endif #include #include "utils.h" @@ -106,7 +108,7 @@ win32_ordinal_test (void) } ; if (hmod == NULL) - { puts ("\n\nError : cannot load DLL.\n") ; + { printf ("\n\nError : cannot load DLL (cwd is %s).\n", getcwd (buffer, sizeof (buffer))) ; exit (1) ; } ; diff --git a/lib-src/libsndfile/tests/win32_test.c b/lib-src/libsndfile/tests/win32_test.c index d0d9f2119..d0dc6d8ea 100644 --- a/lib-src/libsndfile/tests/win32_test.c +++ b/lib-src/libsndfile/tests/win32_test.c @@ -21,6 +21,7 @@ #include #include +#include #if HAVE_UNISTD_H #include @@ -103,7 +104,7 @@ show_fstat_error (void) static char data [256] ; STATBUF statbuf ; - int fd, mode, flags, ignored ; + int fd, mode, flags ; if (sizeof (statbuf.st_size) != sizeof (INT64)) { printf ("\n\nLine %d: Error, sizeof (statbuf.st_size) != 8.\n\n", __LINE__) ; @@ -119,7 +120,7 @@ show_fstat_error (void) { printf ("\n\nLine %d: open() failed : %s\n\n", __LINE__, strerror (errno)) ; return ; } ; - ignored = write (fd, data, sizeof (data)) ; + assert (write (fd, data, sizeof (data)) > 0) ; close (fd) ; printf ("1) Re-open file in read/write mode and write another %d bytes at the end.\n", SIGNED_SIZEOF (data)) ; @@ -130,7 +131,7 @@ show_fstat_error (void) return ; } ; LSEEK (fd, 0, SEEK_END) ; - ignored = write (fd, data, sizeof (data)) ; + assert (write (fd, data, sizeof (data)) > 0) ; printf ("2) Now use system (\"%s %s\") to show the file length.\n\n", dir_cmd, filename) ; @@ -140,7 +141,7 @@ show_fstat_error (void) strncat (data, " ", sizeof (data) - 1 - strlen (data)) ; strncat (data, filename, sizeof (data) - 1 - strlen (data)) ; - ignored = system (data) ; + assert (system (data) >= 0) ; puts ("") ; printf ("3) Now use fstat() to get the file length.\n") ; @@ -168,7 +169,7 @@ show_lseek_error (void) static char data [256] ; INT64 retval ; - int fd, mode, flags, ignored ; + int fd, mode, flags ; puts ("\n64 bit lseek() test.\n--------------------") ; @@ -179,7 +180,7 @@ show_lseek_error (void) { printf ("\n\nLine %d: open() failed : %s\n\n", __LINE__, strerror (errno)) ; return ; } ; - ignored = write (fd, data, sizeof (data)) ; + assert (write (fd, data, sizeof (data)) > 0) ; close (fd) ; printf ("1) Re-open file in read/write mode and write another %d bytes at the end.\n", SIGNED_SIZEOF (data)) ; @@ -191,7 +192,7 @@ show_lseek_error (void) } ; LSEEK (fd, 0, SEEK_END) ; - ignored = write (fd, data, sizeof (data)) ; + assert (write (fd, data, sizeof (data)) > 0) ; printf ("2) Now use system (\"%s %s\") to show the file length.\n\n", dir_cmd, filename) ; @@ -201,7 +202,7 @@ show_lseek_error (void) strncat (data, " ", sizeof (data) - 1 - strlen (data)) ; strncat (data, filename, sizeof (data) - 1 - strlen (data)) ; - ignored = system (data) ; + assert (system (data) >= 0) ; puts ("") ; printf ("3) Now use lseek() to go to the end of the file.\n") ; @@ -226,7 +227,7 @@ show_stat_fstat_error (void) static char data [256] ; int fd, mode, flags ; - int stat_size, fstat_size, ignored ; + int stat_size, fstat_size ; struct stat buf ; /* Known to fail on WinXP. */ @@ -241,7 +242,7 @@ show_stat_fstat_error (void) return ; } ; - ignored = write (fd, data, sizeof (data)) ; + assert (write (fd, data, sizeof (data)) > 0) ; printf ("1) Now call stat and fstat on the file and retreive the file lengths.\n") ; @@ -279,7 +280,7 @@ write_to_closed_file (void) { const char * filename = "closed_write_test.txt" ; struct stat buf ; FILE * file ; - int fd, ignored ; + int fd ; puts ("\nWrite to closed file test.\n--------------------------") ; @@ -293,7 +294,7 @@ write_to_closed_file (void) fd = fileno (file) ; printf ("2) Write some text via the file descriptor.\n") ; - ignored = write (fd, "a\n", 2) ; + assert (write (fd, "a\n", 2) > 0) ; printf ("3) Now we close the file using fclose().\n") ; fclose (file) ; diff --git a/lib-src/libsndfile/tests/write_read_test.c b/lib-src/libsndfile/tests/write_read_test.c deleted file mode 100644 index 8b9eaff5a..000000000 --- a/lib-src/libsndfile/tests/write_read_test.c +++ /dev/null @@ -1,3749 +0,0 @@ -/* -** Copyright (C) 1999-2011 Erik de Castro Lopo -** -** 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-1307, USA. -*/ - -#include "sfconfig.h" - -#include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#include - -#if (defined (WIN32) || defined (_WIN32)) -#include -static int truncate (const char *filename, int ignored) ; -#endif - -#include - -#include "utils.h" -#include "generate.h" - -#define SAMPLE_RATE 11025 -#define DATA_LENGTH (1<<12) - -#define SILLY_WRITE_COUNT (234) - -static void pcm_test_char (const char *str, int format, int long_file_okz) ; -static void pcm_test_short (const char *str, int format, int long_file_okz) ; -static void pcm_test_24bit (const char *str, int format, int long_file_okz) ; -static void pcm_test_int (const char *str, int format, int long_file_okz) ; -static void pcm_test_float (const char *str, int format, int long_file_okz) ; -static void pcm_test_double (const char *str, int format, int long_file_okz) ; - -static void empty_file_test (const char *filename, int format) ; - -typedef union -{ double d [DATA_LENGTH] ; - float f [DATA_LENGTH] ; - int i [DATA_LENGTH] ; - short s [DATA_LENGTH] ; - char c [DATA_LENGTH] ; -} BUFFER ; - -static BUFFER orig_data ; -static BUFFER test_data ; - -int -main (int argc, char **argv) -{ int do_all = 0 ; - int test_count = 0 ; - - count_open_files () ; - - if (argc != 2) - { printf ("Usage : %s \n", argv [0]) ; - printf (" Where is one of the following:\n") ; - printf (" wav - test WAV file functions (little endian)\n") ; - printf (" aiff - test AIFF file functions (big endian)\n") ; - printf (" au - test AU file functions\n") ; - printf (" avr - test AVR file functions\n") ; - printf (" caf - test CAF file functions\n") ; - printf (" raw - test RAW header-less PCM file functions\n") ; - printf (" paf - test PAF file functions\n") ; - printf (" svx - test 8SVX/16SV file functions\n") ; - printf (" nist - test NIST Sphere file functions\n") ; - printf (" ircam - test IRCAM file functions\n") ; - printf (" voc - Create Voice file functions\n") ; - printf (" w64 - Sonic Foundry's W64 file functions\n") ; - printf (" flac - test FLAC file functions\n") ; - printf (" mpc2k - test MPC 2000 file functions\n") ; - printf (" rf64 - test RF64 file functions\n") ; - printf (" all - perform all tests\n") ; - exit (1) ; - } ; - - do_all = !strcmp (argv [1], "all") ; - - if (do_all || ! strcmp (argv [1], "wav")) - { pcm_test_char ("char.wav" , SF_FORMAT_WAV | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_short ("short.wav" , SF_FORMAT_WAV | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit.wav" , SF_FORMAT_WAV | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int.wav" , SF_FORMAT_WAV | SF_FORMAT_PCM_32, SF_FALSE) ; - - pcm_test_char ("char.rifx" , SF_ENDIAN_BIG | SF_FORMAT_WAV | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_short ("short.rifx" , SF_ENDIAN_BIG | SF_FORMAT_WAV | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit.rifx" , SF_ENDIAN_BIG | SF_FORMAT_WAV | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int.rifx" , SF_ENDIAN_BIG | SF_FORMAT_WAV | SF_FORMAT_PCM_32, SF_FALSE) ; - - pcm_test_24bit ("24bit.wavex" , SF_FORMAT_WAVEX | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int.wavex" , SF_FORMAT_WAVEX | SF_FORMAT_PCM_32, SF_FALSE) ; - - /* Lite remove start */ - pcm_test_float ("float.wav" , SF_FORMAT_WAV | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double.wav" , SF_FORMAT_WAV | SF_FORMAT_DOUBLE, SF_FALSE) ; - - pcm_test_float ("float.rifx" , SF_ENDIAN_BIG | SF_FORMAT_WAV | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double.rifx" , SF_ENDIAN_BIG | SF_FORMAT_WAV | SF_FORMAT_DOUBLE, SF_FALSE) ; - - pcm_test_float ("float.wavex" , SF_FORMAT_WAVEX | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double.wavex" , SF_FORMAT_WAVEX | SF_FORMAT_DOUBLE, SF_FALSE) ; - /* Lite remove end */ - - empty_file_test ("empty_char.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_U8) ; - empty_file_test ("empty_short.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ; - empty_file_test ("empty_float.wav", SF_FORMAT_WAV | SF_FORMAT_FLOAT) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "aiff")) - { pcm_test_char ("char_u8.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_char ("char_s8.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_32, SF_FALSE) ; - - pcm_test_short ("short_sowt.aifc" , SF_ENDIAN_LITTLE | SF_FORMAT_AIFF | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit_sowt.aifc" , SF_ENDIAN_LITTLE | SF_FORMAT_AIFF | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int_sowt.aifc" , SF_ENDIAN_LITTLE | SF_FORMAT_AIFF | SF_FORMAT_PCM_32, SF_FALSE) ; - - pcm_test_short ("short_twos.aifc" , SF_ENDIAN_BIG | SF_FORMAT_AIFF | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit_twos.aifc" , SF_ENDIAN_BIG | SF_FORMAT_AIFF | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int_twos.aifc" , SF_ENDIAN_BIG | SF_FORMAT_AIFF | SF_FORMAT_PCM_32, SF_FALSE) ; - - /* Lite remove start */ - pcm_test_short ("dwvw16.aifc", SF_FORMAT_AIFF | SF_FORMAT_DWVW_16, SF_TRUE) ; - pcm_test_24bit ("dwvw24.aifc", SF_FORMAT_AIFF | SF_FORMAT_DWVW_24, SF_TRUE) ; - - pcm_test_float ("float.aifc" , SF_FORMAT_AIFF | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double.aifc" , SF_FORMAT_AIFF | SF_FORMAT_DOUBLE, SF_FALSE) ; - /* Lite remove end */ - - empty_file_test ("empty_char.aiff", SF_FORMAT_AIFF | SF_FORMAT_PCM_U8) ; - empty_file_test ("empty_short.aiff", SF_FORMAT_AIFF | SF_FORMAT_PCM_16) ; - empty_file_test ("empty_float.aiff", SF_FORMAT_AIFF | SF_FORMAT_FLOAT) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "au")) - { pcm_test_char ("char.au" , SF_FORMAT_AU | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short.au" , SF_FORMAT_AU | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit.au" , SF_FORMAT_AU | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int.au" , SF_FORMAT_AU | SF_FORMAT_PCM_32, SF_FALSE) ; - /* Lite remove start */ - pcm_test_float ("float.au" , SF_FORMAT_AU | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double.au", SF_FORMAT_AU | SF_FORMAT_DOUBLE, SF_FALSE) ; - /* Lite remove end */ - - pcm_test_char ("char_le.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short_le.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit_le.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int_le.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_PCM_32, SF_FALSE) ; - /* Lite remove start */ - pcm_test_float ("float_le.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double_le.au" , SF_ENDIAN_LITTLE | SF_FORMAT_AU | SF_FORMAT_DOUBLE, SF_FALSE) ; - /* Lite remove end */ - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "caf")) - { pcm_test_char ("char.caf" , SF_FORMAT_CAF | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short.caf" , SF_FORMAT_CAF | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit.caf" , SF_FORMAT_CAF | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int.caf" , SF_FORMAT_CAF | SF_FORMAT_PCM_32, SF_FALSE) ; - /* Lite remove start */ - pcm_test_float ("float.caf" , SF_FORMAT_CAF | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double.caf" , SF_FORMAT_CAF | SF_FORMAT_DOUBLE, SF_FALSE) ; - /* Lite remove end */ - - pcm_test_short ("short_le.caf" , SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit_le.caf" , SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int_le.caf" , SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_PCM_32, SF_FALSE) ; - /* Lite remove start */ - pcm_test_float ("float_le.caf" , SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double_le.caf", SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_DOUBLE, SF_FALSE) ; - /* Lite remove end */ - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "raw")) - { pcm_test_char ("char_s8.raw" , SF_FORMAT_RAW | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_char ("char_u8.raw" , SF_FORMAT_RAW | SF_FORMAT_PCM_U8, SF_FALSE) ; - - pcm_test_short ("short_le.raw" , SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_short ("short_be.raw" , SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit_le.raw" , SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_24bit ("24bit_be.raw" , SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int_le.raw" , SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_PCM_32, SF_FALSE) ; - pcm_test_int ("int_be.raw" , SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_PCM_32, SF_FALSE) ; - - /* Lite remove start */ - pcm_test_float ("float_le.raw" , SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_float ("float_be.raw" , SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_FLOAT , SF_FALSE) ; - - pcm_test_double ("double_le.raw", SF_ENDIAN_LITTLE | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, SF_FALSE) ; - pcm_test_double ("double_be.raw", SF_ENDIAN_BIG | SF_FORMAT_RAW | SF_FORMAT_DOUBLE, SF_FALSE) ; - /* Lite remove end */ - test_count++ ; - } ; - - /* Lite remove start */ - if (do_all || ! strcmp (argv [1], "paf")) - { pcm_test_char ("char_le.paf", SF_ENDIAN_LITTLE | SF_FORMAT_PAF | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_char ("char_be.paf", SF_ENDIAN_BIG | SF_FORMAT_PAF | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short_le.paf", SF_ENDIAN_LITTLE | SF_FORMAT_PAF | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_short ("short_be.paf", SF_ENDIAN_BIG | SF_FORMAT_PAF | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit_le.paf", SF_ENDIAN_LITTLE | SF_FORMAT_PAF | SF_FORMAT_PCM_24, SF_TRUE) ; - pcm_test_24bit ("24bit_be.paf", SF_ENDIAN_BIG | SF_FORMAT_PAF | SF_FORMAT_PCM_24, SF_TRUE) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "svx")) - { pcm_test_char ("char.svx" , SF_FORMAT_SVX | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short.svx", SF_FORMAT_SVX | SF_FORMAT_PCM_16, SF_FALSE) ; - - empty_file_test ("empty_char.svx", SF_FORMAT_SVX | SF_FORMAT_PCM_S8) ; - empty_file_test ("empty_short.svx", SF_FORMAT_SVX | SF_FORMAT_PCM_16) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "nist")) - { pcm_test_short ("short_le.nist", SF_ENDIAN_LITTLE | SF_FORMAT_NIST | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_short ("short_be.nist", SF_ENDIAN_BIG | SF_FORMAT_NIST | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit_le.nist", SF_ENDIAN_LITTLE | SF_FORMAT_NIST | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_24bit ("24bit_be.nist", SF_ENDIAN_BIG | SF_FORMAT_NIST | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int_le.nist" , SF_ENDIAN_LITTLE | SF_FORMAT_NIST | SF_FORMAT_PCM_32, SF_FALSE) ; - pcm_test_int ("int_be.nist" , SF_ENDIAN_BIG | SF_FORMAT_NIST | SF_FORMAT_PCM_32, SF_FALSE) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "ircam")) - { pcm_test_short ("short_be.ircam" , SF_ENDIAN_BIG | SF_FORMAT_IRCAM | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_short ("short_le.ircam" , SF_ENDIAN_LITTLE | SF_FORMAT_IRCAM | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_int ("int_be.ircam" , SF_ENDIAN_BIG | SF_FORMAT_IRCAM | SF_FORMAT_PCM_32, SF_FALSE) ; - pcm_test_int ("int_le.ircam" , SF_ENDIAN_LITTLE | SF_FORMAT_IRCAM | SF_FORMAT_PCM_32, SF_FALSE) ; - pcm_test_float ("float_be.ircam" , SF_ENDIAN_BIG | SF_FORMAT_IRCAM | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_float ("float_le.ircam" , SF_ENDIAN_LITTLE | SF_FORMAT_IRCAM | SF_FORMAT_FLOAT , SF_FALSE) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "voc")) - { pcm_test_char ("char.voc" , SF_FORMAT_VOC | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_short ("short.voc", SF_FORMAT_VOC | SF_FORMAT_PCM_16, SF_FALSE) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "mat4")) - { pcm_test_short ("short_be.mat4" , SF_ENDIAN_BIG | SF_FORMAT_MAT4 | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_short ("short_le.mat4" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT4 | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_int ("int_be.mat4" , SF_ENDIAN_BIG | SF_FORMAT_MAT4 | SF_FORMAT_PCM_32, SF_FALSE) ; - pcm_test_int ("int_le.mat4" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT4 | SF_FORMAT_PCM_32, SF_FALSE) ; - pcm_test_float ("float_be.mat4" , SF_ENDIAN_BIG | SF_FORMAT_MAT4 | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_float ("float_le.mat4" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT4 | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double_be.mat4" , SF_ENDIAN_BIG | SF_FORMAT_MAT4 | SF_FORMAT_DOUBLE, SF_FALSE) ; - pcm_test_double ("double_le.mat4" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT4 | SF_FORMAT_DOUBLE, SF_FALSE) ; - - empty_file_test ("empty_short.mat4", SF_FORMAT_MAT4 | SF_FORMAT_PCM_16) ; - empty_file_test ("empty_float.mat4", SF_FORMAT_MAT4 | SF_FORMAT_FLOAT) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "mat5")) - { pcm_test_char ("char_be.mat5" , SF_ENDIAN_BIG | SF_FORMAT_MAT5 | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_char ("char_le.mat5" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT5 | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_short ("short_be.mat5" , SF_ENDIAN_BIG | SF_FORMAT_MAT5 | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_short ("short_le.mat5" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT5 | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_int ("int_be.mat5" , SF_ENDIAN_BIG | SF_FORMAT_MAT5 | SF_FORMAT_PCM_32, SF_FALSE) ; - pcm_test_int ("int_le.mat5" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT5 | SF_FORMAT_PCM_32, SF_FALSE) ; - pcm_test_float ("float_be.mat5" , SF_ENDIAN_BIG | SF_FORMAT_MAT5 | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_float ("float_le.mat5" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT5 | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double_be.mat5" , SF_ENDIAN_BIG | SF_FORMAT_MAT5 | SF_FORMAT_DOUBLE, SF_FALSE) ; - pcm_test_double ("double_le.mat5" , SF_ENDIAN_LITTLE | SF_FORMAT_MAT5 | SF_FORMAT_DOUBLE, SF_FALSE) ; - - increment_open_file_count () ; - - empty_file_test ("empty_char.mat5", SF_FORMAT_MAT5 | SF_FORMAT_PCM_U8) ; - empty_file_test ("empty_short.mat5", SF_FORMAT_MAT5 | SF_FORMAT_PCM_16) ; - empty_file_test ("empty_float.mat5", SF_FORMAT_MAT5 | SF_FORMAT_FLOAT) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "pvf")) - { pcm_test_char ("char.pvf" , SF_FORMAT_PVF | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short.pvf", SF_FORMAT_PVF | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_int ("int.pvf" , SF_FORMAT_PVF | SF_FORMAT_PCM_32, SF_FALSE) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "htk")) - { pcm_test_short ("short.htk", SF_FORMAT_HTK | SF_FORMAT_PCM_16, SF_FALSE) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "mpc2k")) - { pcm_test_short ("short.mpc", SF_FORMAT_MPC2K | SF_FORMAT_PCM_16, SF_FALSE) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "avr")) - { pcm_test_char ("char_u8.avr" , SF_FORMAT_AVR | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_char ("char_s8.avr" , SF_FORMAT_AVR | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short.avr" , SF_FORMAT_AVR | SF_FORMAT_PCM_16, SF_FALSE) ; - test_count++ ; - } ; - /* Lite remove end */ - - if (do_all || ! strcmp (argv [1], "w64")) - { pcm_test_char ("char.w64" , SF_FORMAT_W64 | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_short ("short.w64" , SF_FORMAT_W64 | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit.w64" , SF_FORMAT_W64 | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int.w64" , SF_FORMAT_W64 | SF_FORMAT_PCM_32, SF_FALSE) ; - /* Lite remove start */ - pcm_test_float ("float.w64" , SF_FORMAT_W64 | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double.w64" , SF_FORMAT_W64 | SF_FORMAT_DOUBLE, SF_FALSE) ; - /* Lite remove end */ - - empty_file_test ("empty_char.w64", SF_FORMAT_W64 | SF_FORMAT_PCM_U8) ; - empty_file_test ("empty_short.w64", SF_FORMAT_W64 | SF_FORMAT_PCM_16) ; - empty_file_test ("empty_float.w64", SF_FORMAT_W64 | SF_FORMAT_FLOAT) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "sds")) - { pcm_test_char ("char.sds" , SF_FORMAT_SDS | SF_FORMAT_PCM_S8, SF_FALSE) ; - pcm_test_short ("short.sds" , SF_FORMAT_SDS | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit.sds" , SF_FORMAT_SDS | SF_FORMAT_PCM_24, SF_FALSE) ; - - empty_file_test ("empty_char.sds", SF_FORMAT_SDS | SF_FORMAT_PCM_S8) ; - empty_file_test ("empty_short.sds", SF_FORMAT_SDS | SF_FORMAT_PCM_16) ; - - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "sd2")) - { pcm_test_char ("char.sd2" , SF_FORMAT_SD2 | SF_FORMAT_PCM_S8, SF_TRUE) ; - pcm_test_short ("short.sd2" , SF_FORMAT_SD2 | SF_FORMAT_PCM_16, SF_TRUE) ; - pcm_test_24bit ("24bit.sd2" , SF_FORMAT_SD2 | SF_FORMAT_PCM_24, SF_TRUE) ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "flac")) - { if (HAVE_EXTERNAL_LIBS) - { pcm_test_char ("char.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, SF_TRUE) ; - pcm_test_short ("short.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_16, SF_TRUE) ; - pcm_test_24bit ("24bit.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_24, SF_TRUE) ; - } - else - puts (" No FLAC tests because FLAC support was not compiled in.") ; - test_count++ ; - } ; - - if (do_all || ! strcmp (argv [1], "rf64")) - { pcm_test_char ("char.rf64" , SF_FORMAT_RF64 | SF_FORMAT_PCM_U8, SF_FALSE) ; - pcm_test_short ("short.rf64" , SF_FORMAT_RF64 | SF_FORMAT_PCM_16, SF_FALSE) ; - pcm_test_24bit ("24bit.rf64" , SF_FORMAT_RF64 | SF_FORMAT_PCM_24, SF_FALSE) ; - pcm_test_int ("int.rf64" , SF_FORMAT_RF64 | SF_FORMAT_PCM_32, SF_FALSE) ; - - /* Lite remove start */ - pcm_test_float ("float.rf64" , SF_FORMAT_RF64 | SF_FORMAT_FLOAT , SF_FALSE) ; - pcm_test_double ("double.rf64" , SF_FORMAT_RF64 | SF_FORMAT_DOUBLE, SF_FALSE) ; - empty_file_test ("empty_char.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_U8) ; - empty_file_test ("empty_short.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ; - empty_file_test ("empty_float.rf64", SF_FORMAT_RF64 | SF_FORMAT_FLOAT) ; - /* Lite remove end */ - - test_count++ ; - } ; - - if (test_count == 0) - { printf ("Mono : ************************************\n") ; - printf ("Mono : * No '%s' test defined.\n", argv [1]) ; - printf ("Mono : ************************************\n") ; - return 1 ; - } ; - - /* Only open file descriptors should be stdin, stdout and stderr. */ - check_open_file_count_or_die (__LINE__) ; - - return 0 ; -} /* main */ - -/*============================================================================================ -** Helper functions and macros. -*/ - -static void create_short_file (const char *filename) ; - -#define CHAR_ERROR(x,y) (abs ((x) - (y)) > 255) -#define INT_ERROR(x,y) (((x) - (y)) != 0) -#define TRIBYTE_ERROR(x,y) (abs ((x) - (y)) > 255) -#define FLOAT_ERROR(x,y) (fabs ((x) - (y)) > 1e-5) - -#define CONVERT_DATA(k,len,new,orig) \ - { for ((k) = 0 ; (k) < (len) ; (k) ++) \ - (new) [k] = (orig) [k] ; \ - } - - -/*====================================================================================== -*/ - -static void mono_char_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void stereo_char_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void mono_rdwr_char_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void new_rdwr_char_test (const char *filename, int format, int allow_fd) ; -static void multi_seek_test (const char * filename, int format) ; -static void write_seek_extend_test (const char * filename, int format) ; - -static void -pcm_test_char (const char *filename, int format, int long_file_ok) -{ SF_INFO sfinfo ; - short *orig, *test ; - int k, items, allow_fd ; - - /* Sd2 files cannot be opened from an existing file descriptor. */ - allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ; - - print_test_name ("pcm_test_char", filename) ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 32000.0) ; - - orig = orig_data.s ; - test = test_data.s ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - - /* Some test broken out here. */ - - mono_char_test (filename, format, long_file_ok, allow_fd) ; - - /* Sub format DWVW does not allow seeking. */ - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { unlink (filename) ; - printf ("no seek : ok\n") ; - return ; - } ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - mono_rdwr_char_test (filename, format, long_file_ok, allow_fd) ; - - /* If the format doesn't support stereo we're done. */ - sfinfo.channels = 2 ; - if (sf_format_check (&sfinfo) == 0) - { unlink (filename) ; - puts ("no stereo : ok") ; - return ; - } ; - - stereo_char_test (filename, format, long_file_ok, allow_fd) ; - - /* New read/write test. Not sure if this is needed yet. */ - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - new_rdwr_char_test (filename, format, allow_fd) ; - - delete_file (format, filename) ; - - puts ("ok") ; - return ; -} /* pcm_test_char */ - -static void -mono_char_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - short *orig, *test ; - sf_count_t count ; - int k, items ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - orig = orig_data.s ; - test = test_data.s ; - - items = DATA_LENGTH ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_write_short_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - test_write_short_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - - /* Add non-audio data after the audio. */ - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (short)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Mono : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Mono : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_short_or_die (file, 0, test, items, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (CHAR_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d: Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - oct_save_short (orig, test, items) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_short_or_die (file, 0, test, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (CHAR_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { sf_close (file) ; - unlink (filename) ; - printf ("no seek : ") ; - return ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, items + 10, SEEK_SET, items + 10, sfinfo.channels, __LINE__) ; - - test_read_short_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (CHAR_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 6, SEEK_CUR, items + 20, sfinfo.channels, __LINE__) ; - - test_read_short_or_die (file, 0, test + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (CHAR_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_read_short_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (CHAR_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample D (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Check read past end of file followed by sf_seek (sndfile, 0, SEEK_CUR). */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - count = 0 ; - while (count < sfinfo.frames) - count += sf_read_short (file, test, 311) ; - - /* Check that no error has occurred. */ - if (sf_error (file)) - { printf ("\n\nLine %d : Mono : error where there shouldn't have been one.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - /* Check that we haven't read beyond EOF. */ - if (count > sfinfo.frames) - { printf ("\n\nLines %d : read past end of file (%ld should be %ld)\n", __LINE__, (long) count, (long) sfinfo.frames) ; - exit (1) ; - } ; - - test_seek_or_die (file, 0, SEEK_CUR, sfinfo.frames, sfinfo.channels, __LINE__) ; - - sf_close (file) ; - - multi_seek_test (filename, format) ; - write_seek_extend_test (filename, format) ; - -} /* mono_char_test */ - -static void -stereo_char_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - short *orig, *test ; - int k, items, frames ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 32000.0) ; - - orig = orig_data.s ; - test = test_data.s ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_writef_short_or_die (file, 0, orig, frames, __LINE__) ; - - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (short)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Stereo : Returned format incorrect (0x%08X => 0x%08X).\n", - __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (sfinfo.channels != 2) - { printf ("\n\nLine %d : Stereo : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_readf_short_or_die (file, 0, test, frames, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (CHAR_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_readf_short_or_die (file, 0, test, 2, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (CHAR_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - /* Check for errors here. */ - if (sf_error (file)) - { printf ("Line %d: Should NOT return an error.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - if (sf_read_short (file, test, 1) > 0) - { printf ("Line %d: Should return 0.\n", __LINE__) ; - exit (1) ; - } ; - - if (! sf_error (file)) - { printf ("Line %d: Should return an error.\n", __LINE__) ; - exit (1) ; - } ; - /*-----------------------*/ - - test_readf_short_or_die (file, 0, test + 10, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (CHAR_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 8, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_readf_short_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 40 ; k < 44 ; k++) - if (CHAR_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_readf_short_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (CHAR_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - sf_close (file) ; -} /* stereo_char_test */ - -static void -mono_rdwr_char_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - short *orig, *test ; - int k, pass ; - - orig = orig_data.s ; - test = test_data.s ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - if ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_RAW - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AU - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) - unlink (filename) ; - else - { /* Create a short file. */ - create_short_file (filename) ; - - /* Opening a already existing short file (ie invalid header) RDWR is disallowed. - ** If this returns a valif pointer sf_open() screwed up. - */ - if ((file = sf_open (filename, SFM_RDWR, &sfinfo))) - { printf ("\n\nLine %d: sf_open should (SFM_RDWR) have failed but didn't.\n", __LINE__) ; - exit (1) ; - } ; - - /* Truncate the file to zero bytes. */ - if (truncate (filename, 0) < 0) - { printf ("\n\nLine %d: truncate (%s) failed", __LINE__, filename) ; - perror (NULL) ; - exit (1) ; - } ; - } ; - - /* Opening a zero length file RDWR is allowed, but the SF_INFO struct must contain - ** all the usual data required when opening the file in WRITE mode. - */ - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - /* Do 3 writes followed by reads. After each, check the data and the current - ** read and write offsets. - */ - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - /* Write some data. */ - test_write_short_or_die (file, pass, orig, DATA_LENGTH, __LINE__) ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, pass * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_short_or_die (file, 0, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (CHAR_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) A : Error at sample %d (0x%X => 0x%X).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_short (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - test_read_write_position_or_die (file, __LINE__, pass, pass * DATA_LENGTH, pass * DATA_LENGTH) ; - } ; /* for (pass ...) */ - - sf_close (file) ; - - /* Open the file again to check the data. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Not enough frames in file. (%ld < %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } - - if (! long_file_ok && sfinfo.frames != 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Incorrect number of frames in file. (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - if (! long_file_ok) - test_read_write_position_or_die (file, __LINE__, 0, 0, 3 * DATA_LENGTH) ; - else - test_seek_or_die (file, 3 * DATA_LENGTH, SFM_WRITE | SEEK_SET, 3 * DATA_LENGTH, sfinfo.channels, __LINE__) ; - - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, 3 * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_short_or_die (file, pass, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (CHAR_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) B : Error at sample %d (0x%X => 0x%X).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_short (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - } ; /* for (pass ...) */ - - sf_close (file) ; -} /* mono_rdwr_short_test */ - -static void -new_rdwr_char_test (const char *filename, int format, int allow_fd) -{ SNDFILE *wfile, *rwfile ; - SF_INFO sfinfo ; - short *orig, *test ; - int items, frames ; - - orig = orig_data.s ; - test = test_data.s ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - wfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - sf_command (wfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) ; - test_writef_short_or_die (wfile, 1, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - test_writef_short_or_die (wfile, 2, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - - rwfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - if (sfinfo.frames != 2 * frames) - { printf ("\n\nLine %d : incorrect number of frames in file (%ld should be %d)\n\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * frames) ; - exit (1) ; - } ; - - test_writef_short_or_die (wfile, 3, orig, frames, __LINE__) ; - - test_readf_short_or_die (rwfile, 1, test, frames, __LINE__) ; - test_readf_short_or_die (rwfile, 2, test, frames, __LINE__) ; - - sf_close (wfile) ; - sf_close (rwfile) ; -} /* new_rdwr_char_test */ - - -/*====================================================================================== -*/ - -static void mono_short_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void stereo_short_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void mono_rdwr_short_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void new_rdwr_short_test (const char *filename, int format, int allow_fd) ; -static void multi_seek_test (const char * filename, int format) ; -static void write_seek_extend_test (const char * filename, int format) ; - -static void -pcm_test_short (const char *filename, int format, int long_file_ok) -{ SF_INFO sfinfo ; - short *orig, *test ; - int k, items, allow_fd ; - - /* Sd2 files cannot be opened from an existing file descriptor. */ - allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ; - - print_test_name ("pcm_test_short", filename) ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 32000.0) ; - - orig = orig_data.s ; - test = test_data.s ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - - /* Some test broken out here. */ - - mono_short_test (filename, format, long_file_ok, allow_fd) ; - - /* Sub format DWVW does not allow seeking. */ - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { unlink (filename) ; - printf ("no seek : ok\n") ; - return ; - } ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - mono_rdwr_short_test (filename, format, long_file_ok, allow_fd) ; - - /* If the format doesn't support stereo we're done. */ - sfinfo.channels = 2 ; - if (sf_format_check (&sfinfo) == 0) - { unlink (filename) ; - puts ("no stereo : ok") ; - return ; - } ; - - stereo_short_test (filename, format, long_file_ok, allow_fd) ; - - /* New read/write test. Not sure if this is needed yet. */ - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - new_rdwr_short_test (filename, format, allow_fd) ; - - delete_file (format, filename) ; - - puts ("ok") ; - return ; -} /* pcm_test_short */ - -static void -mono_short_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - short *orig, *test ; - sf_count_t count ; - int k, items ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - orig = orig_data.s ; - test = test_data.s ; - - items = DATA_LENGTH ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_write_short_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - test_write_short_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - - /* Add non-audio data after the audio. */ - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (short)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Mono : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Mono : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_short_or_die (file, 0, test, items, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d: Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - oct_save_short (orig, test, items) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_short_or_die (file, 0, test, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { sf_close (file) ; - unlink (filename) ; - printf ("no seek : ") ; - return ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, items + 10, SEEK_SET, items + 10, sfinfo.channels, __LINE__) ; - - test_read_short_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 6, SEEK_CUR, items + 20, sfinfo.channels, __LINE__) ; - - test_read_short_or_die (file, 0, test + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_read_short_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample D (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Check read past end of file followed by sf_seek (sndfile, 0, SEEK_CUR). */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - count = 0 ; - while (count < sfinfo.frames) - count += sf_read_short (file, test, 311) ; - - /* Check that no error has occurred. */ - if (sf_error (file)) - { printf ("\n\nLine %d : Mono : error where there shouldn't have been one.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - /* Check that we haven't read beyond EOF. */ - if (count > sfinfo.frames) - { printf ("\n\nLines %d : read past end of file (%ld should be %ld)\n", __LINE__, (long) count, (long) sfinfo.frames) ; - exit (1) ; - } ; - - test_seek_or_die (file, 0, SEEK_CUR, sfinfo.frames, sfinfo.channels, __LINE__) ; - - sf_close (file) ; - - multi_seek_test (filename, format) ; - write_seek_extend_test (filename, format) ; - -} /* mono_short_test */ - -static void -stereo_short_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - short *orig, *test ; - int k, items, frames ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 32000.0) ; - - orig = orig_data.s ; - test = test_data.s ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_writef_short_or_die (file, 0, orig, frames, __LINE__) ; - - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (short)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Stereo : Returned format incorrect (0x%08X => 0x%08X).\n", - __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (sfinfo.channels != 2) - { printf ("\n\nLine %d : Stereo : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_readf_short_or_die (file, 0, test, frames, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_readf_short_or_die (file, 0, test, 2, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - /* Check for errors here. */ - if (sf_error (file)) - { printf ("Line %d: Should NOT return an error.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - if (sf_read_short (file, test, 1) > 0) - { printf ("Line %d: Should return 0.\n", __LINE__) ; - exit (1) ; - } ; - - if (! sf_error (file)) - { printf ("Line %d: Should return an error.\n", __LINE__) ; - exit (1) ; - } ; - /*-----------------------*/ - - test_readf_short_or_die (file, 0, test + 10, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 8, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_readf_short_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 40 ; k < 44 ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_readf_short_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - sf_close (file) ; -} /* stereo_short_test */ - -static void -mono_rdwr_short_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - short *orig, *test ; - int k, pass ; - - orig = orig_data.s ; - test = test_data.s ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - if ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_RAW - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AU - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) - unlink (filename) ; - else - { /* Create a short file. */ - create_short_file (filename) ; - - /* Opening a already existing short file (ie invalid header) RDWR is disallowed. - ** If this returns a valif pointer sf_open() screwed up. - */ - if ((file = sf_open (filename, SFM_RDWR, &sfinfo))) - { printf ("\n\nLine %d: sf_open should (SFM_RDWR) have failed but didn't.\n", __LINE__) ; - exit (1) ; - } ; - - /* Truncate the file to zero bytes. */ - if (truncate (filename, 0) < 0) - { printf ("\n\nLine %d: truncate (%s) failed", __LINE__, filename) ; - perror (NULL) ; - exit (1) ; - } ; - } ; - - /* Opening a zero length file RDWR is allowed, but the SF_INFO struct must contain - ** all the usual data required when opening the file in WRITE mode. - */ - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - /* Do 3 writes followed by reads. After each, check the data and the current - ** read and write offsets. - */ - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - /* Write some data. */ - test_write_short_or_die (file, pass, orig, DATA_LENGTH, __LINE__) ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, pass * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_short_or_die (file, 0, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) A : Error at sample %d (0x%X => 0x%X).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_short (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - test_read_write_position_or_die (file, __LINE__, pass, pass * DATA_LENGTH, pass * DATA_LENGTH) ; - } ; /* for (pass ...) */ - - sf_close (file) ; - - /* Open the file again to check the data. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Not enough frames in file. (%ld < %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } - - if (! long_file_ok && sfinfo.frames != 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Incorrect number of frames in file. (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - if (! long_file_ok) - test_read_write_position_or_die (file, __LINE__, 0, 0, 3 * DATA_LENGTH) ; - else - test_seek_or_die (file, 3 * DATA_LENGTH, SFM_WRITE | SEEK_SET, 3 * DATA_LENGTH, sfinfo.channels, __LINE__) ; - - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, 3 * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_short_or_die (file, pass, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) B : Error at sample %d (0x%X => 0x%X).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_short (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - } ; /* for (pass ...) */ - - sf_close (file) ; -} /* mono_rdwr_short_test */ - -static void -new_rdwr_short_test (const char *filename, int format, int allow_fd) -{ SNDFILE *wfile, *rwfile ; - SF_INFO sfinfo ; - short *orig, *test ; - int items, frames ; - - orig = orig_data.s ; - test = test_data.s ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - wfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - sf_command (wfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) ; - test_writef_short_or_die (wfile, 1, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - test_writef_short_or_die (wfile, 2, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - - rwfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - if (sfinfo.frames != 2 * frames) - { printf ("\n\nLine %d : incorrect number of frames in file (%ld should be %d)\n\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * frames) ; - exit (1) ; - } ; - - test_writef_short_or_die (wfile, 3, orig, frames, __LINE__) ; - - test_readf_short_or_die (rwfile, 1, test, frames, __LINE__) ; - test_readf_short_or_die (rwfile, 2, test, frames, __LINE__) ; - - sf_close (wfile) ; - sf_close (rwfile) ; -} /* new_rdwr_short_test */ - - -/*====================================================================================== -*/ - -static void mono_24bit_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void stereo_24bit_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void mono_rdwr_24bit_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void new_rdwr_24bit_test (const char *filename, int format, int allow_fd) ; -static void multi_seek_test (const char * filename, int format) ; -static void write_seek_extend_test (const char * filename, int format) ; - -static void -pcm_test_24bit (const char *filename, int format, int long_file_ok) -{ SF_INFO sfinfo ; - int *orig, *test ; - int k, items, allow_fd ; - - /* Sd2 files cannot be opened from an existing file descriptor. */ - allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ; - - print_test_name ("pcm_test_24bit", filename) ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, (1.0 * 0x7F000000)) ; - - orig = orig_data.i ; - test = test_data.i ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - - /* Some test broken out here. */ - - mono_24bit_test (filename, format, long_file_ok, allow_fd) ; - - /* Sub format DWVW does not allow seeking. */ - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { unlink (filename) ; - printf ("no seek : ok\n") ; - return ; - } ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - mono_rdwr_24bit_test (filename, format, long_file_ok, allow_fd) ; - - /* If the format doesn't support stereo we're done. */ - sfinfo.channels = 2 ; - if (sf_format_check (&sfinfo) == 0) - { unlink (filename) ; - puts ("no stereo : ok") ; - return ; - } ; - - stereo_24bit_test (filename, format, long_file_ok, allow_fd) ; - - /* New read/write test. Not sure if this is needed yet. */ - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - new_rdwr_24bit_test (filename, format, allow_fd) ; - - delete_file (format, filename) ; - - puts ("ok") ; - return ; -} /* pcm_test_24bit */ - -static void -mono_24bit_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int *orig, *test ; - sf_count_t count ; - int k, items ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - orig = orig_data.i ; - test = test_data.i ; - - items = DATA_LENGTH ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_write_int_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - test_write_int_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - - /* Add non-audio data after the audio. */ - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (int)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Mono : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Mono : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_int_or_die (file, 0, test, items, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (TRIBYTE_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d: Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - oct_save_int (orig, test, items) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_int_or_die (file, 0, test, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (TRIBYTE_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { sf_close (file) ; - unlink (filename) ; - printf ("no seek : ") ; - return ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, items + 10, SEEK_SET, items + 10, sfinfo.channels, __LINE__) ; - - test_read_int_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (TRIBYTE_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 6, SEEK_CUR, items + 20, sfinfo.channels, __LINE__) ; - - test_read_int_or_die (file, 0, test + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (TRIBYTE_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_read_int_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (TRIBYTE_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample D (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Check read past end of file followed by sf_seek (sndfile, 0, SEEK_CUR). */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - count = 0 ; - while (count < sfinfo.frames) - count += sf_read_int (file, test, 311) ; - - /* Check that no error has occurred. */ - if (sf_error (file)) - { printf ("\n\nLine %d : Mono : error where there shouldn't have been one.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - /* Check that we haven't read beyond EOF. */ - if (count > sfinfo.frames) - { printf ("\n\nLines %d : read past end of file (%ld should be %ld)\n", __LINE__, (long) count, (long) sfinfo.frames) ; - exit (1) ; - } ; - - test_seek_or_die (file, 0, SEEK_CUR, sfinfo.frames, sfinfo.channels, __LINE__) ; - - sf_close (file) ; - - multi_seek_test (filename, format) ; - write_seek_extend_test (filename, format) ; - -} /* mono_24bit_test */ - -static void -stereo_24bit_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int *orig, *test ; - int k, items, frames ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, (1.0 * 0x7F000000)) ; - - orig = orig_data.i ; - test = test_data.i ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_writef_int_or_die (file, 0, orig, frames, __LINE__) ; - - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (int)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Stereo : Returned format incorrect (0x%08X => 0x%08X).\n", - __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (sfinfo.channels != 2) - { printf ("\n\nLine %d : Stereo : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_readf_int_or_die (file, 0, test, frames, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (TRIBYTE_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_readf_int_or_die (file, 0, test, 2, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (TRIBYTE_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - /* Check for errors here. */ - if (sf_error (file)) - { printf ("Line %d: Should NOT return an error.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - if (sf_read_int (file, test, 1) > 0) - { printf ("Line %d: Should return 0.\n", __LINE__) ; - exit (1) ; - } ; - - if (! sf_error (file)) - { printf ("Line %d: Should return an error.\n", __LINE__) ; - exit (1) ; - } ; - /*-----------------------*/ - - test_readf_int_or_die (file, 0, test + 10, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (TRIBYTE_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 8, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_readf_int_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 40 ; k < 44 ; k++) - if (TRIBYTE_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_readf_int_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (TRIBYTE_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - sf_close (file) ; -} /* stereo_24bit_test */ - -static void -mono_rdwr_24bit_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int *orig, *test ; - int k, pass ; - - orig = orig_data.i ; - test = test_data.i ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - if ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_RAW - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AU - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) - unlink (filename) ; - else - { /* Create a short file. */ - create_short_file (filename) ; - - /* Opening a already existing short file (ie invalid header) RDWR is disallowed. - ** If this returns a valif pointer sf_open() screwed up. - */ - if ((file = sf_open (filename, SFM_RDWR, &sfinfo))) - { printf ("\n\nLine %d: sf_open should (SFM_RDWR) have failed but didn't.\n", __LINE__) ; - exit (1) ; - } ; - - /* Truncate the file to zero bytes. */ - if (truncate (filename, 0) < 0) - { printf ("\n\nLine %d: truncate (%s) failed", __LINE__, filename) ; - perror (NULL) ; - exit (1) ; - } ; - } ; - - /* Opening a zero length file RDWR is allowed, but the SF_INFO struct must contain - ** all the usual data required when opening the file in WRITE mode. - */ - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - /* Do 3 writes followed by reads. After each, check the data and the current - ** read and write offsets. - */ - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - /* Write some data. */ - test_write_int_or_die (file, pass, orig, DATA_LENGTH, __LINE__) ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, pass * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_int_or_die (file, 0, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (TRIBYTE_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) A : Error at sample %d (0x%X => 0x%X).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_int (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - test_read_write_position_or_die (file, __LINE__, pass, pass * DATA_LENGTH, pass * DATA_LENGTH) ; - } ; /* for (pass ...) */ - - sf_close (file) ; - - /* Open the file again to check the data. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Not enough frames in file. (%ld < %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } - - if (! long_file_ok && sfinfo.frames != 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Incorrect number of frames in file. (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - if (! long_file_ok) - test_read_write_position_or_die (file, __LINE__, 0, 0, 3 * DATA_LENGTH) ; - else - test_seek_or_die (file, 3 * DATA_LENGTH, SFM_WRITE | SEEK_SET, 3 * DATA_LENGTH, sfinfo.channels, __LINE__) ; - - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, 3 * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_int_or_die (file, pass, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (TRIBYTE_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) B : Error at sample %d (0x%X => 0x%X).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_int (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - } ; /* for (pass ...) */ - - sf_close (file) ; -} /* mono_rdwr_int_test */ - -static void -new_rdwr_24bit_test (const char *filename, int format, int allow_fd) -{ SNDFILE *wfile, *rwfile ; - SF_INFO sfinfo ; - int *orig, *test ; - int items, frames ; - - orig = orig_data.i ; - test = test_data.i ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - wfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - sf_command (wfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) ; - test_writef_int_or_die (wfile, 1, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - test_writef_int_or_die (wfile, 2, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - - rwfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - if (sfinfo.frames != 2 * frames) - { printf ("\n\nLine %d : incorrect number of frames in file (%ld should be %d)\n\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * frames) ; - exit (1) ; - } ; - - test_writef_int_or_die (wfile, 3, orig, frames, __LINE__) ; - - test_readf_int_or_die (rwfile, 1, test, frames, __LINE__) ; - test_readf_int_or_die (rwfile, 2, test, frames, __LINE__) ; - - sf_close (wfile) ; - sf_close (rwfile) ; -} /* new_rdwr_24bit_test */ - - -/*====================================================================================== -*/ - -static void mono_int_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void stereo_int_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void mono_rdwr_int_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void new_rdwr_int_test (const char *filename, int format, int allow_fd) ; -static void multi_seek_test (const char * filename, int format) ; -static void write_seek_extend_test (const char * filename, int format) ; - -static void -pcm_test_int (const char *filename, int format, int long_file_ok) -{ SF_INFO sfinfo ; - int *orig, *test ; - int k, items, allow_fd ; - - /* Sd2 files cannot be opened from an existing file descriptor. */ - allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ; - - print_test_name ("pcm_test_int", filename) ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, (1.0 * 0x7F000000)) ; - - orig = orig_data.i ; - test = test_data.i ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - - /* Some test broken out here. */ - - mono_int_test (filename, format, long_file_ok, allow_fd) ; - - /* Sub format DWVW does not allow seeking. */ - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { unlink (filename) ; - printf ("no seek : ok\n") ; - return ; - } ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - mono_rdwr_int_test (filename, format, long_file_ok, allow_fd) ; - - /* If the format doesn't support stereo we're done. */ - sfinfo.channels = 2 ; - if (sf_format_check (&sfinfo) == 0) - { unlink (filename) ; - puts ("no stereo : ok") ; - return ; - } ; - - stereo_int_test (filename, format, long_file_ok, allow_fd) ; - - /* New read/write test. Not sure if this is needed yet. */ - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - new_rdwr_int_test (filename, format, allow_fd) ; - - delete_file (format, filename) ; - - puts ("ok") ; - return ; -} /* pcm_test_int */ - -static void -mono_int_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int *orig, *test ; - sf_count_t count ; - int k, items ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - orig = orig_data.i ; - test = test_data.i ; - - items = DATA_LENGTH ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_write_int_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - test_write_int_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - - /* Add non-audio data after the audio. */ - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (int)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Mono : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Mono : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_int_or_die (file, 0, test, items, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d: Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - oct_save_int (orig, test, items) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_int_or_die (file, 0, test, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { sf_close (file) ; - unlink (filename) ; - printf ("no seek : ") ; - return ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, items + 10, SEEK_SET, items + 10, sfinfo.channels, __LINE__) ; - - test_read_int_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 6, SEEK_CUR, items + 20, sfinfo.channels, __LINE__) ; - - test_read_int_or_die (file, 0, test + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_read_int_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample D (#%d : 0x%X => 0x%X).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Check read past end of file followed by sf_seek (sndfile, 0, SEEK_CUR). */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - count = 0 ; - while (count < sfinfo.frames) - count += sf_read_int (file, test, 311) ; - - /* Check that no error has occurred. */ - if (sf_error (file)) - { printf ("\n\nLine %d : Mono : error where there shouldn't have been one.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - /* Check that we haven't read beyond EOF. */ - if (count > sfinfo.frames) - { printf ("\n\nLines %d : read past end of file (%ld should be %ld)\n", __LINE__, (long) count, (long) sfinfo.frames) ; - exit (1) ; - } ; - - test_seek_or_die (file, 0, SEEK_CUR, sfinfo.frames, sfinfo.channels, __LINE__) ; - - sf_close (file) ; - - multi_seek_test (filename, format) ; - write_seek_extend_test (filename, format) ; - -} /* mono_int_test */ - -static void -stereo_int_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int *orig, *test ; - int k, items, frames ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, (1.0 * 0x7F000000)) ; - - orig = orig_data.i ; - test = test_data.i ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_writef_int_or_die (file, 0, orig, frames, __LINE__) ; - - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (int)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Stereo : Returned format incorrect (0x%08X => 0x%08X).\n", - __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (sfinfo.channels != 2) - { printf ("\n\nLine %d : Stereo : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_readf_int_or_die (file, 0, test, frames, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_readf_int_or_die (file, 0, test, 2, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - /* Check for errors here. */ - if (sf_error (file)) - { printf ("Line %d: Should NOT return an error.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - if (sf_read_int (file, test, 1) > 0) - { printf ("Line %d: Should return 0.\n", __LINE__) ; - exit (1) ; - } ; - - if (! sf_error (file)) - { printf ("Line %d: Should return an error.\n", __LINE__) ; - exit (1) ; - } ; - /*-----------------------*/ - - test_readf_int_or_die (file, 0, test + 10, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 8, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_readf_int_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 40 ; k < 44 ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_readf_int_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (INT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : 0x%X => 0x%X).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - sf_close (file) ; -} /* stereo_int_test */ - -static void -mono_rdwr_int_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - int *orig, *test ; - int k, pass ; - - orig = orig_data.i ; - test = test_data.i ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - if ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_RAW - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AU - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) - unlink (filename) ; - else - { /* Create a short file. */ - create_short_file (filename) ; - - /* Opening a already existing short file (ie invalid header) RDWR is disallowed. - ** If this returns a valif pointer sf_open() screwed up. - */ - if ((file = sf_open (filename, SFM_RDWR, &sfinfo))) - { printf ("\n\nLine %d: sf_open should (SFM_RDWR) have failed but didn't.\n", __LINE__) ; - exit (1) ; - } ; - - /* Truncate the file to zero bytes. */ - if (truncate (filename, 0) < 0) - { printf ("\n\nLine %d: truncate (%s) failed", __LINE__, filename) ; - perror (NULL) ; - exit (1) ; - } ; - } ; - - /* Opening a zero length file RDWR is allowed, but the SF_INFO struct must contain - ** all the usual data required when opening the file in WRITE mode. - */ - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - /* Do 3 writes followed by reads. After each, check the data and the current - ** read and write offsets. - */ - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - /* Write some data. */ - test_write_int_or_die (file, pass, orig, DATA_LENGTH, __LINE__) ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, pass * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_int_or_die (file, 0, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) A : Error at sample %d (0x%X => 0x%X).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_int (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - test_read_write_position_or_die (file, __LINE__, pass, pass * DATA_LENGTH, pass * DATA_LENGTH) ; - } ; /* for (pass ...) */ - - sf_close (file) ; - - /* Open the file again to check the data. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Not enough frames in file. (%ld < %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } - - if (! long_file_ok && sfinfo.frames != 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Incorrect number of frames in file. (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - if (! long_file_ok) - test_read_write_position_or_die (file, __LINE__, 0, 0, 3 * DATA_LENGTH) ; - else - test_seek_or_die (file, 3 * DATA_LENGTH, SFM_WRITE | SEEK_SET, 3 * DATA_LENGTH, sfinfo.channels, __LINE__) ; - - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, 3 * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_int_or_die (file, pass, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (INT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) B : Error at sample %d (0x%X => 0x%X).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_int (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - } ; /* for (pass ...) */ - - sf_close (file) ; -} /* mono_rdwr_int_test */ - -static void -new_rdwr_int_test (const char *filename, int format, int allow_fd) -{ SNDFILE *wfile, *rwfile ; - SF_INFO sfinfo ; - int *orig, *test ; - int items, frames ; - - orig = orig_data.i ; - test = test_data.i ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - wfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - sf_command (wfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) ; - test_writef_int_or_die (wfile, 1, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - test_writef_int_or_die (wfile, 2, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - - rwfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - if (sfinfo.frames != 2 * frames) - { printf ("\n\nLine %d : incorrect number of frames in file (%ld should be %d)\n\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * frames) ; - exit (1) ; - } ; - - test_writef_int_or_die (wfile, 3, orig, frames, __LINE__) ; - - test_readf_int_or_die (rwfile, 1, test, frames, __LINE__) ; - test_readf_int_or_die (rwfile, 2, test, frames, __LINE__) ; - - sf_close (wfile) ; - sf_close (rwfile) ; -} /* new_rdwr_int_test */ - - -/*====================================================================================== -*/ - -static void mono_float_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void stereo_float_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void mono_rdwr_float_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void new_rdwr_float_test (const char *filename, int format, int allow_fd) ; -static void multi_seek_test (const char * filename, int format) ; -static void write_seek_extend_test (const char * filename, int format) ; - -static void -pcm_test_float (const char *filename, int format, int long_file_ok) -{ SF_INFO sfinfo ; - float *orig, *test ; - int k, items, allow_fd ; - - /* Sd2 files cannot be opened from an existing file descriptor. */ - allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ; - - print_test_name ("pcm_test_float", filename) ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 1.0) ; - - orig = orig_data.f ; - test = test_data.f ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - - /* Some test broken out here. */ - - mono_float_test (filename, format, long_file_ok, allow_fd) ; - - /* Sub format DWVW does not allow seeking. */ - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { unlink (filename) ; - printf ("no seek : ok\n") ; - return ; - } ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - mono_rdwr_float_test (filename, format, long_file_ok, allow_fd) ; - - /* If the format doesn't support stereo we're done. */ - sfinfo.channels = 2 ; - if (sf_format_check (&sfinfo) == 0) - { unlink (filename) ; - puts ("no stereo : ok") ; - return ; - } ; - - stereo_float_test (filename, format, long_file_ok, allow_fd) ; - - /* New read/write test. Not sure if this is needed yet. */ - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - new_rdwr_float_test (filename, format, allow_fd) ; - - delete_file (format, filename) ; - - puts ("ok") ; - return ; -} /* pcm_test_float */ - -static void -mono_float_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - float *orig, *test ; - sf_count_t count ; - int k, items ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - orig = orig_data.f ; - test = test_data.f ; - - items = DATA_LENGTH ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_write_float_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - test_write_float_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - - /* Add non-audio data after the audio. */ - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (float)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Mono : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Mono : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_float_or_die (file, 0, test, items, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d: Mono : Incorrect sample A (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - oct_save_float (orig, test, items) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_float_or_die (file, 0, test, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { sf_close (file) ; - unlink (filename) ; - printf ("no seek : ") ; - return ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, items + 10, SEEK_SET, items + 10, sfinfo.channels, __LINE__) ; - - test_read_float_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : %g => %g).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 6, SEEK_CUR, items + 20, sfinfo.channels, __LINE__) ; - - test_read_float_or_die (file, 0, test + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : %g => %g).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_read_float_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample D (#%d : %g => %g).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Check read past end of file followed by sf_seek (sndfile, 0, SEEK_CUR). */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - count = 0 ; - while (count < sfinfo.frames) - count += sf_read_float (file, test, 311) ; - - /* Check that no error has occurred. */ - if (sf_error (file)) - { printf ("\n\nLine %d : Mono : error where there shouldn't have been one.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - /* Check that we haven't read beyond EOF. */ - if (count > sfinfo.frames) - { printf ("\n\nLines %d : read past end of file (%ld should be %ld)\n", __LINE__, (long) count, (long) sfinfo.frames) ; - exit (1) ; - } ; - - test_seek_or_die (file, 0, SEEK_CUR, sfinfo.frames, sfinfo.channels, __LINE__) ; - - sf_close (file) ; - - multi_seek_test (filename, format) ; - write_seek_extend_test (filename, format) ; - -} /* mono_float_test */ - -static void -stereo_float_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - float *orig, *test ; - int k, items, frames ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 1.0) ; - - orig = orig_data.f ; - test = test_data.f ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_writef_float_or_die (file, 0, orig, frames, __LINE__) ; - - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (float)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Stereo : Returned format incorrect (0x%08X => 0x%08X).\n", - __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (sfinfo.channels != 2) - { printf ("\n\nLine %d : Stereo : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_readf_float_or_die (file, 0, test, frames, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_readf_float_or_die (file, 0, test, 2, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - /* Check for errors here. */ - if (sf_error (file)) - { printf ("Line %d: Should NOT return an error.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - if (sf_read_float (file, test, 1) > 0) - { printf ("Line %d: Should return 0.\n", __LINE__) ; - exit (1) ; - } ; - - if (! sf_error (file)) - { printf ("Line %d: Should return an error.\n", __LINE__) ; - exit (1) ; - } ; - /*-----------------------*/ - - test_readf_float_or_die (file, 0, test + 10, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 8, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_readf_float_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 40 ; k < 44 ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_readf_float_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - sf_close (file) ; -} /* stereo_float_test */ - -static void -mono_rdwr_float_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - float *orig, *test ; - int k, pass ; - - orig = orig_data.f ; - test = test_data.f ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - if ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_RAW - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AU - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) - unlink (filename) ; - else - { /* Create a short file. */ - create_short_file (filename) ; - - /* Opening a already existing short file (ie invalid header) RDWR is disallowed. - ** If this returns a valif pointer sf_open() screwed up. - */ - if ((file = sf_open (filename, SFM_RDWR, &sfinfo))) - { printf ("\n\nLine %d: sf_open should (SFM_RDWR) have failed but didn't.\n", __LINE__) ; - exit (1) ; - } ; - - /* Truncate the file to zero bytes. */ - if (truncate (filename, 0) < 0) - { printf ("\n\nLine %d: truncate (%s) failed", __LINE__, filename) ; - perror (NULL) ; - exit (1) ; - } ; - } ; - - /* Opening a zero length file RDWR is allowed, but the SF_INFO struct must contain - ** all the usual data required when opening the file in WRITE mode. - */ - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - /* Do 3 writes followed by reads. After each, check the data and the current - ** read and write offsets. - */ - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - /* Write some data. */ - test_write_float_or_die (file, pass, orig, DATA_LENGTH, __LINE__) ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, pass * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_float_or_die (file, 0, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) A : Error at sample %d (%g => %g).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_float (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - test_read_write_position_or_die (file, __LINE__, pass, pass * DATA_LENGTH, pass * DATA_LENGTH) ; - } ; /* for (pass ...) */ - - sf_close (file) ; - - /* Open the file again to check the data. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Not enough frames in file. (%ld < %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } - - if (! long_file_ok && sfinfo.frames != 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Incorrect number of frames in file. (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - if (! long_file_ok) - test_read_write_position_or_die (file, __LINE__, 0, 0, 3 * DATA_LENGTH) ; - else - test_seek_or_die (file, 3 * DATA_LENGTH, SFM_WRITE | SEEK_SET, 3 * DATA_LENGTH, sfinfo.channels, __LINE__) ; - - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, 3 * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_float_or_die (file, pass, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) B : Error at sample %d (%g => %g).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_float (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - } ; /* for (pass ...) */ - - sf_close (file) ; -} /* mono_rdwr_float_test */ - -static void -new_rdwr_float_test (const char *filename, int format, int allow_fd) -{ SNDFILE *wfile, *rwfile ; - SF_INFO sfinfo ; - float *orig, *test ; - int items, frames ; - - orig = orig_data.f ; - test = test_data.f ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - wfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - sf_command (wfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) ; - test_writef_float_or_die (wfile, 1, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - test_writef_float_or_die (wfile, 2, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - - rwfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - if (sfinfo.frames != 2 * frames) - { printf ("\n\nLine %d : incorrect number of frames in file (%ld should be %d)\n\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * frames) ; - exit (1) ; - } ; - - test_writef_float_or_die (wfile, 3, orig, frames, __LINE__) ; - - test_readf_float_or_die (rwfile, 1, test, frames, __LINE__) ; - test_readf_float_or_die (rwfile, 2, test, frames, __LINE__) ; - - sf_close (wfile) ; - sf_close (rwfile) ; -} /* new_rdwr_float_test */ - - -/*====================================================================================== -*/ - -static void mono_double_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void stereo_double_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void mono_rdwr_double_test (const char *filename, int format, int long_file_ok, int allow_fd) ; -static void new_rdwr_double_test (const char *filename, int format, int allow_fd) ; -static void multi_seek_test (const char * filename, int format) ; -static void write_seek_extend_test (const char * filename, int format) ; - -static void -pcm_test_double (const char *filename, int format, int long_file_ok) -{ SF_INFO sfinfo ; - double *orig, *test ; - int k, items, allow_fd ; - - /* Sd2 files cannot be opened from an existing file descriptor. */ - allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ; - - print_test_name ("pcm_test_double", filename) ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 1.0) ; - - orig = orig_data.d ; - test = test_data.d ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - - /* Some test broken out here. */ - - mono_double_test (filename, format, long_file_ok, allow_fd) ; - - /* Sub format DWVW does not allow seeking. */ - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { unlink (filename) ; - printf ("no seek : ok\n") ; - return ; - } ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - mono_rdwr_double_test (filename, format, long_file_ok, allow_fd) ; - - /* If the format doesn't support stereo we're done. */ - sfinfo.channels = 2 ; - if (sf_format_check (&sfinfo) == 0) - { unlink (filename) ; - puts ("no stereo : ok") ; - return ; - } ; - - stereo_double_test (filename, format, long_file_ok, allow_fd) ; - - /* New read/write test. Not sure if this is needed yet. */ - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) - new_rdwr_double_test (filename, format, allow_fd) ; - - delete_file (format, filename) ; - - puts ("ok") ; - return ; -} /* pcm_test_double */ - -static void -mono_double_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - double *orig, *test ; - sf_count_t count ; - int k, items ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 1 ; - sfinfo.format = format ; - - orig = orig_data.d ; - test = test_data.d ; - - items = DATA_LENGTH ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_write_double_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - test_write_double_or_die (file, 0, orig, items, __LINE__) ; - sf_write_sync (file) ; - - /* Add non-audio data after the audio. */ - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (double)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Mono : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Mono : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_read_double_or_die (file, 0, test, items, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d: Mono : Incorrect sample A (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - oct_save_double (orig, test, items) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, test, 4, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || - (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) - { sf_close (file) ; - unlink (filename) ; - printf ("no seek : ") ; - return ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, items + 10, SEEK_SET, items + 10, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : %g => %g).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 6, SEEK_CUR, items + 20, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, test + 20, 4, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : %g => %g).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_read_double_or_die (file, 0, test + 10, 4, __LINE__) ; - for (k = 10 ; k < 14 ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d : Mono : Incorrect sample D (#%d : %g => %g).\n", __LINE__, k, test [k], orig [k]) ; - exit (1) ; - } ; - - /* Check read past end of file followed by sf_seek (sndfile, 0, SEEK_CUR). */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - count = 0 ; - while (count < sfinfo.frames) - count += sf_read_double (file, test, 311) ; - - /* Check that no error has occurred. */ - if (sf_error (file)) - { printf ("\n\nLine %d : Mono : error where there shouldn't have been one.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - /* Check that we haven't read beyond EOF. */ - if (count > sfinfo.frames) - { printf ("\n\nLines %d : read past end of file (%ld should be %ld)\n", __LINE__, (long) count, (long) sfinfo.frames) ; - exit (1) ; - } ; - - test_seek_or_die (file, 0, SEEK_CUR, sfinfo.frames, sfinfo.channels, __LINE__) ; - - sf_close (file) ; - - multi_seek_test (filename, format) ; - write_seek_extend_test (filename, format) ; - -} /* mono_double_test */ - -static void -stereo_double_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - double *orig, *test ; - int k, items, frames ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 1.0) ; - - orig = orig_data.d ; - test = test_data.d ; - - /* Make this a macro so gdb steps over it in one go. */ - CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - - sf_set_string (file, SF_STR_ARTIST, "Your name here") ; - - test_writef_double_or_die (file, 0, orig, frames, __LINE__) ; - - sf_set_string (file, SF_STR_COPYRIGHT, "Copyright (c) 2003") ; - - sf_close (file) ; - - memset (test, 0, items * sizeof (double)) ; - - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_RAW) - memset (&sfinfo, 0, sizeof (sfinfo)) ; - - file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Stereo : Returned format incorrect (0x%08X => 0x%08X).\n", - __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (! long_file_ok && sfinfo.frames > frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; - exit (1) ; - } ; - - if (sfinfo.channels != 2) - { printf ("\n\nLine %d : Stereo : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - check_log_buffer_or_die (file, __LINE__) ; - - test_readf_double_or_die (file, 0, test, frames, __LINE__) ; - for (k = 0 ; k < items ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to start of file. */ - test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, test, 2, __LINE__) ; - for (k = 0 ; k < 4 ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from start of file. */ - test_seek_or_die (file, 10, SEEK_SET, 10, sfinfo.channels, __LINE__) ; - - /* Check for errors here. */ - if (sf_error (file)) - { printf ("Line %d: Should NOT return an error.\n", __LINE__) ; - puts (sf_strerror (file)) ; - exit (1) ; - } ; - - if (sf_read_double (file, test, 1) > 0) - { printf ("Line %d: Should return 0.\n", __LINE__) ; - exit (1) ; - } ; - - if (! sf_error (file)) - { printf ("Line %d: Should return an error.\n", __LINE__) ; - exit (1) ; - } ; - /*-----------------------*/ - - test_readf_double_or_die (file, 0, test + 10, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from current position. */ - test_seek_or_die (file, 8, SEEK_CUR, 20, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 40 ; k < 44 ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - /* Seek to offset from end of file. */ - test_seek_or_die (file, -1 * (sfinfo.frames - 10), SEEK_END, 10, sfinfo.channels, __LINE__) ; - - test_readf_double_or_die (file, 0, test + 20, 2, __LINE__) ; - for (k = 20 ; k < 24 ; k++) - if (FLOAT_ERROR (test [k], orig [k])) - { printf ("\n\nLine %d : Stereo : Incorrect sample (#%d : %g => %g).\n", __LINE__, k, orig [k], test [k]) ; - exit (1) ; - } ; - - sf_close (file) ; -} /* stereo_double_test */ - -static void -mono_rdwr_double_test (const char *filename, int format, int long_file_ok, int allow_fd) -{ SNDFILE *file ; - SF_INFO sfinfo ; - double *orig, *test ; - int k, pass ; - - orig = orig_data.d ; - test = test_data.d ; - - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - if ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_RAW - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AU - || (format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) - unlink (filename) ; - else - { /* Create a short file. */ - create_short_file (filename) ; - - /* Opening a already existing short file (ie invalid header) RDWR is disallowed. - ** If this returns a valif pointer sf_open() screwed up. - */ - if ((file = sf_open (filename, SFM_RDWR, &sfinfo))) - { printf ("\n\nLine %d: sf_open should (SFM_RDWR) have failed but didn't.\n", __LINE__) ; - exit (1) ; - } ; - - /* Truncate the file to zero bytes. */ - if (truncate (filename, 0) < 0) - { printf ("\n\nLine %d: truncate (%s) failed", __LINE__, filename) ; - perror (NULL) ; - exit (1) ; - } ; - } ; - - /* Opening a zero length file RDWR is allowed, but the SF_INFO struct must contain - ** all the usual data required when opening the file in WRITE mode. - */ - sfinfo.samplerate = SAMPLE_RATE ; - sfinfo.frames = DATA_LENGTH ; - sfinfo.channels = 1 ; - sfinfo.format = format ; - - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - /* Do 3 writes followed by reads. After each, check the data and the current - ** read and write offsets. - */ - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - /* Write some data. */ - test_write_double_or_die (file, pass, orig, DATA_LENGTH, __LINE__) ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, pass * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_double_or_die (file, 0, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) A : Error at sample %d (%g => %g).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_double (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - test_read_write_position_or_die (file, __LINE__, pass, pass * DATA_LENGTH, pass * DATA_LENGTH) ; - } ; /* for (pass ...) */ - - sf_close (file) ; - - /* Open the file again to check the data. */ - file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - - if (sfinfo.format != format) - { printf ("\n\nLine %d : Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, format, sfinfo.format) ; - exit (1) ; - } ; - - if (sfinfo.frames < 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Not enough frames in file. (%ld < %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } - - if (! long_file_ok && sfinfo.frames != 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Incorrect number of frames in file. (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; - exit (1) ; - } ; - - if (sfinfo.channels != 1) - { printf ("\n\nLine %d : Incorrect number of channels in file.\n", __LINE__) ; - exit (1) ; - } ; - - if (! long_file_ok) - test_read_write_position_or_die (file, __LINE__, 0, 0, 3 * DATA_LENGTH) ; - else - test_seek_or_die (file, 3 * DATA_LENGTH, SFM_WRITE | SEEK_SET, 3 * DATA_LENGTH, sfinfo.channels, __LINE__) ; - - for (pass = 1 ; pass <= 3 ; pass ++) - { orig [20] = pass * 2 ; - - test_read_write_position_or_die (file, __LINE__, pass, (pass - 1) * DATA_LENGTH, 3 * DATA_LENGTH) ; - - /* Read what we just wrote. */ - test_read_double_or_die (file, pass, test, DATA_LENGTH, __LINE__) ; - - /* Check the data. */ - for (k = 0 ; k < DATA_LENGTH ; k++) - if (FLOAT_ERROR (orig [k], test [k])) - { printf ("\n\nLine %d (pass %d) B : Error at sample %d (%g => %g).\n", __LINE__, pass, k, orig [k], test [k]) ; - oct_save_double (orig, test, DATA_LENGTH) ; - exit (1) ; - } ; - - } ; /* for (pass ...) */ - - sf_close (file) ; -} /* mono_rdwr_double_test */ - -static void -new_rdwr_double_test (const char *filename, int format, int allow_fd) -{ SNDFILE *wfile, *rwfile ; - SF_INFO sfinfo ; - double *orig, *test ; - int items, frames ; - - orig = orig_data.d ; - test = test_data.d ; - - sfinfo.samplerate = 44100 ; - sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ - sfinfo.channels = 2 ; - sfinfo.format = format ; - - items = DATA_LENGTH ; - frames = items / sfinfo.channels ; - - wfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; - sf_command (wfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) ; - test_writef_double_or_die (wfile, 1, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - test_writef_double_or_die (wfile, 2, orig, frames, __LINE__) ; - sf_write_sync (wfile) ; - - rwfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; - if (sfinfo.frames != 2 * frames) - { printf ("\n\nLine %d : incorrect number of frames in file (%ld should be %d)\n\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * frames) ; - exit (1) ; - } ; - - test_writef_double_or_die (wfile, 3, orig, frames, __LINE__) ; - - test_readf_double_or_die (rwfile, 1, test, frames, __LINE__) ; - test_readf_double_or_die (rwfile, 2, test, frames, __LINE__) ; - - sf_close (wfile) ; - sf_close (rwfile) ; -} /* new_rdwr_double_test */ - - - -/*---------------------------------------------------------------------------------------- -*/ - -static void -empty_file_test (const char *filename, int format) -{ SNDFILE *file ; - SF_INFO info ; - int allow_fd ; - - /* Sd2 files cannot be opened from an existing file descriptor. */ - allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ; - - print_test_name ("empty_file_test", filename) ; - - unlink (filename) ; - - info.samplerate = 48000 ; - info.channels = 2 ; - info.format = format ; - - if (sf_format_check (&info) == SF_FALSE) - { info.channels = 1 ; - if (sf_format_check (&info) == SF_FALSE) - { puts ("invalid file format") ; - return ; - } ; - } ; - - /* Create an empty file. */ - file = test_open_file_or_die (filename, SFM_WRITE, &info, allow_fd, __LINE__) ; - sf_close (file) ; - - /* Open for read and check the length. */ - file = test_open_file_or_die (filename, SFM_READ, &info, allow_fd, __LINE__) ; - - if (SF_COUNT_TO_LONG (info.frames) != 0) - { printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Open for read/write and check the length. */ - file = test_open_file_or_die (filename, SFM_RDWR, &info, allow_fd, __LINE__) ; - - if (SF_COUNT_TO_LONG (info.frames) != 0) - { printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ; - exit (1) ; - } ; - - sf_close (file) ; - - /* Open for read and check the length. */ - file = test_open_file_or_die (filename, SFM_READ, &info, allow_fd, __LINE__) ; - - if (SF_COUNT_TO_LONG (info.frames) != 0) - { printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ; - exit (1) ; - } ; - - sf_close (file) ; - - check_open_file_count_or_die (__LINE__) ; - - unlink (filename) ; - puts ("ok") ; - - return ; -} /* empty_file_test */ - - -/*---------------------------------------------------------------------------------------- -*/ - -static void -create_short_file (const char *filename) -{ FILE *file ; - - if (! (file = fopen (filename, "w"))) - { printf ("create_short_file : fopen (%s, \"w\") failed.", filename) ; - fflush (stdout) ; - perror (NULL) ; - exit (1) ; - } ; - - fprintf (file, "This is the file data.\n") ; - - fclose (file) ; -} /* create_short_file */ - -#if (defined (WIN32) || defined (__WIN32)) - -/* Win32 does not have truncate (nor does it have the POSIX function ftruncate). -** Hack somethng up here to over come this. This function can only truncate to a -** length of zero. -*/ - -static int -truncate (const char *filename, int ignored) -{ int fd ; - - ignored = 0 ; - - if ((fd = open (filename, O_RDWR | O_TRUNC | O_BINARY)) < 0) - return 0 ; - - close (fd) ; - - return 0 ; -} /* truncate */ - -#endif - -static void -multi_seek_test (const char * filename, int format) -{ SNDFILE * file ; - SF_INFO info ; - sf_count_t pos ; - int k ; - - /* This test doesn't work on the following. */ - switch (format & SF_FORMAT_TYPEMASK) - { case SF_FORMAT_RAW : - return ; - - default : - break ; - } ; - - memset (&info, 0, sizeof (info)) ; - - generate_file (filename, format, 88200) ; - - file = test_open_file_or_die (filename, SFM_READ, &info, SF_FALSE, __LINE__) ; - - for (k = 0 ; k < 10 ; k++) - { pos = info.frames / (k + 2) ; - test_seek_or_die (file, pos, SEEK_SET, pos, info.channels, __LINE__) ; - } ; - - sf_close (file) ; -} /* multi_seek_test */ - -static void -write_seek_extend_test (const char * filename, int format) -{ SNDFILE * file ; - SF_INFO info ; - short *orig, *test ; - unsigned items, k ; - - /* This test doesn't work on the following. */ - switch (format & SF_FORMAT_TYPEMASK) - { case SF_FORMAT_FLAC : - case SF_FORMAT_HTK : - case SF_FORMAT_PAF : - case SF_FORMAT_SDS : - case SF_FORMAT_SVX : - return ; - - default : - break ; - } ; - - memset (&info, 0, sizeof (info)) ; - - info.samplerate = 48000 ; - info.channels = 1 ; - info.format = format ; - - items = 512 ; - exit_if_true (items > ARRAY_LEN (orig_data.s), "Line %d : Bad assumption.\n", __LINE__) ; - - orig = orig_data.s ; - test = test_data.s ; - - for (k = 0 ; k < ARRAY_LEN (orig_data.s) ; k++) - orig [k] = 0x3fff ; - - file = test_open_file_or_die (filename, SFM_WRITE, &info, SF_FALSE, __LINE__) ; - test_write_short_or_die (file, 0, orig, items, __LINE__) ; - - /* Extend the file using a seek. */ - test_seek_or_die (file, 2 * items, SEEK_SET, 2 * items, info.channels, __LINE__) ; - - test_writef_short_or_die (file, 0, orig, items, __LINE__) ; - sf_close (file) ; - - file = test_open_file_or_die (filename, SFM_READ, &info, SF_FALSE, __LINE__) ; - test_read_short_or_die (file, 0, test, 3 * items, __LINE__) ; - sf_close (file) ; - - /* Can't do these formats due to scaling. */ - switch (format & SF_FORMAT_SUBMASK) - { case SF_FORMAT_PCM_S8 : - case SF_FORMAT_PCM_U8 : - return ; - default : - break ; - } ; - - for (k = 0 ; k < items ; k++) - { exit_if_true (test [k] != 0x3fff, "Line %d : test [%d] == %d, should be 0x3fff.\n", __LINE__, k, test [k]) ; - exit_if_true (test [items + k] != 0, "Line %d : test [%d] == %d, should be 0.\n", __LINE__, items + k, test [items + k]) ; - exit_if_true (test [2 * items + k] != 0x3fff, "Line %d : test [%d] == %d, should be 0x3fff.\n", __LINE__, 2 * items + k, test [2 * items + k]) ; - } ; - - return ; -} /* write_seek_extend_test */ - - diff --git a/lib-src/libsndfile/tests/write_read_test.def b/lib-src/libsndfile/tests/write_read_test.def index cfc7ce58d..3316aec57 100644 --- a/lib-src/libsndfile/tests/write_read_test.def +++ b/lib-src/libsndfile/tests/write_read_test.def @@ -1,6 +1,6 @@ autogen definitions write_read_test.tpl; -data_type = { +data_type = { type_name = char ; data_type = short ; data_field = s ; @@ -10,7 +10,7 @@ data_type = { max_error = "255" ; } ; -data_type = { +data_type = { type_name = short ; data_type = short ; data_field = s ; @@ -20,7 +20,17 @@ data_type = { max_error = "0" ; } ; -data_type = { +data_type = { + type_name = "20bit" ; + data_type = int ; + data_field = i ; + error_func = BIT_20_ERROR ; + format_char = "0x%X" ; + max_val = "(1.0 * 0x7F00000)" ; + max_error = "4096" ; + } ; + +data_type = { type_name = "24bit" ; data_type = int ; data_field = i ; @@ -30,7 +40,7 @@ data_type = { max_error = "256" ; } ; -data_type = { +data_type = { type_name = int ; data_type = int ; data_field = i ; @@ -42,7 +52,7 @@ data_type = { /* Lite remove start */ -data_type = { +data_type = { type_name = float ; data_type = float ; data_field = f ; @@ -52,7 +62,7 @@ data_type = { max_error = "0" ; } ; -data_type = { +data_type = { type_name = double ; data_type = double ; data_field = d ; diff --git a/lib-src/libsndfile/tests/write_read_test.tpl b/lib-src/libsndfile/tests/write_read_test.tpl index b4daa55d1..af87e12a0 100644 --- a/lib-src/libsndfile/tests/write_read_test.tpl +++ b/lib-src/libsndfile/tests/write_read_test.tpl @@ -1,6 +1,6 @@ [+ AutoGen5 template c +] /* -** Copyright (C) 1999-2011 Erik de Castro Lopo +** Copyright (C) 1999-2017 Erik de Castro Lopo ** ** 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 @@ -22,30 +22,28 @@ #include #include #include +#include +#include + #if HAVE_UNISTD_H #include +#else +#include "sf_unistd.h" #endif -#include +#include -#if (defined (WIN32) || defined (_WIN32)) -#include -static int truncate (const char *filename, int ignored) ; -#endif - -#include - -#include "utils.h" -#include "generate.h" +#include "utils.h" +#include "generate.h" #define SAMPLE_RATE 11025 -#define DATA_LENGTH (1<<12) +#define DATA_LENGTH (1 << 12) #define SILLY_WRITE_COUNT (234) [+ FOR data_type -+]static void pcm_test_[+ (get "type_name") +] (const char *str, int format, int long_file_okz) ; ++]static void pcm_test_[+ (get "type_name") +] (const char *str, int format, int long_file_ok) ; [+ ENDFOR data_type +] static void empty_file_test (const char *filename, int format) ; @@ -191,6 +189,12 @@ main (int argc, char **argv) /* Lite remove start */ pcm_test_float ("float_le.caf" , SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_FLOAT , SF_FALSE) ; pcm_test_double ("double_le.caf", SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_DOUBLE, SF_FALSE) ; + + pcm_test_short ("alac16.caf" , SF_FORMAT_CAF | SF_FORMAT_ALAC_16, SF_FALSE) ; + pcm_test_20bit ("alac20.caf" , SF_FORMAT_CAF | SF_FORMAT_ALAC_20, SF_FALSE) ; + pcm_test_24bit ("alac24.caf" , SF_FORMAT_CAF | SF_FORMAT_ALAC_24, SF_FALSE) ; + pcm_test_int ("alac32.caf" , SF_FORMAT_CAF | SF_FORMAT_ALAC_32, SF_FALSE) ; + /* Lite remove end */ test_count++ ; } ; @@ -359,11 +363,12 @@ main (int argc, char **argv) { pcm_test_char ("char.sd2" , SF_FORMAT_SD2 | SF_FORMAT_PCM_S8, SF_TRUE) ; pcm_test_short ("short.sd2" , SF_FORMAT_SD2 | SF_FORMAT_PCM_16, SF_TRUE) ; pcm_test_24bit ("24bit.sd2" , SF_FORMAT_SD2 | SF_FORMAT_PCM_24, SF_TRUE) ; + pcm_test_int ("32bit.sd2" , SF_FORMAT_SD2 | SF_FORMAT_PCM_32, SF_TRUE) ; test_count++ ; } ; if (do_all || ! strcmp (argv [1], "flac")) - { if (HAVE_EXTERNAL_LIBS) + { if (HAVE_EXTERNAL_XIPH_LIBS) { pcm_test_char ("char.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, SF_TRUE) ; pcm_test_short ("short.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_16, SF_TRUE) ; pcm_test_24bit ("24bit.flac" , SF_FORMAT_FLAC | SF_FORMAT_PCM_24, SF_TRUE) ; @@ -409,12 +414,13 @@ main (int argc, char **argv) static void create_short_file (const char *filename) ; -#define CHAR_ERROR(x,y) (abs ((x) - (y)) > 255) -#define INT_ERROR(x,y) (((x) - (y)) != 0) -#define TRIBYTE_ERROR(x,y) (abs ((x) - (y)) > 255) -#define FLOAT_ERROR(x,y) (fabs ((x) - (y)) > 1e-5) +#define CHAR_ERROR(x, y) (abs ((x) - (y)) > 255) +#define INT_ERROR(x, y) (((x) - (y)) != 0) +#define BIT_20_ERROR(x, y) (abs ((x) - (y)) > 4095) +#define TRIBYTE_ERROR(x, y) (abs ((x) - (y)) > 255) +#define FLOAT_ERROR(x, y) (fabs ((x) - (y)) > 1e-5) -#define CONVERT_DATA(k,len,new,orig) \ +#define CONVERT_DATA(k, len, new, orig) \ { for ((k) = 0 ; (k) < (len) ; (k) ++) \ (new) [k] = (orig) [k] ; \ } @@ -434,8 +440,8 @@ static void write_seek_extend_test (const char * filename, int format) ; static void pcm_test_[+ (get "type_name") +] (const char *filename, int format, int long_file_ok) { SF_INFO sfinfo ; - [+ (get "data_type") +] *orig, *test ; - int k, items, allow_fd ; + [+ (get "data_type") +] *orig ; + int k, allow_fd ; /* Sd2 files cannot be opened from an existing file descriptor. */ allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ; @@ -447,16 +453,15 @@ pcm_test_[+ (get "type_name") +] (const char *filename, int format, int long_fil sfinfo.channels = 1 ; sfinfo.format = format ; + test_sf_format_or_die (&sfinfo, __LINE__) ; + gen_windowed_sine_double (orig_data.d, DATA_LENGTH, [+ (get "max_val") +]) ; orig = orig_data.[+ (get "data_field") +] ; - test = test_data.[+ (get "data_field") +] ; /* Make this a macro so gdb steps over it in one go. */ CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ; - items = DATA_LENGTH ; - /* Some test broken out here. */ mono_[+ (get "type_name") +]_test (filename, format, long_file_ok, allow_fd) ; @@ -469,7 +474,12 @@ pcm_test_[+ (get "type_name") +] (const char *filename, int format, int long_fil return ; } ; - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) + if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC + && (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_16 + && (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_20 + && (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_24 + && (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_32 + ) mono_rdwr_[+ (get "type_name") +]_test (filename, format, long_file_ok, allow_fd) ; /* If the format doesn't support stereo we're done. */ @@ -484,9 +494,14 @@ pcm_test_[+ (get "type_name") +] (const char *filename, int format, int long_fil /* New read/write test. Not sure if this is needed yet. */ - if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC && - (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC) + if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF + && (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC + && (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC + && (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_16 + && (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_20 + && (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_24 + && (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_32 + ) new_rdwr_[+ (get "type_name") +]_test (filename, format, allow_fd) ; delete_file (format, filename) ; @@ -501,7 +516,7 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi SF_INFO sfinfo ; [+ (get "data_type") +] *orig, *test ; sf_count_t count ; - int k, items ; + int k, items, total ; sfinfo.samplerate = 44100 ; sfinfo.frames = SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */ @@ -515,6 +530,11 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ; + if (sfinfo.frames || sfinfo.sections || sfinfo.seekable) + { printf ("\n\nLine %d : Weird SF_INFO fields.\n", __LINE__) ; + exit (1) ; + } ; + sf_set_string (file, SF_STR_ARTIST, "Your name here") ; test_write_[+ (get "data_type") +]_or_die (file, 0, orig, items, __LINE__) ; @@ -540,12 +560,12 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi } ; if (sfinfo.frames < 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; + { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, items) ; exit (1) ; } ; if (! long_file_ok && sfinfo.frames > 2 * items) - { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ; + { printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, items) ; exit (1) ; } ; @@ -554,6 +574,11 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi exit (1) ; } ; + if (sfinfo.seekable != 1) + { printf ("\n\nLine %d : File should be seekable.\n", __LINE__) ; + exit (1) ; + } ; + check_log_buffer_or_die (file, __LINE__) ; test_read_[+ (get "data_type") +]_or_die (file, 0, test, items, __LINE__) ; @@ -564,6 +589,23 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi exit (1) ; } ; + /* Test multiple short reads. */ + test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; + + total = 0 ; + for (k = 1 ; k <= 32 ; k++) + { int ik ; + + test_read_[+ (get "data_type") +]_or_die (file, 0, test + total, k, __LINE__) ; + total += k ; + + for (ik = 0 ; ik < total ; ik++) + if ([+ (get "error_func") +] (orig [ik], test [ik])) + { printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : [+ (get "format_char") +] => [+ (get "format_char") +]).\n", __LINE__, ik, orig [ik], test [ik]) ; + exit (1) ; + } ; + } ; + /* Seek to start of file. */ test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ; @@ -574,6 +616,7 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi exit (1) ; } ; + /* For some codecs we can't go past here. */ if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 || (format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24) { sf_close (file) ; @@ -628,7 +671,7 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi /* Check that we haven't read beyond EOF. */ if (count > sfinfo.frames) - { printf ("\n\nLines %d : read past end of file (%ld should be %ld)\n", __LINE__, (long) count, (long) sfinfo.frames) ; + { printf ("\n\nLines %d : read past end of file (%" PRId64 " should be %" PRId64 ")\n", __LINE__, count, sfinfo.frames) ; exit (1) ; } ; @@ -688,14 +731,14 @@ stereo_[+ (get "type_name") +]_test (const char *filename, int format, int long_ } ; if (sfinfo.frames < frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; + { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", + __LINE__, sfinfo.frames, frames) ; exit (1) ; } ; if (! long_file_ok && sfinfo.frames > frames) - { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%ld should be %d)\n", - __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ; + { printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%" PRId64 " should be %d)\n", + __LINE__, sfinfo.frames, frames) ; exit (1) ; } ; @@ -781,6 +824,18 @@ mono_rdwr_[+ (get "type_name") +]_test (const char *filename, int format, int lo [+ (get "data_type") +] *orig, *test ; int k, pass ; + switch (format & SF_FORMAT_SUBMASK) + { case SF_FORMAT_ALAC_16 : + case SF_FORMAT_ALAC_20 : + case SF_FORMAT_ALAC_24 : + case SF_FORMAT_ALAC_32 : + allow_fd = 0 ; + break ; + + default : + break ; + } ; + orig = orig_data.[+ (get "data_field") +] ; test = test_data.[+ (get "data_field") +] ; @@ -806,8 +861,8 @@ mono_rdwr_[+ (get "type_name") +]_test (const char *filename, int format, int lo } ; /* Truncate the file to zero bytes. */ - if (truncate (filename, 0) < 0) - { printf ("\n\nLine %d: truncate (%s) failed", __LINE__, filename) ; + if (truncate_file_to_zero (filename) < 0) + { printf ("\n\nLine %d: truncate_file_to_zero (%s) failed", __LINE__, filename) ; perror (NULL) ; exit (1) ; } ; @@ -859,12 +914,12 @@ mono_rdwr_[+ (get "type_name") +]_test (const char *filename, int format, int lo } ; if (sfinfo.frames < 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Not enough frames in file. (%ld < %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; + { printf ("\n\nLine %d : Not enough frames in file. (%" PRId64 " < %d)\n", __LINE__, sfinfo.frames, 3 * DATA_LENGTH) ; exit (1) ; } if (! long_file_ok && sfinfo.frames != 3 * DATA_LENGTH) - { printf ("\n\nLine %d : Incorrect number of frames in file. (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ; + { printf ("\n\nLine %d : Incorrect number of frames in file. (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, 3 * DATA_LENGTH) ; exit (1) ; } ; @@ -926,7 +981,7 @@ new_rdwr_[+ (get "type_name") +]_test (const char *filename, int format, int all rwfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ; if (sfinfo.frames != 2 * frames) - { printf ("\n\nLine %d : incorrect number of frames in file (%ld should be %d)\n\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * frames) ; + { printf ("\n\nLine %d : incorrect number of frames in file (%" PRId64 " should be %d)\n\n", __LINE__, sfinfo.frames, 2 * frames) ; exit (1) ; } ; @@ -960,6 +1015,7 @@ empty_file_test (const char *filename, int format) info.samplerate = 48000 ; info.channels = 2 ; info.format = format ; + info.frames = 0 ; if (sf_format_check (&info) == SF_FALSE) { info.channels = 1 ; @@ -976,8 +1032,8 @@ empty_file_test (const char *filename, int format) /* Open for read and check the length. */ file = test_open_file_or_die (filename, SFM_READ, &info, allow_fd, __LINE__) ; - if (SF_COUNT_TO_LONG (info.frames) != 0) - { printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ; + if (info.frames != 0) + { printf ("\n\nError : frame count (%" PRId64 ") should be zero.\n", info.frames) ; exit (1) ; } ; @@ -986,8 +1042,8 @@ empty_file_test (const char *filename, int format) /* Open for read/write and check the length. */ file = test_open_file_or_die (filename, SFM_RDWR, &info, allow_fd, __LINE__) ; - if (SF_COUNT_TO_LONG (info.frames) != 0) - { printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ; + if (info.frames != 0) + { printf ("\n\nError : frame count (%" PRId64 ") should be zero.\n", info.frames) ; exit (1) ; } ; @@ -996,8 +1052,8 @@ empty_file_test (const char *filename, int format) /* Open for read and check the length. */ file = test_open_file_or_die (filename, SFM_READ, &info, allow_fd, __LINE__) ; - if (SF_COUNT_TO_LONG (info.frames) != 0) - { printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ; + if (info.frames != 0) + { printf ("\n\nError : frame count (%" PRId64 ") should be zero.\n", info.frames) ; exit (1) ; } ; @@ -1031,28 +1087,6 @@ create_short_file (const char *filename) fclose (file) ; } /* create_short_file */ -#if (defined (WIN32) || defined (__WIN32)) - -/* Win32 does not have truncate (nor does it have the POSIX function ftruncate). -** Hack somethng up here to over come this. This function can only truncate to a -** length of zero. -*/ - -static int -truncate (const char *filename, int ignored) -{ int fd ; - - ignored = 0 ; - - if ((fd = open (filename, O_RDWR | O_TRUNC | O_BINARY)) < 0) - return 0 ; - - close (fd) ; - - return 0 ; -} /* truncate */ - -#endif static void multi_seek_test (const char * filename, int format) @@ -1091,7 +1125,7 @@ write_seek_extend_test (const char * filename, int format) short *orig, *test ; unsigned items, k ; - /* This test doesn't work on the following. */ + /* This test doesn't work on the following container formats. */ switch (format & SF_FORMAT_TYPEMASK) { case SF_FORMAT_FLAC : case SF_FORMAT_HTK : @@ -1104,6 +1138,18 @@ write_seek_extend_test (const char * filename, int format) break ; } ; + /* This test doesn't work on the following codec formats. */ + switch (format & SF_FORMAT_SUBMASK) + { case SF_FORMAT_ALAC_16 : + case SF_FORMAT_ALAC_20 : + case SF_FORMAT_ALAC_24 : + case SF_FORMAT_ALAC_32 : + return ; + + default : + break ; + } ; + memset (&info, 0, sizeof (info)) ; info.samplerate = 48000 ; @@ -1132,6 +1178,11 @@ write_seek_extend_test (const char * filename, int format) test_read_short_or_die (file, 0, test, 3 * items, __LINE__) ; sf_close (file) ; + if (info.frames < 3 * items) + { printf ("\n\nLine %d : Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, info.frames, 3 * items) ; + exit (1) ; + } ; + /* Can't do these formats due to scaling. */ switch (format & SF_FORMAT_SUBMASK) { case SF_FORMAT_PCM_S8 :