mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2024-11-10 07:21:58 +00:00
oslibs, codecs: updated libxmp, opusfile, and vorbis builds.
This commit is contained in:
Ozkan Sezer
parent
57748db955
commit
c8604ed40c
24 changed files with 56 additions and 26 deletions
|
|
@ -6,7 +6,7 @@
|
|||
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
|
||||
* *
|
||||
* THE libopusfile SOURCE CODE IS (C) COPYRIGHT 1994-2012 *
|
||||
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
|
||||
* by the Xiph.Org Foundation and contributors https://xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
reference
|
||||
<tt><a href="https://www.xiph.org/ogg/doc/libogg/reference.html">libogg</a></tt>
|
||||
and
|
||||
<tt><a href="https://mf4.xiph.org/jenkins/view/opus/job/opus/ws/doc/html/index.html">libopus</a></tt>
|
||||
<tt><a href="https://opus-codec.org/docs/opus_api-1.3.1/">libopus</a></tt>
|
||||
libraries.
|
||||
|
||||
<tt>libopusfile</tt> provides several sets of built-in routines for
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
it is stored in the header to allow you to resample to it after decoding
|
||||
(the <tt>libopusfile</tt> API does not currently provide a resampler,
|
||||
but the
|
||||
<a href="http://www.speex.org/docs/manual/speex-manual/node7.html#SECTION00760000000000000000">the
|
||||
<a href="https://www.speex.org/docs/manual/speex-manual/node7.html#SECTION00760000000000000000">the
|
||||
Speex resampler</a> is a good choice if you need one).
|
||||
In general, if you are playing back the audio, you should leave it at
|
||||
48 kHz, provided your audio hardware supports it.
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
|
||||
Opus files can contain anywhere from 1 to 255 channels of audio.
|
||||
The channel mappings for up to 8 channels are the same as the
|
||||
<a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
|
||||
<a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
|
||||
mappings</a>.
|
||||
A special stereo API can convert everything to 2 channels, making it simple
|
||||
to support multichannel files in an application which only has stereo
|
||||
|
|
@ -284,7 +284,7 @@ struct OpusHead{
|
|||
A particular tag may occur more than once, and order is significant.
|
||||
The character set encoding for the strings is always UTF-8, but the tag
|
||||
names are limited to ASCII, and treated as case-insensitive.
|
||||
See <a href="http://www.xiph.org/vorbis/doc/v-comment.html">the Vorbis
|
||||
See <a href="https://www.xiph.org/vorbis/doc/v-comment.html">the Vorbis
|
||||
comment header specification</a> for details.
|
||||
|
||||
In filling in this structure, <tt>libopusfile</tt> will null-terminate the
|
||||
|
|
@ -698,7 +698,7 @@ void opus_picture_tag_clear(OpusPictureTag *_pic) OP_ARG_NONNULL(1);
|
|||
#define OP_HTTP_PROXY_PASS_REQUEST (6720)
|
||||
#define OP_GET_SERVER_INFO_REQUEST (6784)
|
||||
|
||||
#define OP_URL_OPT(_request) ((_request)+(char *)0)
|
||||
#define OP_URL_OPT(_request) ((char *)(_request))
|
||||
|
||||
/*These macros trigger compilation errors or warnings if the wrong types are
|
||||
provided to one of the URL options.*/
|
||||
|
|
@ -1890,7 +1890,7 @@ void op_set_dither_enabled(OggOpusFile *_of,int _enabled) OP_ARG_NONNULL(1);
|
|||
signed native-endian 16-bit values at 48 kHz
|
||||
with a nominal range of <code>[-32768,32767)</code>.
|
||||
Multiple channels are interleaved using the
|
||||
<a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
|
||||
<a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
|
||||
channel ordering</a>.
|
||||
This must have room for at least \a _buf_size values.
|
||||
\param _buf_size The number of values that can be stored in \a _pcm.
|
||||
|
|
@ -1972,7 +1972,7 @@ OP_WARN_UNUSED_RESULT int op_read(OggOpusFile *_of,
|
|||
signed floats at 48 kHz with a nominal range of
|
||||
<code>[-1.0,1.0]</code>.
|
||||
Multiple channels are interleaved using the
|
||||
<a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
|
||||
<a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
|
||||
channel ordering</a>.
|
||||
This must have room for at least \a _buf_size floats.
|
||||
\param _buf_size The number of floats that can be stored in \a _pcm.
|
||||
|
|
|
|||
|
|
@ -320,18 +320,37 @@ struct xmp_frame_info { /* Current frame information */
|
|||
struct xmp_channel_info channel_info[XMP_MAX_CHANNELS]; /* Current channel information */
|
||||
};
|
||||
|
||||
struct xmp_callbacks {
|
||||
unsigned long (*read_func)(void *dest, unsigned long len,
|
||||
unsigned long nmemb, void *priv);
|
||||
int (*seek_func)(void *priv, long offset, int whence);
|
||||
long (*tell_func)(void *priv);
|
||||
int (*close_func)(void *priv);
|
||||
};
|
||||
|
||||
typedef char *xmp_context;
|
||||
|
||||
LIBXMP_EXPORT_VAR extern const char *xmp_version;
|
||||
LIBXMP_EXPORT_VAR extern const unsigned int xmp_vercode;
|
||||
|
||||
LIBXMP_EXPORT int xmp_syserrno (void);
|
||||
|
||||
LIBXMP_EXPORT xmp_context xmp_create_context (void);
|
||||
LIBXMP_EXPORT void xmp_free_context (xmp_context);
|
||||
LIBXMP_EXPORT int xmp_test_module (const char *, struct xmp_test_info *);
|
||||
|
||||
LIBXMP_EXPORT int xmp_load_module (xmp_context, const char *);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, const void *, long);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_callbacks (xmp_context, void *, struct xmp_callbacks);
|
||||
|
||||
LIBXMP_EXPORT int xmp_test_module (const char *, struct xmp_test_info *);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_memory (const void *, long, struct xmp_test_info *);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_file (void *, struct xmp_test_info *);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_callbacks (void *, struct xmp_callbacks, struct xmp_test_info *);
|
||||
|
||||
LIBXMP_EXPORT void xmp_scan_module (xmp_context);
|
||||
LIBXMP_EXPORT void xmp_release_module (xmp_context);
|
||||
|
||||
LIBXMP_EXPORT int xmp_start_player (xmp_context, int, int);
|
||||
LIBXMP_EXPORT int xmp_play_frame (xmp_context);
|
||||
LIBXMP_EXPORT int xmp_play_buffer (xmp_context, void *, int, int);
|
||||
|
|
@ -353,10 +372,6 @@ LIBXMP_EXPORT int xmp_channel_vol (xmp_context, int, int);
|
|||
LIBXMP_EXPORT int xmp_set_player (xmp_context, int, int);
|
||||
LIBXMP_EXPORT int xmp_get_player (xmp_context, int);
|
||||
LIBXMP_EXPORT int xmp_set_instrument_path (xmp_context, const char *);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, void *, long);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_memory (void *, long, struct xmp_test_info *);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_file (void *, struct xmp_test_info *);
|
||||
|
||||
/* External sample mixer API */
|
||||
LIBXMP_EXPORT int xmp_start_smix (xmp_context, int, int);
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -6,7 +6,7 @@
|
|||
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
|
||||
* *
|
||||
* THE libopusfile SOURCE CODE IS (C) COPYRIGHT 1994-2012 *
|
||||
* by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
|
||||
* by the Xiph.Org Foundation and contributors https://xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
reference
|
||||
<tt><a href="https://www.xiph.org/ogg/doc/libogg/reference.html">libogg</a></tt>
|
||||
and
|
||||
<tt><a href="https://mf4.xiph.org/jenkins/view/opus/job/opus/ws/doc/html/index.html">libopus</a></tt>
|
||||
<tt><a href="https://opus-codec.org/docs/opus_api-1.3.1/">libopus</a></tt>
|
||||
libraries.
|
||||
|
||||
<tt>libopusfile</tt> provides several sets of built-in routines for
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
it is stored in the header to allow you to resample to it after decoding
|
||||
(the <tt>libopusfile</tt> API does not currently provide a resampler,
|
||||
but the
|
||||
<a href="http://www.speex.org/docs/manual/speex-manual/node7.html#SECTION00760000000000000000">the
|
||||
<a href="https://www.speex.org/docs/manual/speex-manual/node7.html#SECTION00760000000000000000">the
|
||||
Speex resampler</a> is a good choice if you need one).
|
||||
In general, if you are playing back the audio, you should leave it at
|
||||
48 kHz, provided your audio hardware supports it.
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
|
||||
Opus files can contain anywhere from 1 to 255 channels of audio.
|
||||
The channel mappings for up to 8 channels are the same as the
|
||||
<a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
|
||||
<a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
|
||||
mappings</a>.
|
||||
A special stereo API can convert everything to 2 channels, making it simple
|
||||
to support multichannel files in an application which only has stereo
|
||||
|
|
@ -284,7 +284,7 @@ struct OpusHead{
|
|||
A particular tag may occur more than once, and order is significant.
|
||||
The character set encoding for the strings is always UTF-8, but the tag
|
||||
names are limited to ASCII, and treated as case-insensitive.
|
||||
See <a href="http://www.xiph.org/vorbis/doc/v-comment.html">the Vorbis
|
||||
See <a href="https://www.xiph.org/vorbis/doc/v-comment.html">the Vorbis
|
||||
comment header specification</a> for details.
|
||||
|
||||
In filling in this structure, <tt>libopusfile</tt> will null-terminate the
|
||||
|
|
@ -698,7 +698,7 @@ void opus_picture_tag_clear(OpusPictureTag *_pic) OP_ARG_NONNULL(1);
|
|||
#define OP_HTTP_PROXY_PASS_REQUEST (6720)
|
||||
#define OP_GET_SERVER_INFO_REQUEST (6784)
|
||||
|
||||
#define OP_URL_OPT(_request) ((_request)+(char *)0)
|
||||
#define OP_URL_OPT(_request) ((char *)(_request))
|
||||
|
||||
/*These macros trigger compilation errors or warnings if the wrong types are
|
||||
provided to one of the URL options.*/
|
||||
|
|
@ -1890,7 +1890,7 @@ void op_set_dither_enabled(OggOpusFile *_of,int _enabled) OP_ARG_NONNULL(1);
|
|||
signed native-endian 16-bit values at 48 kHz
|
||||
with a nominal range of <code>[-32768,32767)</code>.
|
||||
Multiple channels are interleaved using the
|
||||
<a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
|
||||
<a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
|
||||
channel ordering</a>.
|
||||
This must have room for at least \a _buf_size values.
|
||||
\param _buf_size The number of values that can be stored in \a _pcm.
|
||||
|
|
@ -1972,7 +1972,7 @@ OP_WARN_UNUSED_RESULT int op_read(OggOpusFile *_of,
|
|||
signed floats at 48 kHz with a nominal range of
|
||||
<code>[-1.0,1.0]</code>.
|
||||
Multiple channels are interleaved using the
|
||||
<a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
|
||||
<a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
|
||||
channel ordering</a>.
|
||||
This must have room for at least \a _buf_size floats.
|
||||
\param _buf_size The number of floats that can be stored in \a _pcm.
|
||||
|
|
|
|||
|
|
@ -320,18 +320,37 @@ struct xmp_frame_info { /* Current frame information */
|
|||
struct xmp_channel_info channel_info[XMP_MAX_CHANNELS]; /* Current channel information */
|
||||
};
|
||||
|
||||
struct xmp_callbacks {
|
||||
unsigned long (*read_func)(void *dest, unsigned long len,
|
||||
unsigned long nmemb, void *priv);
|
||||
int (*seek_func)(void *priv, long offset, int whence);
|
||||
long (*tell_func)(void *priv);
|
||||
int (*close_func)(void *priv);
|
||||
};
|
||||
|
||||
typedef char *xmp_context;
|
||||
|
||||
LIBXMP_EXPORT_VAR extern const char *xmp_version;
|
||||
LIBXMP_EXPORT_VAR extern const unsigned int xmp_vercode;
|
||||
|
||||
LIBXMP_EXPORT int xmp_syserrno (void);
|
||||
|
||||
LIBXMP_EXPORT xmp_context xmp_create_context (void);
|
||||
LIBXMP_EXPORT void xmp_free_context (xmp_context);
|
||||
LIBXMP_EXPORT int xmp_test_module (const char *, struct xmp_test_info *);
|
||||
|
||||
LIBXMP_EXPORT int xmp_load_module (xmp_context, const char *);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, const void *, long);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_callbacks (xmp_context, void *, struct xmp_callbacks);
|
||||
|
||||
LIBXMP_EXPORT int xmp_test_module (const char *, struct xmp_test_info *);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_memory (const void *, long, struct xmp_test_info *);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_file (void *, struct xmp_test_info *);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_callbacks (void *, struct xmp_callbacks, struct xmp_test_info *);
|
||||
|
||||
LIBXMP_EXPORT void xmp_scan_module (xmp_context);
|
||||
LIBXMP_EXPORT void xmp_release_module (xmp_context);
|
||||
|
||||
LIBXMP_EXPORT int xmp_start_player (xmp_context, int, int);
|
||||
LIBXMP_EXPORT int xmp_play_frame (xmp_context);
|
||||
LIBXMP_EXPORT int xmp_play_buffer (xmp_context, void *, int, int);
|
||||
|
|
@ -353,10 +372,6 @@ LIBXMP_EXPORT int xmp_channel_vol (xmp_context, int, int);
|
|||
LIBXMP_EXPORT int xmp_set_player (xmp_context, int, int);
|
||||
LIBXMP_EXPORT int xmp_get_player (xmp_context, int);
|
||||
LIBXMP_EXPORT int xmp_set_instrument_path (xmp_context, const char *);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, void *, long);
|
||||
LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_memory (void *, long, struct xmp_test_info *);
|
||||
LIBXMP_EXPORT int xmp_test_module_from_file (void *, struct xmp_test_info *);
|
||||
|
||||
/* External sample mixer API */
|
||||
LIBXMP_EXPORT int xmp_start_smix (xmp_context, int, int);
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue