[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27973] trunk/lib/darwin-8.x.i386: OSX/10. 4i386 libs: add Ogg/Vorbis/FLAC support for lib SNDFILE
Damien Plisson
damien.plisson at yahoo.fr
Sat Apr 3 12:28:16 CEST 2010
Revision: 27973
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27973
Author: damien78
Date: 2010-04-03 12:28:16 +0200 (Sat, 03 Apr 2010)
Log Message:
-----------
OSX/10.4i386 libs: add Ogg/Vorbis/FLAC support for lib SNDFILE
Modified Paths:
--------------
trunk/lib/darwin-8.x.i386/README
trunk/lib/darwin-8.x.i386/sndfile/include/sndfile.h
trunk/lib/darwin-8.x.i386/sndfile/lib/libsndfile.a
Added Paths:
-----------
trunk/lib/darwin-8.x.i386/sndfile/lib/libFLAC.a
Modified: trunk/lib/darwin-8.x.i386/README
===================================================================
--- trunk/lib/darwin-8.x.i386/README 2010-04-03 10:18:11 UTC (rev 27972)
+++ trunk/lib/darwin-8.x.i386/README 2010-04-03 10:28:16 UTC (rev 27973)
@@ -5,6 +5,8 @@
lame (version 3.97)
xvidcore (version 1.2.2)
x264 (version 20090331)
+flac (version 1.2.1)
+sndfile (version 1.0.21)
The following configuration parameters were used to build the libs:
@@ -34,3 +36,10 @@
FFMPEG:
./configure --arch=i386 --cpu=prescott --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --cc=gcc-4.0 --extra-cflags="-O3 -arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20090331-2245 -I/Users/damien/Documents/Dev/blender2.5/sources/lame-3.97/include -I/Users/damien/Documents/Dev/blender2.5/sources/xvidcore/src -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include" --extra-ldflags="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib"
+
+FLAC:
+./configure --disable-shared --enable-sse --disable-doxygen-docs --disable-xmms-plugin --disable-asm-optimizations --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include --build=i386-apple-darwin9.8.0 CC="gcc-4.0" CXX="g++-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+
+SNDFILE:
+./configure --disable-shared --disable-sqlite --build=i386-apple-darwin9.8.0 CC="gcc-4.0" CXX="g++-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/sndfile/lib" LIBS="-logg -lvorbis -lvorbisenc -lFLAC"
+
Modified: trunk/lib/darwin-8.x.i386/sndfile/include/sndfile.h
===================================================================
--- trunk/lib/darwin-8.x.i386/sndfile/include/sndfile.h 2010-04-03 10:18:11 UTC (rev 27972)
+++ trunk/lib/darwin-8.x.i386/sndfile/include/sndfile.h 2010-04-03 10:28:16 UTC (rev 27973)
@@ -267,27 +267,34 @@
enum
{ SF_CHANNEL_MAP_INVALID = 0,
SF_CHANNEL_MAP_MONO = 1,
- SF_CHANNEL_MAP_LEFT,
- SF_CHANNEL_MAP_RIGHT,
- SF_CHANNEL_MAP_CENTER,
+ SF_CHANNEL_MAP_LEFT, /* Apple calls this 'Left' */
+ SF_CHANNEL_MAP_RIGHT, /* Apple calls this 'Right' */
+ SF_CHANNEL_MAP_CENTER, /* Apple calls this 'Center' */
SF_CHANNEL_MAP_FRONT_LEFT,
SF_CHANNEL_MAP_FRONT_RIGHT,
SF_CHANNEL_MAP_FRONT_CENTER,
- SF_CHANNEL_MAP_REAR_CENTER,
- SF_CHANNEL_MAP_REAR_LEFT,
- SF_CHANNEL_MAP_REAR_RIGHT,
- SF_CHANNEL_MAP_LFE,
- SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,
- SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,
- SF_CHANNEL_MAP_SIDE_LEFT,
- SF_CHANNEL_MAP_SIDE_RIGHT,
- SF_CHANNEL_MAP_TOP_CENTER,
- SF_CHANNEL_MAP_TOP_FRONT_LEFT,
- SF_CHANNEL_MAP_TOP_FRONT_RIGHT,
- SF_CHANNEL_MAP_TOP_FRONT_CENTER,
- SF_CHANNEL_MAP_TOP_REAR_LEFT,
- SF_CHANNEL_MAP_TOP_REAR_RIGHT,
- SF_CHANNEL_MAP_TOP_REAR_CENTER
+ SF_CHANNEL_MAP_REAR_CENTER, /* Apple calls this 'Center Surround', Msft calls this 'Back Center' */
+ SF_CHANNEL_MAP_REAR_LEFT, /* Apple calls this 'Left Surround', Msft calls this 'Back Left' */
+ SF_CHANNEL_MAP_REAR_RIGHT, /* Apple calls this 'Right Surround', Msft calls this 'Back Right' */
+ SF_CHANNEL_MAP_LFE, /* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency' */
+ SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER, /* Apple calls this 'Left Center' */
+ SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER, /* Apple calls this 'Right Center */
+ SF_CHANNEL_MAP_SIDE_LEFT, /* Apple calls this 'Left Surround Direct' */
+ SF_CHANNEL_MAP_SIDE_RIGHT, /* Apple calls this 'Right Surround Direct' */
+ SF_CHANNEL_MAP_TOP_CENTER, /* Apple calls this 'Top Center Surround' */
+ SF_CHANNEL_MAP_TOP_FRONT_LEFT, /* Apple calls this 'Vertical Height Left' */
+ SF_CHANNEL_MAP_TOP_FRONT_RIGHT, /* Apple calls this 'Vertical Height Right' */
+ SF_CHANNEL_MAP_TOP_FRONT_CENTER, /* Apple calls this 'Vertical Height Center' */
+ SF_CHANNEL_MAP_TOP_REAR_LEFT, /* Apple and MS call this 'Top Back Left' */
+ SF_CHANNEL_MAP_TOP_REAR_RIGHT, /* Apple and MS call this 'Top Back Right' */
+ SF_CHANNEL_MAP_TOP_REAR_CENTER, /* Apple and MS call this 'Top Back Center' */
+
+ SF_CHANNEL_MAP_AMBISONIC_B_W,
+ SF_CHANNEL_MAP_AMBISONIC_B_X,
+ SF_CHANNEL_MAP_AMBISONIC_B_Y,
+ SF_CHANNEL_MAP_AMBISONIC_B_Z,
+
+ SF_CHANNEL_MAP_MAX,
} ;
@@ -297,12 +304,12 @@
/* The following typedef is system specific and is defined when libsndfile is
** compiled. sf_count_t can be one of loff_t (Linux), off_t (*BSD), off64_t
-** (Solaris), __int64_t (Win32) etc. On windows, we need to allow the same
+** (Solaris), __int64 (Win32) etc. On windows, we need to allow the same
** header file to be compiler by both GCC and the microsoft compiler.
*/
#if (defined (_MSCVER) || defined (_MSC_VER))
-typedef __int64_t sf_count_t ;
+typedef __int64 sf_count_t ;
#define SF_COUNT_MAX 0x7fffffffffffffffi64
#else
typedef off_t sf_count_t ;
@@ -310,9 +317,9 @@
#endif
-/* A pointer to a SF_INFO structure is passed to sf_open_read () and filled in.
+/* A pointer to a SF_INFO structure is passed to sf_open () and filled in.
** On write, the SF_INFO structure is filled in by the user and passed into
-** sf_open_write ().
+** sf_open ().
*/
struct SF_INFO
@@ -465,6 +472,7 @@
typedef struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
+
/* Open the specified file for read, write or both. On error, this will
** return a NULL pointer. To find the error number, pass a NULL SNDFILE
** to sf_strerror ().
@@ -473,6 +481,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.
@@ -489,18 +498,21 @@
SNDFILE* sf_open_virtual (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
+
/* sf_error () returns a error number which can be translated to a text
** string using sf_error_number().
*/
int sf_error (SNDFILE *sndfile) ;
+
/* sf_strerror () returns to the caller a pointer to the current error message for
** the given SNDFILE.
*/
const char* sf_strerror (SNDFILE *sndfile) ;
+
/* sf_error_number () allows the retrieval of the error string for each internal
** error number.
**
@@ -508,6 +520,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
** in their place.
@@ -521,10 +534,12 @@
int sf_command (SNDFILE *sndfile, int command, void *data, int datasize) ;
+
/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
int sf_format_check (const SF_INFO *info) ;
+
/* Seek within the waveform data chunk of the SNDFILE. sf_seek () uses
** the same values for whence (SEEK_SET, SEEK_CUR and SEEK_END) as
** stdio.h function fseek ().
@@ -539,6 +554,7 @@
sf_count_t sf_seek (SNDFILE *sndfile, sf_count_t frames, int whence) ;
+
/* Functions for retrieving and setting string data within sound files.
** Not all file types support this features; AIFF and WAV do. For both
** functions, the str_type parameter must be one of the SF_STR_* values
@@ -551,16 +567,19 @@
const char* sf_get_string (SNDFILE *sndfile, int str_type) ;
+
/* Return the library version string. */
const char * sf_version_string (void) ;
+
/* Functions for reading/writing the waveform data of a sound file.
*/
sf_count_t sf_read_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
sf_count_t sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t bytes) ;
+
/* Functions for reading and writing the data chunk in terms of frames.
** The number of items actually read/written = frames * number of channels.
** sf_xxxx_raw read/writes the raw data bytes from/to the file
@@ -583,6 +602,7 @@
sf_count_t sf_readf_double (SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
sf_count_t sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames) ;
+
/* Functions for reading and writing the data chunk in terms of items.
** Otherwise similar to above.
** All of these read/write function return number of items read/written.
@@ -600,6 +620,7 @@
sf_count_t sf_read_double (SNDFILE *sndfile, double *ptr, sf_count_t items) ;
sf_count_t sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t items) ;
+
/* Close the SNDFILE and clean up all memory allocations associated with this
** file.
** Returns 0 on success, or an error number.
@@ -607,6 +628,7 @@
int sf_close (SNDFILE *sndfile) ;
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list