Unified · Split
| @@ -21,8 +21,6 @@ The current release handles the following audio file formats: · 20 unmodified lines | ||
| 21 | 21 | * Amiga MAUD files |
| 22 | 22 | * AMR-WB & AMR-NB (with optional libamrwb & libamrnb libraries) |
| 23 | 23 | * MP2/MP3 (with optional libmad, libtwolame and libmp3lame libraries) |
| 24 | −* MP4, AAC, AC3, WAVPACK, AMR-NB files (with optional ffmpeg library) | |
| 25 | −* AVI, WMV, Ogg Theora, MPEG video files (with optional ffmpeg library) | |
| 26 | 24 | (:cell:) |
| 27 | 25 | * Ogg Vorbis files (with optional Ogg Vorbis libraries) |
| 28 | 26 | * FLAC files (with optional libFLAC) |
| @@ -1,65 +0,0 @@ | ||
| 1 | −dnl SOX_PATH_FFMPEG | |
| 2 | −dnl cbagwell@users.sourceforge.net 1-3-2007 | |
| 3 | −dnl | |
| 4 | −# SOX_PATH_FFMPEG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) | |
| 5 | −# Test for libavformat, and define FFMPEG_CFLAGS and FFMPEG_LIBS | |
| 6 | −AC_DEFUN([SOX_PATH_FFMPEG], | |
| 7 | −[dnl | |
| 8 | −# Step 1: Use PKG_CHECK_MODULES if available | |
| 9 | −m4_ifdef([PKG_CHECK_MODULES], | |
| 10 | − [# PKG_CHECK_MODULES available | |
| 11 | − PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil], | |
| 12 | − have_ffmpeg="maybe", | |
| 13 | − have_ffmpeg="no")], | |
| 14 | − [# Step 2: Use pkg-config manually if available | |
| 15 | − AC_PATH_PROG([PKGCONFIG], [pkg-config], [none]) | |
| 16 | − if test "$PKGCONFIG" != "none" && `$PKGCONFIG --exists libavformat libavcodec libavutil` | |
| 17 | − then | |
| 18 | − FFMPEG_CFLAGS=`$PKGCONFIG --cflags libavformat` | |
| 19 | − FFMPEG_LIBS=`$PKGCONFIG --libs libavformat libavcodec libavutil` | |
| 20 | − have_ffmpeg="maybe" | |
| 21 | − else | |
| 22 | − have_ffmpeg="no" | |
| 23 | − fi]) | |
| 24 | − | |
| 25 | −# Step 3: Even if pkg-config says its not installed, user may have | |
| 26 | −# manually installed libraries with no pkg-config support | |
| 27 | −if test "$have_ffmpeg" = "no" | |
| 28 | −then | |
| 29 | − # Some packages distribute a <package>-config which we could check | |
| 30 | − # for but libavformat doesn't have that. We could use AC_PATH_PROG() | |
| 31 | − # similar to above for finding pkg-config. | |
| 32 | − | |
| 33 | − # As a last resort, just hope that header and library can | |
| 34 | − # be found in default paths and that it doesn't need | |
| 35 | − # to link against any other libraries. | |
| 36 | − FFMPEG_LIBS="-lavformat -lavcodec -lavutil" | |
| 37 | − have_ffmpeg="maybe" | |
| 38 | −fi | |
| 39 | − | |
| 40 | −# Even if pkg-config or similar told us how to find the library, | |
| 41 | −# do a safety check. | |
| 42 | −if test "$have_ffmpeg" != "no" | |
| 43 | −then | |
| 44 | − ac_save_CFLAGS="$CFLAGS" | |
| 45 | − ac_save_CPPFLAGS="$CPPFLAGS" | |
| 46 | − ac_save_LIBS="$LIBS" | |
| 47 | − CFLAGS="$CFLAGS $FFMPEG_CFLAGS" | |
| 48 | − CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS" | |
| 49 | − LIBS="$LIBS $FFMPEG_LIBS" | |
| 50 | − have_ffmpeg="no" | |
| 51 | − AC_CHECK_HEADERS([libavformat/avformat.h ffmpeg/avformat.h], | |
| 52 | − [AC_CHECK_LIB(avformat, av_open_input_file, | |
| 53 | − [AC_CHECK_HEADERS([libavcodec/avcodec.h ffmpeg/avcodec.h], | |
| 54 | − [AC_CHECK_LIB(avcodec, avcodec_decode_audio3, have_ffmpeg=yes)])]) | |
| 55 | − break]) | |
| 56 | − CFLAGS="$ac_save_CFLAGS" | |
| 57 | − CPPFAGS="$ac_save_CPPFLAGS" | |
| 58 | − LIBS="$ac_save_LIBS" | |
| 59 | −fi | |
| 60 | − | |
| 61 | −if test "$have_ffmpeg" != "yes" | |
| 62 | −then | |
| 63 | − ifelse([$2], , :, [$2]) | |
| 64 | −fi | |
| 65 | −])dnl SOX_PATH_FFMPEG | |
| @@ -51,7 +51,7 @@ · 50 unmodified lines | ||
| 51 | 51 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 52 | 52 | <ClCompile> |
| 53 | 53 | <Optimization>Disabled</Optimization> |
| 54 | − <AdditionalIncludeDirectories>SoX;Png;../../ffmpeg;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 54 | + <AdditionalIncludeDirectories>SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 55 | 55 | <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 56 | 56 | <StringPooling>true</StringPooling> |
| 57 | 57 | <MinimalRebuild>true</MinimalRebuild> |
| @@ -75,7 +75,7 @@ · 17 unmodified lines | ||
| 75 | 75 | <ClCompile> |
| 76 | 76 | <Optimization>MaxSpeed</Optimization> |
| 77 | 77 | <IntrinsicFunctions>true</IntrinsicFunctions> |
| 78 | − <AdditionalIncludeDirectories>SoX;Png;../../ffmpeg;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 78 | + <AdditionalIncludeDirectories>SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 79 | 79 | <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 80 | 80 | <StringPooling>true</StringPooling> |
| 81 | 81 | <ExceptionHandling> |
| @@ -106,7 +106,6 @@ · 24 unmodified lines | ||
| 106 | 106 | <ClInclude Include="..\src\dft_filter.h" /> |
| 107 | 107 | <ClInclude Include="..\src\dither.h" /> |
| 108 | 108 | <ClInclude Include="..\src\effects.h" /> |
| 109 | − <ClInclude Include="..\src\ffmpeg.h" /> | |
| 110 | 109 | <ClInclude Include="..\src\fft4g.h" /> |
| 111 | 110 | <ClInclude Include="..\src\fifo.h" /> |
| 112 | 111 | <ClInclude Include="..\src\formats.h" /> |
| @@ -263,7 +262,6 @@ · 150 unmodified lines | ||
| 263 | 262 | <ClCompile Include="..\src\f4-fmt.c" /> |
| 264 | 263 | <ClCompile Include="..\src\f8-fmt.c" /> |
| 265 | 264 | <ClCompile Include="..\src\fap.c" /> |
| 266 | − <ClCompile Include="..\src\ffmpeg.c" /> | |
| 267 | 265 | <ClCompile Include="..\src\flac.c" /> |
| 268 | 266 | <ClCompile Include="..\src\gsm.c" /> |
| 269 | 267 | <ClCompile Include="..\src\gsrt.c" /> |
| @@ -58,9 +58,6 @@ · 57 unmodified lines | ||
| 58 | 58 | <ClInclude Include="..\src\effects.h"> |
| 59 | 59 | <Filter>Headers</Filter> |
| 60 | 60 | </ClInclude> |
| 61 | − <ClInclude Include="..\src\ffmpeg.h"> | |
| 62 | − <Filter>Headers</Filter> | |
| 63 | − </ClInclude> | |
| 64 | 61 | <ClInclude Include="..\src\fft4g.h"> |
| 65 | 62 | <Filter>Headers</Filter> |
| 66 | 63 | </ClInclude> |
| @@ -381,9 +378,6 @@ · 314 unmodified lines | ||
| 381 | 378 | <ClCompile Include="..\src\fap.c"> |
| 382 | 379 | <Filter>Format Sources</Filter> |
| 383 | 380 | </ClCompile> |
| 384 | − <ClCompile Include="..\src\ffmpeg.c"> | |
| 385 | − <Filter>Format Sources</Filter> | |
| 386 | − </ClCompile> | |
| 387 | 381 | <ClCompile Include="..\src\flac.c"> |
| 388 | 382 | <Filter>Format Sources</Filter> |
| 389 | 383 | </ClCompile> |
| @@ -2,10 +2,10 @@ This directory includes hand-crafted project files for building SoX using the · 1 unmodified line | ||
| 2 | 2 | Microsoft Visual C++ 10.0 (or later) compilers, available through Visual Studio |
| 3 | 3 | 2010, Visual Studio 2012, or by downloading the freely-available Microsoft |
| 4 | 4 | Windows SDK 7.1. This is the easiest way to build SoX with MS Visual C++. |
| 5 | −The resulting sox.exe has support for all SoX features except magic, ffmpeg, | |
| 6 | −ladspa, and pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll | |
| 7 | −or cygmad-0.dll), libsndfile (libsndfile-1.dll), and AMR support | |
| 8 | −(libamrnb-3.dll, libamrwb-3.dll) are loaded at runtime if they are available. | |
| 5 | +The resulting sox.exe has support for all SoX features except magic, ladspa, | |
| 6 | +and pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll or | |
| 7 | +cygmad-0.dll), libsndfile (libsndfile-1.dll), and AMR support (libamrnb-3.dll, | |
| 8 | +libamrwb-3.dll) are loaded at runtime if they are available. | |
| 9 | 9 | |
| 10 | 10 | How to build: |
| 11 | 11 | |
| @@ -76,7 +76,6 @@ · 75 unmodified lines | ||
| 76 | 76 | <Link> |
| 77 | 77 | <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 78 | 78 | <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).exe</OutputFile> |
| 79 | − <AdditionalLibraryDirectories>../../ffmpeg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
| 80 | 79 | <DelayLoadDLLs>winmm.dll;%(DelayLoadDLLs)</DelayLoadDLLs> |
| 81 | 80 | <GenerateDebugInformation>true</GenerateDebugInformation> |
| 82 | 81 | <SubSystem>Console</SubSystem> |
| @@ -85,13 +84,6 @@ · 2 unmodified lines | ||
| 85 | 84 | <SetChecksum>true</SetChecksum> |
| 86 | 85 | <TargetMachine>MachineX86</TargetMachine> |
| 87 | 86 | </Link> |
| 88 | − <PostBuildEvent> | |
| 89 | − <Message>Copying FFmpeg DLLs...</Message> | |
| 90 | − <Command>xcopy /d /y ..\..\ffmpeg\avformat-52.dll "$(SolutionDir)$(Configuration)" | |
| 91 | −xcopy /d /y ..\..\ffmpeg\avcodec-52.dll "$(SolutionDir)$(Configuration)" | |
| 92 | −xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(Configuration)" | |
| 93 | −</Command> | |
| 94 | − </PostBuildEvent> | |
| 95 | 87 | </ItemDefinitionGroup> |
| 96 | 88 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 97 | 89 | <ClCompile> |
| @@ -117,7 +109,6 @@ xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(Configuration)" · 19 unmodified lines | ||
| 117 | 109 | <Link> |
| 118 | 110 | <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 119 | 111 | <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).exe</OutputFile> |
| 120 | − <AdditionalLibraryDirectories>../../ffmpeg;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
| 121 | 112 | <DelayLoadDLLs>winmm.dll;%(DelayLoadDLLs)</DelayLoadDLLs> |
| 122 | 113 | <GenerateDebugInformation>true</GenerateDebugInformation> |
| 123 | 114 | <SubSystem>Console</SubSystem> |
| @@ -126,13 +117,6 @@ xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(Configuration)" · 2 unmodified lines | ||
| 126 | 117 | <SetChecksum>true</SetChecksum> |
| 127 | 118 | <TargetMachine>MachineX86</TargetMachine> |
| 128 | 119 | </Link> |
| 129 | − <PostBuildEvent> | |
| 130 | − <Message>Copying FFmpeg DLLs...</Message> | |
| 131 | − <Command>xcopy /d /y ..\..\ffmpeg\avformat-52.dll "$(SolutionDir)$(Configuration)" | |
| 132 | −xcopy /d /y ..\..\ffmpeg\avcodec-52.dll "$(SolutionDir)$(Configuration)" | |
| 133 | −xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(Configuration)" | |
| 134 | −</Command> | |
| 135 | − </PostBuildEvent> | |
| 136 | 120 | </ItemDefinitionGroup> |
| 137 | 121 | <ItemGroup> |
| 138 | 122 | <ClCompile Include="..\src\sox.c" /> |
| @@ -50,11 +50,6 @@ · 49 unmodified lines | ||
| 50 | 50 | #define STATIC_AMRWB 1 |
| 51 | 51 | #define DL_AMRWB 1 |
| 52 | 52 | |
| 53 | −// SoX FFMPEG support is currently unreliable, and especially so under MSVC. | |
| 54 | −//#define HAVE_FFMPEG 1 | |
| 55 | −#define STATIC_FFMPEG 1 | |
| 56 | −#define HAVE_LIBAVFORMAT_AVFORMAT_H 1 | |
| 57 | − | |
| 58 | 53 | #define HAVE_FLAC 1 |
| 59 | 54 | #define STATIC_FLAC 1 |
| 60 | 55 | #define FLAC__NO_DLL |
| @@ -41,7 +41,7 @@ · 40 unmodified lines | ||
| 41 | 41 | <Tool |
| 42 | 42 | Name="VCCLCompilerTool" |
| 43 | 43 | Optimization="0" |
| 44 | − AdditionalIncludeDirectories="SoX;Png;../../ffmpeg;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib" | |
| 44 | + AdditionalIncludeDirectories="SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib" | |
| 45 | 45 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" |
| 46 | 46 | StringPooling="true" |
| 47 | 47 | MinimalRebuild="true" |
| @@ -113,7 +113,7 @@ · 65 unmodified lines | ||
| 113 | 113 | Name="VCCLCompilerTool" |
| 114 | 114 | Optimization="2" |
| 115 | 115 | EnableIntrinsicFunctions="true" |
| 116 | − AdditionalIncludeDirectories="SoX;Png;../../ffmpeg;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib" | |
| 116 | + AdditionalIncludeDirectories="SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib" | |
| 117 | 117 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" |
| 118 | 118 | StringPooling="true" |
| 119 | 119 | ExceptionHandling="0" |
| @@ -213,10 +213,6 @@ · 93 unmodified lines | ||
| 213 | 213 | RelativePath="..\src\effects.h" |
| 214 | 214 | > |
| 215 | 215 | </File> |
| 216 | − <File | |
| 217 | − RelativePath="..\src\ffmpeg.h" | |
| 218 | − > | |
| 219 | − </File> | |
| 220 | 216 | <File |
| 221 | 217 | RelativePath="..\src\fft4g.h" |
| 222 | 218 | > |
| @@ -909,10 +905,6 @@ · 686 unmodified lines | ||
| 909 | 905 | RelativePath="..\src\fap.c" |
| 910 | 906 | > |
| 911 | 907 | </File> |
| 912 | − <File | |
| 913 | − RelativePath="..\src\ffmpeg.c" | |
| 914 | − > | |
| 915 | − </File> | |
| 916 | 908 | <File |
| 917 | 909 | RelativePath="..\src\flac.c" |
| 918 | 910 | > |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | This directory includes hand-crafted project files for building SoX under |
| 2 | 2 | MSVC9. The project files may be replaced by expanding CMAKE support in the |
| 3 | 3 | future, but for now, this is the easiest way to build SoX with MS Visual C++. |
| 4 | −The resulting sox.exe has support for all SoX features except magic, ffmpeg, | |
| 5 | −and pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll or | |
| 4 | +The resulting sox.exe has support for all SoX features except magic, and | |
| 5 | +pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll or | |
| 6 | 6 | cygmad-0.dll), libsndfile (libsndfile-1.dll) and AMR support (libamrnb-3.dll, |
| 7 | 7 | libamrwb-3.dll) are loaded at runtime if they are available. |
| 8 | 8 | |
| @@ -71,7 +71,6 @@ · 70 unmodified lines | ||
| 71 | 71 | Name="VCLinkerTool" |
| 72 | 72 | AdditionalDependencies="$(OutDir)libzlib.lib winmm.lib" |
| 73 | 73 | OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).exe" |
| 74 | − AdditionalLibraryDirectories="../../ffmpeg" | |
| 75 | 74 | DelayLoadDLLs="winmm.dll" |
| 76 | 75 | GenerateDebugInformation="true" |
| 77 | 76 | SubSystem="1" |
| @@ -97,12 +96,6 @@ · 19 unmodified lines | ||
| 97 | 96 | <Tool |
| 98 | 97 | Name="VCAppVerifierTool" |
| 99 | 98 | /> |
| 100 | − <Tool | |
| 101 | − Name="VCPostBuildEventTool" | |
| 102 | − Description="Copying FFmpeg DLLs..." | |
| 103 | − CommandLine="xcopy /d /y ..\..\ffmpeg\avformat-52.dll "$(SolutionDir)$(ConfigurationName)"
xcopy /d /y ..\..\ffmpeg\avcodec-52.dll "$(SolutionDir)$(ConfigurationName)"
xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(ConfigurationName)"
" | |
| 104 | − ExcludedFromBuild="true" | |
| 105 | − /> | |
| 106 | 99 | </Configuration> |
| 107 | 100 | <Configuration |
| 108 | 101 | Name="Release|Win32" |
| @@ -160,7 +153,6 @@ · 51 unmodified lines | ||
| 160 | 153 | AdditionalDependencies="$(OutDir)libzlib.lib winmm.lib" |
| 161 | 154 | OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).exe" |
| 162 | 155 | LinkIncremental="1" |
| 163 | − AdditionalLibraryDirectories="../../ffmpeg" | |
| 164 | 156 | DelayLoadDLLs="winmm.dll" |
| 165 | 157 | GenerateDebugInformation="true" |
| 166 | 158 | SubSystem="1" |
| @@ -187,12 +179,6 @@ · 20 unmodified lines | ||
| 187 | 179 | <Tool |
| 188 | 180 | Name="VCAppVerifierTool" |
| 189 | 181 | /> |
| 190 | − <Tool | |
| 191 | − Name="VCPostBuildEventTool" | |
| 192 | − Description="Copying FFmpeg DLLs..." | |
| 193 | − CommandLine="xcopy /d /y ..\..\ffmpeg\avformat-52.dll "$(SolutionDir)$(ConfigurationName)"
xcopy /d /y ..\..\ffmpeg\avcodec-52.dll "$(SolutionDir)$(ConfigurationName)"
xcopy /d /y ..\..\ffmpeg\avutil-49.dll "$(SolutionDir)$(ConfigurationName)"
" | |
| 194 | − ExcludedFromBuild="true" | |
| 195 | − /> | |
| 196 | 182 | </Configuration> |
| 197 | 183 | </Configurations> |
| 198 | 184 | <References> |
| @@ -32,11 +32,6 @@ · 31 unmodified lines | ||
| 32 | 32 | #define STATIC_AMRWB 1 |
| 33 | 33 | #define DL_AMRWB 1 |
| 34 | 34 | |
| 35 | −// SoX FFMPEG support is currently unreliable, and especially so under MSVC. | |
| 36 | −//#define HAVE_FFMPEG 1 | |
| 37 | −#define STATIC_FFMPEG 1 | |
| 38 | −#define HAVE_LIBAVFORMAT_AVFORMAT_H 1 | |
| 39 | − | |
| 40 | 35 | #define HAVE_FLAC 1 |
| 41 | 36 | #define STATIC_FLAC 1 |
| 42 | 37 | #define FLAC__NO_DLL |