| speex.h | | speex.h | |
| | | | |
| skipping to change at line 39 | | skipping to change at line 39 | |
| PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | | PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | |
| LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | | LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | |
| NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | |
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| | | | |
| */ | | */ | |
| | | | |
| #ifndef SPEEX_H | | #ifndef SPEEX_H | |
| #define SPEEX_H | | #define SPEEX_H | |
| | | | |
|
| #include "speex_bits.h" | | #include "speex/speex_bits.h" | |
| | | #include "speex/speex_types.h" | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| /* Values allowed for *ctl() requests */ | | /* Values allowed for *ctl() requests */ | |
| | | | |
| /** Set enhancement on/off (decoder only) */ | | /** Set enhancement on/off (decoder only) */ | |
| #define SPEEX_SET_ENH 0 | | #define SPEEX_SET_ENH 0 | |
| /** Get enhancement state (decoder only) */ | | /** Get enhancement state (decoder only) */ | |
| | | | |
| skipping to change at line 134 | | skipping to change at line 135 | |
| /** Set DTX status (1 for on, 0 for off) */ | | /** Set DTX status (1 for on, 0 for off) */ | |
| #define SPEEX_SET_DTX 34 | | #define SPEEX_SET_DTX 34 | |
| /** Get DTX status (1 for on, 0 for off) */ | | /** Get DTX status (1 for on, 0 for off) */ | |
| #define SPEEX_GET_DTX 35 | | #define SPEEX_GET_DTX 35 | |
| | | | |
| /** Set submode encoding in each frame (1 for yes, 0 for no, setting to no
breaks the standard) */ | | /** Set submode encoding in each frame (1 for yes, 0 for no, setting to no
breaks the standard) */ | |
| #define SPEEX_SET_SUBMODE_ENCODING 36 | | #define SPEEX_SET_SUBMODE_ENCODING 36 | |
| /** */ | | /** */ | |
| #define SPEEX_GET_SUBMODE_ENCODING 37 | | #define SPEEX_GET_SUBMODE_ENCODING 37 | |
| | | | |
|
| /*#define SPEEX_SET_SUBMODE_ENCODING 38*/ | | /*#define SPEEX_SET_LOOKAHEAD 38*/ | |
| /** */ | | /** Returns the lookahead used by Speex */ | |
| #define SPEEX_GET_LOOKAHEAD 39 | | #define SPEEX_GET_LOOKAHEAD 39 | |
| | | | |
|
| | | /** Sets tuning for packet-loss concealment (expected loss rate) */ | |
| | | #define SPEEX_SET_PLC_TUNING 40 | |
| | | /** Gets tuning for PLC */ | |
| | | #define SPEEX_GET_PLC_TUNING 41 | |
| | | | |
| /* Used internally, not to be used in applications */ | | /* Used internally, not to be used in applications */ | |
| /** Used internally*/ | | /** Used internally*/ | |
| #define SPEEX_GET_PI_GAIN 100 | | #define SPEEX_GET_PI_GAIN 100 | |
| /** Used internally*/ | | /** Used internally*/ | |
| #define SPEEX_GET_EXC 101 | | #define SPEEX_GET_EXC 101 | |
| /** Used internally*/ | | /** Used internally*/ | |
| #define SPEEX_GET_INNOV 102 | | #define SPEEX_GET_INNOV 102 | |
| /** Used internally*/ | | /** Used internally*/ | |
| #define SPEEX_GET_DTX_STATUS 103 | | #define SPEEX_GET_DTX_STATUS 103 | |
| | | | |
| | | | |
| skipping to change at line 235 | | skipping to change at line 241 | |
| | | | |
| /** Struct defining a Speex mode */ | | /** Struct defining a Speex mode */ | |
| typedef struct SpeexMode { | | typedef struct SpeexMode { | |
| /** Pointer to the low-level mode data */ | | /** Pointer to the low-level mode data */ | |
| const void *mode; | | const void *mode; | |
| | | | |
| /** Pointer to the mode query function */ | | /** Pointer to the mode query function */ | |
| mode_query_func query; | | mode_query_func query; | |
| | | | |
| /** The name of the mode (you should not rely on this to identify the mo
de)*/ | | /** The name of the mode (you should not rely on this to identify the mo
de)*/ | |
|
| char *modeName; | | const char *modeName; | |
| | | | |
| /**ID of the mode*/ | | /**ID of the mode*/ | |
| int modeID; | | int modeID; | |
| | | | |
| /**Version number of the bitstream (incremented every time we break | | /**Version number of the bitstream (incremented every time we break | |
| bitstream compatibility*/ | | bitstream compatibility*/ | |
| int bitstream_version; | | int bitstream_version; | |
| | | | |
| /** Pointer to encoder initialization function */ | | /** Pointer to encoder initialization function */ | |
| encoder_init_func enc_init; | | encoder_init_func enc_init; | |
| | | | |
| skipping to change at line 288 | | skipping to change at line 294 | |
| */ | | */ | |
| void *speex_encoder_init(const SpeexMode *mode); | | void *speex_encoder_init(const SpeexMode *mode); | |
| | | | |
| /** Frees all resources associated to an existing Speex encoder state. | | /** Frees all resources associated to an existing Speex encoder state. | |
| * @param state Encoder state to be destroyed */ | | * @param state Encoder state to be destroyed */ | |
| void speex_encoder_destroy(void *state); | | void speex_encoder_destroy(void *state); | |
| | | | |
| /** Uses an existing encoder state to encode one frame of speech pointed to
by | | /** Uses an existing encoder state to encode one frame of speech pointed to
by | |
| "in". The encoded bit-stream is saved in "bits". | | "in". The encoded bit-stream is saved in "bits". | |
| @param state Encoder state | | @param state Encoder state | |
|
| @param in Frame that will be encoded with a +-2^16 range | | @param in Frame that will be encoded with a +-2^15 range | |
| @param bits Bit-stream where the data will be written | | @param bits Bit-stream where the data will be written | |
| */ | | */ | |
| int speex_encode(void *state, float *in, SpeexBits *bits); | | int speex_encode(void *state, float *in, SpeexBits *bits); | |
| | | | |
| /** Uses an existing encoder state to encode one frame of speech pointed to
by | | /** Uses an existing encoder state to encode one frame of speech pointed to
by | |
| "in". The encoded bit-stream is saved in "bits". | | "in". The encoded bit-stream is saved in "bits". | |
| @param state Encoder state | | @param state Encoder state | |
|
| @param in Frame that will be encoded with a +-2^16 range | | @param in Frame that will be encoded with a +-2^15 range | |
| @param bits Bit-stream where the data will be written | | @param bits Bit-stream where the data will be written | |
| */ | | */ | |
|
| int speex_encode_int(void *state, short *in, SpeexBits *bits); | | int speex_encode_int(void *state, spx_int16_t *in, SpeexBits *bits); | |
| | | | |
| /** Used like the ioctl function to control the encoder parameters | | /** Used like the ioctl function to control the encoder parameters | |
| * | | * | |
| * @param state Encoder state | | * @param state Encoder state | |
| * @param request ioctl-type request (one of the SPEEX_* macros) | | * @param request ioctl-type request (one of the SPEEX_* macros) | |
| * @param ptr Data exchanged to-from function | | * @param ptr Data exchanged to-from function | |
| * @return 0 if frame needs not be transmitted (DTX only), 1 otherwise | | * @return 0 if frame needs not be transmitted (DTX only), 1 otherwise | |
| */ | | */ | |
| int speex_encoder_ctl(void *state, int request, void *ptr); | | int speex_encoder_ctl(void *state, int request, void *ptr); | |
| | | | |
| | | | |
| skipping to change at line 344 | | skipping to change at line 350 | |
| int speex_decode(void *state, SpeexBits *bits, float *out); | | int speex_decode(void *state, SpeexBits *bits, float *out); | |
| | | | |
| /** Uses an existing decoder state to decode one frame of speech from | | /** Uses an existing decoder state to decode one frame of speech from | |
| * bit-stream bits. The output speech is saved written to out. | | * bit-stream bits. The output speech is saved written to out. | |
| * | | * | |
| * @param state Decoder state | | * @param state Decoder state | |
| * @param bits Bit-stream from which to decode the frame (NULL if the packe
t was lost) | | * @param bits Bit-stream from which to decode the frame (NULL if the packe
t was lost) | |
| * @param out Where to write the decoded frame | | * @param out Where to write the decoded frame | |
| * @return return status (0 for no error, -1 for end of stream, -2 other) | | * @return return status (0 for no error, -1 for end of stream, -2 other) | |
| */ | | */ | |
|
| int speex_decode_int(void *state, SpeexBits *bits, short *out); | | int speex_decode_int(void *state, SpeexBits *bits, spx_int16_t *out); | |
| | | | |
| /** Used like the ioctl function to control the encoder parameters | | /** Used like the ioctl function to control the encoder parameters | |
| * | | * | |
| * @param state Decoder state | | * @param state Decoder state | |
| * @param request ioctl-type request (one of the SPEEX_* macros) | | * @param request ioctl-type request (one of the SPEEX_* macros) | |
| * @param ptr Data exchanged to-from function | | * @param ptr Data exchanged to-from function | |
| * @return 0 for no error, 1 if a terminator is reached, 2 for another erro
r | | * @return 0 for no error, 1 if a terminator is reached, 2 for another erro
r | |
| */ | | */ | |
| int speex_decoder_ctl(void *state, int request, void *ptr); | | int speex_decoder_ctl(void *state, int request, void *ptr); | |
| | | | |
| | | | |
| skipping to change at line 387 | | skipping to change at line 393 | |
| | | | |
| #ifdef EPIC_48K | | #ifdef EPIC_48K | |
| /** 4.8 kbps narrowband mode */ | | /** 4.8 kbps narrowband mode */ | |
| extern const SpeexMode speex_nb_48k_mode; | | extern const SpeexMode speex_nb_48k_mode; | |
| #endif | | #endif | |
| | | | |
| /** List of all modes available */ | | /** List of all modes available */ | |
| extern const SpeexMode * const speex_mode_list[SPEEX_NB_MODES]; | | extern const SpeexMode * const speex_mode_list[SPEEX_NB_MODES]; | |
| | | | |
| /** Obtain one of the modes available */ | | /** Obtain one of the modes available */ | |
|
| const SpeexMode * const speex_lib_get_mode (int mode); | | const SpeexMode * speex_lib_get_mode (int mode); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 9 change blocks. |
| 9 lines changed or deleted | | 15 lines changed or added | |
|
| speex_header.h | | speex_header.h | |
| | | | |
| skipping to change at line 39 | | skipping to change at line 39 | |
| PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | | PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | |
| LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | | LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | |
| NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | |
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| | | | |
| */ | | */ | |
| | | | |
| #ifndef SPEEX_HEADER_H | | #ifndef SPEEX_HEADER_H | |
| #define SPEEX_HEADER_H | | #define SPEEX_HEADER_H | |
| | | | |
|
| | | #include "speex/speex_types.h" | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| struct SpeexMode; | | struct SpeexMode; | |
| | | | |
|
| | | #define SPEEX_HEADER_STRING_LENGTH 8 | |
| | | | |
| /** Maximum number of characters for encoding the Speex version number in t
he header */ | | /** Maximum number of characters for encoding the Speex version number in t
he header */ | |
| #define SPEEX_HEADER_VERSION_LENGTH 20 | | #define SPEEX_HEADER_VERSION_LENGTH 20 | |
| | | | |
| /** Speex header info for file-based formats */ | | /** Speex header info for file-based formats */ | |
| typedef struct SpeexHeader { | | typedef struct SpeexHeader { | |
|
| char speex_string[8]; /**< Identifies a Speex bit-stream, always s
et to "Speex " */ | | char speex_string[SPEEX_HEADER_STRING_LENGTH]; /**< Identifies a Speex
bit-stream, always set to "Speex " */ | |
| char speex_version[SPEEX_HEADER_VERSION_LENGTH]; /**< Speex version */ | | char speex_version[SPEEX_HEADER_VERSION_LENGTH]; /**< Speex version */ | |
|
| int speex_version_id; /**< Version for Speex (for checking compati | | spx_int32_t speex_version_id; /**< Version for Speex (for checking | |
| bility) */ | | compatibility) */ | |
| int header_size; /**< Total size of the header ( sizeof(Speex | | spx_int32_t header_size; /**< Total size of the header ( size | |
| Header) ) */ | | of(SpeexHeader) ) */ | |
| int rate; /**< Sampling rate used */ | | spx_int32_t rate; /**< Sampling rate used */ | |
| int mode; /**< Mode used (0 for narrowband, 1 for wide | | spx_int32_t mode; /**< Mode used (0 for narrowband, 1 | |
| band) */ | | for wideband) */ | |
| int mode_bitstream_version; /**< Version ID of the bit-stream */ | | spx_int32_t mode_bitstream_version; /**< Version ID of the bit-stream */ | |
| int nb_channels; /**< Number of channels encoded */ | | spx_int32_t nb_channels; /**< Number of channels encoded */ | |
| int bitrate; /**< Bit-rate used */ | | spx_int32_t bitrate; /**< Bit-rate used */ | |
| int frame_size; /**< Size of frames */ | | spx_int32_t frame_size; /**< Size of frames */ | |
| int vbr; /**< 1 for a VBR encoding, 0 otherwise */ | | spx_int32_t vbr; /**< 1 for a VBR encoding, 0 otherwi | |
| int frames_per_packet; /**< Number of frames stored per Ogg packet | | se */ | |
| */ | | spx_int32_t frames_per_packet; /**< Number of frames stored per Ogg | |
| int extra_headers; /**< Number of additional headers after the | | packet */ | |
| comments */ | | spx_int32_t extra_headers; /**< Number of additional headers af | |
| int reserved1; /**< Reserved for future use, must be zero * | | ter the comments */ | |
| / | | spx_int32_t reserved1; /**< Reserved for future use, must b | |
| int reserved2; /**< Reserved for future use, must be zero * | | e zero */ | |
| / | | spx_int32_t reserved2; /**< Reserved for future use, must b | |
| | | e zero */ | |
| } SpeexHeader; | | } SpeexHeader; | |
| | | | |
| /** Initializes a SpeexHeader using basic information */ | | /** Initializes a SpeexHeader using basic information */ | |
| void speex_init_header(SpeexHeader *header, int rate, int nb_channels, cons
t struct SpeexMode *m); | | void speex_init_header(SpeexHeader *header, int rate, int nb_channels, cons
t struct SpeexMode *m); | |
| | | | |
| /** Creates the header packet from the header itself (mostly involves endia
nness conversion) */ | | /** Creates the header packet from the header itself (mostly involves endia
nness conversion) */ | |
| char *speex_header_to_packet(SpeexHeader *header, int *size); | | char *speex_header_to_packet(SpeexHeader *header, int *size); | |
| | | | |
| /** Creates a SpeexHeader from a packet */ | | /** Creates a SpeexHeader from a packet */ | |
| SpeexHeader *speex_packet_to_header(char *packet, int size); | | SpeexHeader *speex_packet_to_header(char *packet, int size); | |
| | | | |
End of changes. 4 change blocks. |
| 21 lines changed or deleted | | 26 lines changed or added | |
|
| speex_preprocess.h | | speex_preprocess.h | |
| | | | |
| skipping to change at line 36 | | skipping to change at line 36 | |
| SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | | SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
| HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | | HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |
| STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN | | STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN | |
| ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
| POSSIBILITY OF SUCH DAMAGE. | | POSSIBILITY OF SUCH DAMAGE. | |
| */ | | */ | |
| | | | |
| #ifndef SPEEX_PREPROCESS_H | | #ifndef SPEEX_PREPROCESS_H | |
| #define SPEEX_PREPROCESS_H | | #define SPEEX_PREPROCESS_H | |
| | | | |
|
| | | #include "speex/speex_types.h" | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| struct drft_lookup; | | struct drft_lookup; | |
| | | | |
| typedef struct SpeexPreprocessState { | | typedef struct SpeexPreprocessState { | |
| int frame_size; /**< Number of samples processed each time */ | | int frame_size; /**< Number of samples processed each time */ | |
| int ps_size; /**< Number of points in the power spectrum */ | | int ps_size; /**< Number of points in the power spectrum */ | |
| int sampling_rate; /**< Sampling rate of the input/output */ | | int sampling_rate; /**< Sampling rate of the input/output */ | |
| | | | |
| skipping to change at line 109 | | skipping to change at line 111 | |
| | | | |
| } SpeexPreprocessState; | | } SpeexPreprocessState; | |
| | | | |
| /** Creates a new preprocessing state */ | | /** Creates a new preprocessing state */ | |
| SpeexPreprocessState *speex_preprocess_state_init(int frame_size, int sampl
ing_rate); | | SpeexPreprocessState *speex_preprocess_state_init(int frame_size, int sampl
ing_rate); | |
| | | | |
| /** Destroys a denoising state */ | | /** Destroys a denoising state */ | |
| void speex_preprocess_state_destroy(SpeexPreprocessState *st); | | void speex_preprocess_state_destroy(SpeexPreprocessState *st); | |
| | | | |
| /** Preprocess a frame */ | | /** Preprocess a frame */ | |
|
| int speex_preprocess(SpeexPreprocessState *st, short *x, int *echo); | | int speex_preprocess(SpeexPreprocessState *st, spx_int16_t *x, int *echo); | |
| | | | |
| /** Preprocess a frame */ | | /** Preprocess a frame */ | |
|
| void speex_preprocess_estimate_update(SpeexPreprocessState *st, short *x, i
nt *echo); | | void speex_preprocess_estimate_update(SpeexPreprocessState *st, spx_int16_t
*x, int *echo); | |
| | | | |
| /** Used like the ioctl function to control the preprocessor parameters */ | | /** Used like the ioctl function to control the preprocessor parameters */ | |
| int speex_preprocess_ctl(SpeexPreprocessState *st, int request, void *ptr); | | int speex_preprocess_ctl(SpeexPreprocessState *st, int request, void *ptr); | |
| | | | |
| #define SPEEX_PREPROCESS_SET_DENOISE 0 | | #define SPEEX_PREPROCESS_SET_DENOISE 0 | |
| #define SPEEX_PREPROCESS_GET_DENOISE 1 | | #define SPEEX_PREPROCESS_GET_DENOISE 1 | |
| | | | |
| #define SPEEX_PREPROCESS_SET_AGC 2 | | #define SPEEX_PREPROCESS_SET_AGC 2 | |
| #define SPEEX_PREPROCESS_GET_AGC 3 | | #define SPEEX_PREPROCESS_GET_AGC 3 | |
| | | | |
| | | | |
End of changes. 3 change blocks. |
| 2 lines changed or deleted | | 4 lines changed or added | |
|
| speex_stereo.h | | speex_stereo.h | |
| | | | |
| skipping to change at line 38 | | skipping to change at line 38 | |
| PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | | PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | |
| PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | | PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | |
| LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | | LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | |
| NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | |
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| */ | | */ | |
| | | | |
| #ifndef STEREO_H | | #ifndef STEREO_H | |
| #define STEREO_H | | #define STEREO_H | |
| | | | |
|
| #include "speex_bits.h" | | #include "speex/speex_types.h" | |
| | | #include "speex/speex_bits.h" | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| /** State used for decoding (intensity) stereo information */ | | /** State used for decoding (intensity) stereo information */ | |
| typedef struct SpeexStereoState { | | typedef struct SpeexStereoState { | |
| float balance; /**< Left/right balance info */ | | float balance; /**< Left/right balance info */ | |
| float e_ratio; /**< Ratio of energies: E(left+right)/[E(left)+E(rig
ht)] */ | | float e_ratio; /**< Ratio of energies: E(left+right)/[E(left)+E(rig
ht)] */ | |
| float smooth_left; /**< Smoothed left channel gain */ | | float smooth_left; /**< Smoothed left channel gain */ | |
| | | | |
| skipping to change at line 61 | | skipping to change at line 62 | |
| float reserved2; /**< Reserved for future use */ | | float reserved2; /**< Reserved for future use */ | |
| } SpeexStereoState; | | } SpeexStereoState; | |
| | | | |
| /** Initialization value for a stereo state */ | | /** Initialization value for a stereo state */ | |
| #define SPEEX_STEREO_STATE_INIT {1,.5,1,1} | | #define SPEEX_STEREO_STATE_INIT {1,.5,1,1} | |
| | | | |
| /** Transforms a stereo frame into a mono frame and stores intensity stereo
info in 'bits' */ | | /** Transforms a stereo frame into a mono frame and stores intensity stereo
info in 'bits' */ | |
| void speex_encode_stereo(float *data, int frame_size, SpeexBits *bits); | | void speex_encode_stereo(float *data, int frame_size, SpeexBits *bits); | |
| | | | |
| /** Transforms a stereo frame into a mono frame and stores intensity stereo
info in 'bits' */ | | /** Transforms a stereo frame into a mono frame and stores intensity stereo
info in 'bits' */ | |
|
| void speex_encode_stereo_int(short *data, int frame_size, SpeexBits *bits); | | void speex_encode_stereo_int(spx_int16_t *data, int frame_size, SpeexBits *
bits); | |
| | | | |
| /** Transforms a mono frame into a stereo frame using intensity stereo info
*/ | | /** Transforms a mono frame into a stereo frame using intensity stereo info
*/ | |
| void speex_decode_stereo(float *data, int frame_size, SpeexStereoState *ste
reo); | | void speex_decode_stereo(float *data, int frame_size, SpeexStereoState *ste
reo); | |
| | | | |
| /** Transforms a mono frame into a stereo frame using intensity stereo info
*/ | | /** Transforms a mono frame into a stereo frame using intensity stereo info
*/ | |
|
| void speex_decode_stereo_int(short *data, int frame_size, SpeexStereoState
*stereo); | | void speex_decode_stereo_int(spx_int16_t *data, int frame_size, SpeexStereo
State *stereo); | |
| | | | |
| /** Callback handler for intensity stereo info */ | | /** Callback handler for intensity stereo info */ | |
| int speex_std_stereo_request_handler(SpeexBits *bits, void *state, void *da
ta); | | int speex_std_stereo_request_handler(SpeexBits *bits, void *state, void *da
ta); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 3 change blocks. |
| 3 lines changed or deleted | | 4 lines changed or added | |
|