mirror of
https://github.com/mackron/miniaudio.git
synced 2026-04-24 09:14:04 +02:00
Remove the Speex resampler.
This commit is contained in:
David Reid
@@ -1,32 +0,0 @@
|
|||||||
This code in the `thirdparty` directory is taken from opus-tools (https://github.com/xiph/opus-tools). Note
|
|
||||||
that unlike miniaudio, this code is _not_ public domain. The opus-tools license is below:
|
|
||||||
|
|
||||||
```
|
|
||||||
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.
|
|
||||||
|
|
||||||
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.
|
|
||||||
```
|
|
||||||
|
|
||||||
Note that miniaudio does not use any of this code by default and is strictly opt-in. While miniaudio reproduces
|
|
||||||
this license text in it's source redistributions (in this file, and in each source file), it does not have any
|
|
||||||
control over binary distributions. When opting-in to use the Speex resampler you will need to consider this if
|
|
||||||
you redistribute a binary.
|
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
|
|
||||||
#ifndef ma_speex_resampler_h
|
|
||||||
#define ma_speex_resampler_h
|
|
||||||
|
|
||||||
#define OUTSIDE_SPEEX
|
|
||||||
#define RANDOM_PREFIX ma_speex
|
|
||||||
#include "thirdparty/speex_resampler.h"
|
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
|
||||||
typedef unsigned __int64 spx_uint64_t;
|
|
||||||
#else
|
|
||||||
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wlong-long"
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma GCC diagnostic ignored "-Wc++11-long-long"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
typedef unsigned long long spx_uint64_t;
|
|
||||||
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int ma_speex_resampler_get_required_input_frame_count(const SpeexResamplerState* st, spx_uint64_t out_len, spx_uint64_t* in_len);
|
|
||||||
int ma_speex_resampler_get_expected_output_frame_count(const SpeexResamplerState* st, spx_uint64_t in_len, spx_uint64_t* out_len);
|
|
||||||
|
|
||||||
#endif /* ma_speex_resampler_h */
|
|
||||||
|
|
||||||
#if defined(MINIAUDIO_SPEEX_RESAMPLER_IMPLEMENTATION)
|
|
||||||
/* The Speex resampler uses "inline", which is not defined for C89. We need to define it here. */
|
|
||||||
#if !defined(__cplusplus)
|
|
||||||
#if defined(__GNUC__) && !defined(_MSC_VER)
|
|
||||||
#if defined(__STRICT_ANSI__)
|
|
||||||
#if !defined(inline)
|
|
||||||
#define inline __inline__ __attribute__((always_inline))
|
|
||||||
#define MA_SPEEX_INLINE_DEFINED
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#if defined(_MSC_VER) && _MSC_VER <= 1400 /* 1400 = Visual Studio 2005 */
|
|
||||||
#define inline _inline
|
|
||||||
#define MA_SPEEX_INLINE_DEFINED
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(__clang__)
|
|
||||||
#pragma warning(push)
|
|
||||||
#pragma warning(disable:4244) /* conversion from 'x' to 'y', possible loss of data */
|
|
||||||
#pragma warning(disable:4018) /* signed/unsigned mismatch */
|
|
||||||
#pragma warning(disable:4706) /* assignment within conditional expression */
|
|
||||||
#elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wsign-compare" /* comparison between signed and unsigned integer expressions */
|
|
||||||
#endif
|
|
||||||
#include "thirdparty/resample.c"
|
|
||||||
#if defined(_MSC_VER) && !defined(__clang__)
|
|
||||||
#pragma warning(pop)
|
|
||||||
#elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MA_SPEEX_INLINE_DEFINED)
|
|
||||||
#undef inline
|
|
||||||
#undef MA_SPEEX_INLINE_DEFINED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EXPORT int ma_speex_resampler_get_required_input_frame_count(const SpeexResamplerState* st, spx_uint64_t out_len, spx_uint64_t* in_len)
|
|
||||||
{
|
|
||||||
spx_uint64_t count;
|
|
||||||
|
|
||||||
if (st == NULL || in_len == NULL) {
|
|
||||||
return RESAMPLER_ERR_INVALID_ARG;
|
|
||||||
}
|
|
||||||
|
|
||||||
*in_len = 0;
|
|
||||||
|
|
||||||
if (out_len == 0) {
|
|
||||||
return RESAMPLER_ERR_SUCCESS; /* Nothing to do. */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* miniaudio only uses interleaved APIs so we can safely just use channel index 0 for the calculations. */
|
|
||||||
if (st->nb_channels == 0) {
|
|
||||||
return RESAMPLER_ERR_BAD_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
count = out_len * st->int_advance;
|
|
||||||
count += (st->samp_frac_num[0] + (out_len * st->frac_advance)) / st->den_rate;
|
|
||||||
|
|
||||||
*in_len = count;
|
|
||||||
|
|
||||||
return RESAMPLER_ERR_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
EXPORT int ma_speex_resampler_get_expected_output_frame_count(const SpeexResamplerState* st, spx_uint64_t in_len, spx_uint64_t* out_len)
|
|
||||||
{
|
|
||||||
spx_uint64_t count;
|
|
||||||
spx_uint64_t last_sample;
|
|
||||||
spx_uint32_t samp_frac_num;
|
|
||||||
|
|
||||||
if (st == NULL || out_len == NULL) {
|
|
||||||
return RESAMPLER_ERR_INVALID_ARG;
|
|
||||||
}
|
|
||||||
|
|
||||||
*out_len = 0;
|
|
||||||
|
|
||||||
if (out_len == 0) {
|
|
||||||
return RESAMPLER_ERR_SUCCESS; /* Nothing to do. */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* miniaudio only uses interleaved APIs so we can safely just use channel index 0 for the calculations. */
|
|
||||||
if (st->nb_channels == 0) {
|
|
||||||
return RESAMPLER_ERR_BAD_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
count = 0;
|
|
||||||
last_sample = st->last_sample[0];
|
|
||||||
samp_frac_num = st->samp_frac_num[0];
|
|
||||||
|
|
||||||
while (!(last_sample >= in_len)) {
|
|
||||||
count += 1;
|
|
||||||
|
|
||||||
last_sample += st->int_advance;
|
|
||||||
samp_frac_num += st->frac_advance;
|
|
||||||
if (samp_frac_num >= st->den_rate) {
|
|
||||||
samp_frac_num -= st->den_rate;
|
|
||||||
last_sample += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
*out_len = count;
|
|
||||||
|
|
||||||
return RESAMPLER_ERR_SUCCESS;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
-219
@@ -1,219 +0,0 @@
|
|||||||
/* Copyright (C) 2003 Jean-Marc Valin */
|
|
||||||
/**
|
|
||||||
@file arch.h
|
|
||||||
@brief Various architecture definitions Speex
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ARCH_H
|
|
||||||
#define ARCH_H
|
|
||||||
|
|
||||||
/* A couple test to catch stupid option combinations */
|
|
||||||
#ifdef FIXED_POINT
|
|
||||||
|
|
||||||
#if ((defined (ARM4_ASM)||defined (ARM4_ASM)) && defined(BFIN_ASM)) || (defined (ARM4_ASM)&&defined(ARM5E_ASM))
|
|
||||||
#error Make up your mind. What CPU do you have?
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#if defined (ARM4_ASM) || defined(ARM5E_ASM) || defined(BFIN_ASM)
|
|
||||||
#error I suppose you can have a [ARM4/ARM5E/Blackfin] that has float instructions?
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef OUTSIDE_SPEEX
|
|
||||||
#include "speex/speexdsp_types.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */
|
|
||||||
#define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */
|
|
||||||
#define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */
|
|
||||||
#define MAX16(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 16-bit value. */
|
|
||||||
#define ABS32(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 32-bit value. */
|
|
||||||
#define MIN32(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 32-bit value. */
|
|
||||||
#define MAX32(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 32-bit value. */
|
|
||||||
|
|
||||||
#ifdef FIXED_POINT
|
|
||||||
|
|
||||||
typedef spx_int16_t spx_word16_t;
|
|
||||||
typedef spx_int32_t spx_word32_t;
|
|
||||||
typedef spx_word32_t spx_mem_t;
|
|
||||||
typedef spx_word16_t spx_coef_t;
|
|
||||||
typedef spx_word16_t spx_lsp_t;
|
|
||||||
typedef spx_word32_t spx_sig_t;
|
|
||||||
|
|
||||||
#define Q15ONE 32767
|
|
||||||
|
|
||||||
#define LPC_SCALING 8192
|
|
||||||
#define SIG_SCALING 16384
|
|
||||||
#define LSP_SCALING 8192.
|
|
||||||
#define GAMMA_SCALING 32768.
|
|
||||||
#define GAIN_SCALING 64
|
|
||||||
#define GAIN_SCALING_1 0.015625
|
|
||||||
|
|
||||||
#define LPC_SHIFT 13
|
|
||||||
#define LSP_SHIFT 13
|
|
||||||
#define SIG_SHIFT 14
|
|
||||||
#define GAIN_SHIFT 6
|
|
||||||
|
|
||||||
#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))
|
|
||||||
|
|
||||||
#define VERY_SMALL 0
|
|
||||||
#define VERY_LARGE32 ((spx_word32_t)2147483647)
|
|
||||||
#define VERY_LARGE16 ((spx_word16_t)32767)
|
|
||||||
#define Q15_ONE ((spx_word16_t)32767)
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef FIXED_DEBUG
|
|
||||||
#include "fixed_debug.h"
|
|
||||||
#else
|
|
||||||
|
|
||||||
#include "fixed_generic.h"
|
|
||||||
|
|
||||||
#ifdef ARM5E_ASM
|
|
||||||
#include "fixed_arm5e.h"
|
|
||||||
#elif defined (ARM4_ASM)
|
|
||||||
#include "fixed_arm4.h"
|
|
||||||
#elif defined (BFIN_ASM)
|
|
||||||
#include "fixed_bfin.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
typedef float spx_mem_t;
|
|
||||||
typedef float spx_coef_t;
|
|
||||||
typedef float spx_lsp_t;
|
|
||||||
typedef float spx_sig_t;
|
|
||||||
typedef float spx_word16_t;
|
|
||||||
typedef float spx_word32_t;
|
|
||||||
|
|
||||||
#define Q15ONE 1.0f
|
|
||||||
#define LPC_SCALING 1.f
|
|
||||||
#define SIG_SCALING 1.f
|
|
||||||
#define LSP_SCALING 1.f
|
|
||||||
#define GAMMA_SCALING 1.f
|
|
||||||
#define GAIN_SCALING 1.f
|
|
||||||
#define GAIN_SCALING_1 1.f
|
|
||||||
|
|
||||||
|
|
||||||
#define VERY_SMALL 1e-15f
|
|
||||||
#define VERY_LARGE32 1e15f
|
|
||||||
#define VERY_LARGE16 1e15f
|
|
||||||
#define Q15_ONE ((spx_word16_t)1.f)
|
|
||||||
|
|
||||||
#define QCONST16(x,bits) (x)
|
|
||||||
#define QCONST32(x,bits) (x)
|
|
||||||
|
|
||||||
#define NEG16(x) (-(x))
|
|
||||||
#define NEG32(x) (-(x))
|
|
||||||
#define EXTRACT16(x) (x)
|
|
||||||
#define EXTEND32(x) (x)
|
|
||||||
#define SHR16(a,shift) (a)
|
|
||||||
#define SHL16(a,shift) (a)
|
|
||||||
#define SHR32(a,shift) (a)
|
|
||||||
#define SHL32(a,shift) (a)
|
|
||||||
#define PSHR16(a,shift) (a)
|
|
||||||
#define PSHR32(a,shift) (a)
|
|
||||||
#define VSHR32(a,shift) (a)
|
|
||||||
#define SATURATE16(x,a) (x)
|
|
||||||
#define SATURATE32(x,a) (x)
|
|
||||||
#define SATURATE32PSHR(x,shift,a) (x)
|
|
||||||
|
|
||||||
#define PSHR(a,shift) (a)
|
|
||||||
#define SHR(a,shift) (a)
|
|
||||||
#define SHL(a,shift) (a)
|
|
||||||
#define SATURATE(x,a) (x)
|
|
||||||
|
|
||||||
#define ADD16(a,b) ((a)+(b))
|
|
||||||
#define SUB16(a,b) ((a)-(b))
|
|
||||||
#define ADD32(a,b) ((a)+(b))
|
|
||||||
#define SUB32(a,b) ((a)-(b))
|
|
||||||
#define MULT16_16_16(a,b) ((a)*(b))
|
|
||||||
#define MULT16_16(a,b) ((spx_word32_t)(a)*(spx_word32_t)(b))
|
|
||||||
#define MAC16_16(c,a,b) ((c)+(spx_word32_t)(a)*(spx_word32_t)(b))
|
|
||||||
|
|
||||||
#define MULT16_32_Q11(a,b) ((a)*(b))
|
|
||||||
#define MULT16_32_Q13(a,b) ((a)*(b))
|
|
||||||
#define MULT16_32_Q14(a,b) ((a)*(b))
|
|
||||||
#define MULT16_32_Q15(a,b) ((a)*(b))
|
|
||||||
#define MULT16_32_P15(a,b) ((a)*(b))
|
|
||||||
|
|
||||||
#define MAC16_32_Q11(c,a,b) ((c)+(a)*(b))
|
|
||||||
#define MAC16_32_Q15(c,a,b) ((c)+(a)*(b))
|
|
||||||
|
|
||||||
#define MAC16_16_Q11(c,a,b) ((c)+(a)*(b))
|
|
||||||
#define MAC16_16_Q13(c,a,b) ((c)+(a)*(b))
|
|
||||||
#define MAC16_16_P13(c,a,b) ((c)+(a)*(b))
|
|
||||||
#define MULT16_16_Q11_32(a,b) ((a)*(b))
|
|
||||||
#define MULT16_16_Q13(a,b) ((a)*(b))
|
|
||||||
#define MULT16_16_Q14(a,b) ((a)*(b))
|
|
||||||
#define MULT16_16_Q15(a,b) ((a)*(b))
|
|
||||||
#define MULT16_16_P15(a,b) ((a)*(b))
|
|
||||||
#define MULT16_16_P13(a,b) ((a)*(b))
|
|
||||||
#define MULT16_16_P14(a,b) ((a)*(b))
|
|
||||||
|
|
||||||
#define DIV32_16(a,b) (((spx_word32_t)(a))/(spx_word16_t)(b))
|
|
||||||
#define PDIV32_16(a,b) (((spx_word32_t)(a))/(spx_word16_t)(b))
|
|
||||||
#define DIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b))
|
|
||||||
#define PDIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b))
|
|
||||||
|
|
||||||
#define WORD2INT(x) ((x) < -32767.5f ? -32768 : \
|
|
||||||
((x) > 32766.5f ? 32767 : (spx_int16_t)floor(.5 + (x))))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
|
|
||||||
|
|
||||||
/* 2 on TI C5x DSP */
|
|
||||||
#define BYTES_PER_CHAR 2
|
|
||||||
#define BITS_PER_CHAR 16
|
|
||||||
#define LOG2_BITS_PER_CHAR 4
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#define BYTES_PER_CHAR 1
|
|
||||||
#define BITS_PER_CHAR 8
|
|
||||||
#define LOG2_BITS_PER_CHAR 3
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef FIXED_DEBUG
|
|
||||||
extern long long spx_mips;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
-1239
File diff suppressed because it is too large
Load Diff
-128
@@ -1,128 +0,0 @@
|
|||||||
/* Copyright (C) 2007-2008 Jean-Marc Valin
|
|
||||||
* Copyright (C) 2008 Thorvald Natvig
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
@file resample_sse.h
|
|
||||||
@brief Resampler functions (SSE version)
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
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 <xmmintrin.h>
|
|
||||||
|
|
||||||
#define OVERRIDE_INNER_PRODUCT_SINGLE
|
|
||||||
static inline float inner_product_single(const float *a, const float *b, unsigned int len)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
float ret;
|
|
||||||
__m128 sum = _mm_setzero_ps();
|
|
||||||
for (i=0;i<len;i+=8)
|
|
||||||
{
|
|
||||||
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_loadu_ps(a+i), _mm_loadu_ps(b+i)));
|
|
||||||
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_loadu_ps(a+i+4), _mm_loadu_ps(b+i+4)));
|
|
||||||
}
|
|
||||||
sum = _mm_add_ps(sum, _mm_movehl_ps(sum, sum));
|
|
||||||
sum = _mm_add_ss(sum, _mm_shuffle_ps(sum, sum, 0x55));
|
|
||||||
_mm_store_ss(&ret, sum);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define OVERRIDE_INTERPOLATE_PRODUCT_SINGLE
|
|
||||||
static inline float interpolate_product_single(const float *a, const float *b, unsigned int len, const spx_uint32_t oversample, float *frac) {
|
|
||||||
int i;
|
|
||||||
float ret;
|
|
||||||
__m128 sum = _mm_setzero_ps();
|
|
||||||
__m128 f = _mm_loadu_ps(frac);
|
|
||||||
for(i=0;i<len;i+=2)
|
|
||||||
{
|
|
||||||
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_load1_ps(a+i), _mm_loadu_ps(b+i*oversample)));
|
|
||||||
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_load1_ps(a+i+1), _mm_loadu_ps(b+(i+1)*oversample)));
|
|
||||||
}
|
|
||||||
sum = _mm_mul_ps(f, sum);
|
|
||||||
sum = _mm_add_ps(sum, _mm_movehl_ps(sum, sum));
|
|
||||||
sum = _mm_add_ss(sum, _mm_shuffle_ps(sum, sum, 0x55));
|
|
||||||
_mm_store_ss(&ret, sum);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __SSE2__
|
|
||||||
#include <emmintrin.h>
|
|
||||||
#define OVERRIDE_INNER_PRODUCT_DOUBLE
|
|
||||||
|
|
||||||
static inline double inner_product_double(const float *a, const float *b, unsigned int len)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
double ret;
|
|
||||||
__m128d sum = _mm_setzero_pd();
|
|
||||||
__m128 t;
|
|
||||||
for (i=0;i<len;i+=8)
|
|
||||||
{
|
|
||||||
t = _mm_mul_ps(_mm_loadu_ps(a+i), _mm_loadu_ps(b+i));
|
|
||||||
sum = _mm_add_pd(sum, _mm_cvtps_pd(t));
|
|
||||||
sum = _mm_add_pd(sum, _mm_cvtps_pd(_mm_movehl_ps(t, t)));
|
|
||||||
|
|
||||||
t = _mm_mul_ps(_mm_loadu_ps(a+i+4), _mm_loadu_ps(b+i+4));
|
|
||||||
sum = _mm_add_pd(sum, _mm_cvtps_pd(t));
|
|
||||||
sum = _mm_add_pd(sum, _mm_cvtps_pd(_mm_movehl_ps(t, t)));
|
|
||||||
}
|
|
||||||
sum = _mm_add_sd(sum, _mm_unpackhi_pd(sum, sum));
|
|
||||||
_mm_store_sd(&ret, sum);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define OVERRIDE_INTERPOLATE_PRODUCT_DOUBLE
|
|
||||||
static inline double interpolate_product_double(const float *a, const float *b, unsigned int len, const spx_uint32_t oversample, float *frac) {
|
|
||||||
int i;
|
|
||||||
double ret;
|
|
||||||
__m128d sum;
|
|
||||||
__m128d sum1 = _mm_setzero_pd();
|
|
||||||
__m128d sum2 = _mm_setzero_pd();
|
|
||||||
__m128 f = _mm_loadu_ps(frac);
|
|
||||||
__m128d f1 = _mm_cvtps_pd(f);
|
|
||||||
__m128d f2 = _mm_cvtps_pd(_mm_movehl_ps(f,f));
|
|
||||||
__m128 t;
|
|
||||||
for(i=0;i<len;i+=2)
|
|
||||||
{
|
|
||||||
t = _mm_mul_ps(_mm_load1_ps(a+i), _mm_loadu_ps(b+i*oversample));
|
|
||||||
sum1 = _mm_add_pd(sum1, _mm_cvtps_pd(t));
|
|
||||||
sum2 = _mm_add_pd(sum2, _mm_cvtps_pd(_mm_movehl_ps(t, t)));
|
|
||||||
|
|
||||||
t = _mm_mul_ps(_mm_load1_ps(a+i+1), _mm_loadu_ps(b+(i+1)*oversample));
|
|
||||||
sum1 = _mm_add_pd(sum1, _mm_cvtps_pd(t));
|
|
||||||
sum2 = _mm_add_pd(sum2, _mm_cvtps_pd(_mm_movehl_ps(t, t)));
|
|
||||||
}
|
|
||||||
sum1 = _mm_mul_pd(f1, sum1);
|
|
||||||
sum2 = _mm_mul_pd(f2, sum2);
|
|
||||||
sum = _mm_add_pd(sum1, sum2);
|
|
||||||
sum = _mm_add_sd(sum, _mm_unpackhi_pd(sum, sum));
|
|
||||||
_mm_store_sd(&ret, sum);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
-343
@@ -1,343 +0,0 @@
|
|||||||
/* Copyright (C) 2007 Jean-Marc Valin
|
|
||||||
|
|
||||||
File: speex_resampler.h
|
|
||||||
Resampling code
|
|
||||||
|
|
||||||
The design goals of this code are:
|
|
||||||
- Very fast algorithm
|
|
||||||
- Low memory requirement
|
|
||||||
- Good *perceptual* quality (and not best SNR)
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions are
|
|
||||||
met:
|
|
||||||
|
|
||||||
1. Redistributions of source code must retain the above copyright notice,
|
|
||||||
this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
2. 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.
|
|
||||||
|
|
||||||
3. The name of the author may not be used to endorse or promote products
|
|
||||||
derived from this software without specific prior written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef SPEEX_RESAMPLER_H
|
|
||||||
#define SPEEX_RESAMPLER_H
|
|
||||||
|
|
||||||
#ifdef OUTSIDE_SPEEX
|
|
||||||
|
|
||||||
/********* WARNING: MENTAL SANITY ENDS HERE *************/
|
|
||||||
|
|
||||||
/* If the resampler is defined outside of Speex, we change the symbol names so that
|
|
||||||
there won't be any clash if linking with Speex later on. */
|
|
||||||
|
|
||||||
/* #define RANDOM_PREFIX your software name here */
|
|
||||||
#ifndef RANDOM_PREFIX
|
|
||||||
#error "Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CAT_PREFIX2(a,b) a ## b
|
|
||||||
#define CAT_PREFIX(a,b) CAT_PREFIX2(a, b)
|
|
||||||
|
|
||||||
#define speex_resampler_init CAT_PREFIX(RANDOM_PREFIX,_resampler_init)
|
|
||||||
#define speex_resampler_init_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_init_frac)
|
|
||||||
#define speex_resampler_destroy CAT_PREFIX(RANDOM_PREFIX,_resampler_destroy)
|
|
||||||
#define speex_resampler_process_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_float)
|
|
||||||
#define speex_resampler_process_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_int)
|
|
||||||
#define speex_resampler_process_interleaved_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_float)
|
|
||||||
#define speex_resampler_process_interleaved_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_int)
|
|
||||||
#define speex_resampler_set_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate)
|
|
||||||
#define speex_resampler_get_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_get_rate)
|
|
||||||
#define speex_resampler_set_rate_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate_frac)
|
|
||||||
#define speex_resampler_get_ratio CAT_PREFIX(RANDOM_PREFIX,_resampler_get_ratio)
|
|
||||||
#define speex_resampler_set_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_set_quality)
|
|
||||||
#define speex_resampler_get_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_get_quality)
|
|
||||||
#define speex_resampler_set_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_input_stride)
|
|
||||||
#define speex_resampler_get_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_stride)
|
|
||||||
#define speex_resampler_set_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_output_stride)
|
|
||||||
#define speex_resampler_get_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_stride)
|
|
||||||
#define speex_resampler_get_input_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_latency)
|
|
||||||
#define speex_resampler_get_output_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_latency)
|
|
||||||
#define speex_resampler_skip_zeros CAT_PREFIX(RANDOM_PREFIX,_resampler_skip_zeros)
|
|
||||||
#define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem)
|
|
||||||
#define speex_resampler_strerror CAT_PREFIX(RANDOM_PREFIX,_resampler_strerror)
|
|
||||||
|
|
||||||
#define spx_int16_t short
|
|
||||||
#define spx_int32_t int
|
|
||||||
#define spx_uint16_t unsigned short
|
|
||||||
#define spx_uint32_t unsigned int
|
|
||||||
|
|
||||||
#define speex_assert(cond)
|
|
||||||
|
|
||||||
#else /* OUTSIDE_SPEEX */
|
|
||||||
|
|
||||||
#include "speexdsp_types.h"
|
|
||||||
|
|
||||||
#endif /* OUTSIDE_SPEEX */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define SPEEX_RESAMPLER_QUALITY_MAX 10
|
|
||||||
#define SPEEX_RESAMPLER_QUALITY_MIN 0
|
|
||||||
#define SPEEX_RESAMPLER_QUALITY_DEFAULT 4
|
|
||||||
#define SPEEX_RESAMPLER_QUALITY_VOIP 3
|
|
||||||
#define SPEEX_RESAMPLER_QUALITY_DESKTOP 5
|
|
||||||
|
|
||||||
enum {
|
|
||||||
RESAMPLER_ERR_SUCCESS = 0,
|
|
||||||
RESAMPLER_ERR_ALLOC_FAILED = 1,
|
|
||||||
RESAMPLER_ERR_BAD_STATE = 2,
|
|
||||||
RESAMPLER_ERR_INVALID_ARG = 3,
|
|
||||||
RESAMPLER_ERR_PTR_OVERLAP = 4,
|
|
||||||
RESAMPLER_ERR_OVERFLOW = 5,
|
|
||||||
|
|
||||||
RESAMPLER_ERR_MAX_ERROR
|
|
||||||
};
|
|
||||||
|
|
||||||
struct SpeexResamplerState_;
|
|
||||||
typedef struct SpeexResamplerState_ SpeexResamplerState;
|
|
||||||
|
|
||||||
/** Create a new resampler with integer input and output rates.
|
|
||||||
* @param nb_channels Number of channels to be processed
|
|
||||||
* @param in_rate Input sampling rate (integer number of Hz).
|
|
||||||
* @param out_rate Output sampling rate (integer number of Hz).
|
|
||||||
* @param quality Resampling quality between 0 and 10, where 0 has poor quality
|
|
||||||
* and 10 has very high quality.
|
|
||||||
* @return Newly created resampler state
|
|
||||||
* @retval NULL Error: not enough memory
|
|
||||||
*/
|
|
||||||
SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels,
|
|
||||||
spx_uint32_t in_rate,
|
|
||||||
spx_uint32_t out_rate,
|
|
||||||
int quality,
|
|
||||||
int *err);
|
|
||||||
|
|
||||||
/** Create a new resampler with fractional input/output rates. The sampling
|
|
||||||
* rate ratio is an arbitrary rational number with both the numerator and
|
|
||||||
* denominator being 32-bit integers.
|
|
||||||
* @param nb_channels Number of channels to be processed
|
|
||||||
* @param ratio_num Numerator of the sampling rate ratio
|
|
||||||
* @param ratio_den Denominator of the sampling rate ratio
|
|
||||||
* @param in_rate Input sampling rate rounded to the nearest integer (in Hz).
|
|
||||||
* @param out_rate Output sampling rate rounded to the nearest integer (in Hz).
|
|
||||||
* @param quality Resampling quality between 0 and 10, where 0 has poor quality
|
|
||||||
* and 10 has very high quality.
|
|
||||||
* @return Newly created resampler state
|
|
||||||
* @retval NULL Error: not enough memory
|
|
||||||
*/
|
|
||||||
SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels,
|
|
||||||
spx_uint32_t ratio_num,
|
|
||||||
spx_uint32_t ratio_den,
|
|
||||||
spx_uint32_t in_rate,
|
|
||||||
spx_uint32_t out_rate,
|
|
||||||
int quality,
|
|
||||||
int *err);
|
|
||||||
|
|
||||||
/** Destroy a resampler state.
|
|
||||||
* @param st Resampler state
|
|
||||||
*/
|
|
||||||
void speex_resampler_destroy(SpeexResamplerState *st);
|
|
||||||
|
|
||||||
/** Resample a float array. The input and output buffers must *not* overlap.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param channel_index Index of the channel to process for the multi-channel
|
|
||||||
* base (0 otherwise)
|
|
||||||
* @param in Input buffer
|
|
||||||
* @param in_len Number of input samples in the input buffer. Returns the
|
|
||||||
* number of samples processed
|
|
||||||
* @param out Output buffer
|
|
||||||
* @param out_len Size of the output buffer. Returns the number of samples written
|
|
||||||
*/
|
|
||||||
int speex_resampler_process_float(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t channel_index,
|
|
||||||
const float *in,
|
|
||||||
spx_uint32_t *in_len,
|
|
||||||
float *out,
|
|
||||||
spx_uint32_t *out_len);
|
|
||||||
|
|
||||||
/** Resample an int array. The input and output buffers must *not* overlap.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param channel_index Index of the channel to process for the multi-channel
|
|
||||||
* base (0 otherwise)
|
|
||||||
* @param in Input buffer
|
|
||||||
* @param in_len Number of input samples in the input buffer. Returns the number
|
|
||||||
* of samples processed
|
|
||||||
* @param out Output buffer
|
|
||||||
* @param out_len Size of the output buffer. Returns the number of samples written
|
|
||||||
*/
|
|
||||||
int speex_resampler_process_int(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t channel_index,
|
|
||||||
const spx_int16_t *in,
|
|
||||||
spx_uint32_t *in_len,
|
|
||||||
spx_int16_t *out,
|
|
||||||
spx_uint32_t *out_len);
|
|
||||||
|
|
||||||
/** Resample an interleaved float array. The input and output buffers must *not* overlap.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param in Input buffer
|
|
||||||
* @param in_len Number of input samples in the input buffer. Returns the number
|
|
||||||
* of samples processed. This is all per-channel.
|
|
||||||
* @param out Output buffer
|
|
||||||
* @param out_len Size of the output buffer. Returns the number of samples written.
|
|
||||||
* This is all per-channel.
|
|
||||||
*/
|
|
||||||
int speex_resampler_process_interleaved_float(SpeexResamplerState *st,
|
|
||||||
const float *in,
|
|
||||||
spx_uint32_t *in_len,
|
|
||||||
float *out,
|
|
||||||
spx_uint32_t *out_len);
|
|
||||||
|
|
||||||
/** Resample an interleaved int array. The input and output buffers must *not* overlap.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param in Input buffer
|
|
||||||
* @param in_len Number of input samples in the input buffer. Returns the number
|
|
||||||
* of samples processed. This is all per-channel.
|
|
||||||
* @param out Output buffer
|
|
||||||
* @param out_len Size of the output buffer. Returns the number of samples written.
|
|
||||||
* This is all per-channel.
|
|
||||||
*/
|
|
||||||
int speex_resampler_process_interleaved_int(SpeexResamplerState *st,
|
|
||||||
const spx_int16_t *in,
|
|
||||||
spx_uint32_t *in_len,
|
|
||||||
spx_int16_t *out,
|
|
||||||
spx_uint32_t *out_len);
|
|
||||||
|
|
||||||
/** Set (change) the input/output sampling rates (integer value).
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param in_rate Input sampling rate (integer number of Hz).
|
|
||||||
* @param out_rate Output sampling rate (integer number of Hz).
|
|
||||||
*/
|
|
||||||
int speex_resampler_set_rate(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t in_rate,
|
|
||||||
spx_uint32_t out_rate);
|
|
||||||
|
|
||||||
/** Get the current input/output sampling rates (integer value).
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param in_rate Input sampling rate (integer number of Hz) copied.
|
|
||||||
* @param out_rate Output sampling rate (integer number of Hz) copied.
|
|
||||||
*/
|
|
||||||
void speex_resampler_get_rate(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t *in_rate,
|
|
||||||
spx_uint32_t *out_rate);
|
|
||||||
|
|
||||||
/** Set (change) the input/output sampling rates and resampling ratio
|
|
||||||
* (fractional values in Hz supported).
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param ratio_num Numerator of the sampling rate ratio
|
|
||||||
* @param ratio_den Denominator of the sampling rate ratio
|
|
||||||
* @param in_rate Input sampling rate rounded to the nearest integer (in Hz).
|
|
||||||
* @param out_rate Output sampling rate rounded to the nearest integer (in Hz).
|
|
||||||
*/
|
|
||||||
int speex_resampler_set_rate_frac(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t ratio_num,
|
|
||||||
spx_uint32_t ratio_den,
|
|
||||||
spx_uint32_t in_rate,
|
|
||||||
spx_uint32_t out_rate);
|
|
||||||
|
|
||||||
/** Get the current resampling ratio. This will be reduced to the least
|
|
||||||
* common denominator.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param ratio_num Numerator of the sampling rate ratio copied
|
|
||||||
* @param ratio_den Denominator of the sampling rate ratio copied
|
|
||||||
*/
|
|
||||||
void speex_resampler_get_ratio(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t *ratio_num,
|
|
||||||
spx_uint32_t *ratio_den);
|
|
||||||
|
|
||||||
/** Set (change) the conversion quality.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param quality Resampling quality between 0 and 10, where 0 has poor
|
|
||||||
* quality and 10 has very high quality.
|
|
||||||
*/
|
|
||||||
int speex_resampler_set_quality(SpeexResamplerState *st,
|
|
||||||
int quality);
|
|
||||||
|
|
||||||
/** Get the conversion quality.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param quality Resampling quality between 0 and 10, where 0 has poor
|
|
||||||
* quality and 10 has very high quality.
|
|
||||||
*/
|
|
||||||
void speex_resampler_get_quality(SpeexResamplerState *st,
|
|
||||||
int *quality);
|
|
||||||
|
|
||||||
/** Set (change) the input stride.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param stride Input stride
|
|
||||||
*/
|
|
||||||
void speex_resampler_set_input_stride(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t stride);
|
|
||||||
|
|
||||||
/** Get the input stride.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param stride Input stride copied
|
|
||||||
*/
|
|
||||||
void speex_resampler_get_input_stride(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t *stride);
|
|
||||||
|
|
||||||
/** Set (change) the output stride.
|
|
||||||
* @param st Resampler state
|
|
||||||
* @param stride Output stride
|
|
||||||
*/
|
|
||||||
void speex_resampler_set_output_stride(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t stride);
|
|
||||||
|
|
||||||
/** Get the output stride.
|
|
||||||
* @param st Resampler state copied
|
|
||||||
* @param stride Output stride
|
|
||||||
*/
|
|
||||||
void speex_resampler_get_output_stride(SpeexResamplerState *st,
|
|
||||||
spx_uint32_t *stride);
|
|
||||||
|
|
||||||
/** Get the latency introduced by the resampler measured in input samples.
|
|
||||||
* @param st Resampler state
|
|
||||||
*/
|
|
||||||
int speex_resampler_get_input_latency(SpeexResamplerState *st);
|
|
||||||
|
|
||||||
/** Get the latency introduced by the resampler measured in output samples.
|
|
||||||
* @param st Resampler state
|
|
||||||
*/
|
|
||||||
int speex_resampler_get_output_latency(SpeexResamplerState *st);
|
|
||||||
|
|
||||||
/** Make sure that the first samples to go out of the resamplers don't have
|
|
||||||
* leading zeros. This is only useful before starting to use a newly created
|
|
||||||
* resampler. It is recommended to use that when resampling an audio file, as
|
|
||||||
* it will generate a file with the same length. For real-time processing,
|
|
||||||
* it is probably easier not to use this call (so that the output duration
|
|
||||||
* is the same for the first frame).
|
|
||||||
* @param st Resampler state
|
|
||||||
*/
|
|
||||||
int speex_resampler_skip_zeros(SpeexResamplerState *st);
|
|
||||||
|
|
||||||
/** Reset a resampler so a new (unrelated) stream can be processed.
|
|
||||||
* @param st Resampler state
|
|
||||||
*/
|
|
||||||
int speex_resampler_reset_mem(SpeexResamplerState *st);
|
|
||||||
|
|
||||||
/** Returns the English meaning for an error code
|
|
||||||
* @param err Error code
|
|
||||||
* @return English string
|
|
||||||
*/
|
|
||||||
const char *speex_resampler_strerror(int err);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+3
-330
@@ -826,19 +826,14 @@ The resampler supports multiple channels and is always interleaved (both input a
|
|||||||
The sample rates can be anything other than zero, and are always specified in hertz. They should be set to something like 44100, etc. The sample rate is the
|
The sample rates can be anything other than zero, and are always specified in hertz. They should be set to something like 44100, etc. The sample rate is the
|
||||||
only configuration property that can be changed after initialization.
|
only configuration property that can be changed after initialization.
|
||||||
|
|
||||||
The miniaudio resampler supports multiple algorithms:
|
The miniaudio resampler has built-in support for the following algorithms:
|
||||||
|
|
||||||
+-----------+------------------------------+
|
+-----------+------------------------------+
|
||||||
| Algorithm | Enum Token |
|
| Algorithm | Enum Token |
|
||||||
+-----------+------------------------------+
|
+-----------+------------------------------+
|
||||||
| Linear | ma_resample_algorithm_linear |
|
| Linear | ma_resample_algorithm_linear |
|
||||||
| Speex | ma_resample_algorithm_speex |
|
|
||||||
+-----------+------------------------------+
|
+-----------+------------------------------+
|
||||||
|
|
||||||
Because Speex is not public domain it is strictly opt-in and the code is stored in separate files. if you opt-in to the Speex backend you will need to consider
|
|
||||||
it's license, the text of which can be found in it's source files in "extras/speex_resampler". Details on how to opt-in to the Speex resampler is explained in
|
|
||||||
the Speex Resampler section below.
|
|
||||||
|
|
||||||
The algorithm cannot be changed after initialization.
|
The algorithm cannot be changed after initialization.
|
||||||
|
|
||||||
Processing always happens on a per PCM frame basis and always assumes interleaved input and output. De-interleaved processing is not supported. To process
|
Processing always happens on a per PCM frame basis and always assumes interleaved input and output. De-interleaved processing is not supported. To process
|
||||||
@@ -860,9 +855,7 @@ with `ma_resampler_get_input_latency()` and `ma_resampler_get_output_latency()`.
|
|||||||
|
|
||||||
6.3.1. Resampling Algorithms
|
6.3.1. Resampling Algorithms
|
||||||
----------------------------
|
----------------------------
|
||||||
The choice of resampling algorithm depends on your situation and requirements. The linear resampler is the most efficient and has the least amount of latency,
|
The choice of resampling algorithm depends on your situation and requirements.
|
||||||
but at the expense of poorer quality. The Speex resampler is higher quality, but slower with more latency. It also performs several heap allocations internally
|
|
||||||
for memory management.
|
|
||||||
|
|
||||||
|
|
||||||
6.3.1.1. Linear Resampling
|
6.3.1.1. Linear Resampling
|
||||||
@@ -883,30 +876,6 @@ and is a purely perceptual configuration.
|
|||||||
The API for the linear resampler is the same as the main resampler API, only it's called `ma_linear_resampler`.
|
The API for the linear resampler is the same as the main resampler API, only it's called `ma_linear_resampler`.
|
||||||
|
|
||||||
|
|
||||||
6.3.1.2. Speex Resampling
|
|
||||||
-------------------------
|
|
||||||
The Speex resampler is made up of third party code which is released under the BSD license. Because it is licensed differently to miniaudio, which is public
|
|
||||||
domain, it is strictly opt-in and all of it's code is stored in separate files. If you opt-in to the Speex resampler you must consider the license text in it's
|
|
||||||
source files. To opt-in, you must first `#include` the following file before the implementation of miniaudio.h:
|
|
||||||
|
|
||||||
```c
|
|
||||||
#include "extras/speex_resampler/ma_speex_resampler.h"
|
|
||||||
```
|
|
||||||
|
|
||||||
Both the header and implementation is contained within the same file. The implementation can be included in your program like so:
|
|
||||||
|
|
||||||
```c
|
|
||||||
#define MINIAUDIO_SPEEX_RESAMPLER_IMPLEMENTATION
|
|
||||||
#include "extras/speex_resampler/ma_speex_resampler.h"
|
|
||||||
```
|
|
||||||
|
|
||||||
Note that even if you opt-in to the Speex backend, miniaudio won't use it unless you explicitly ask for it in the respective config of the object you are
|
|
||||||
initializing. If you try to use the Speex resampler without opting in, initialization of the `ma_resampler` object will fail with `MA_NO_BACKEND`.
|
|
||||||
|
|
||||||
The only configuration option to consider with the Speex resampler is the `speex.quality` config variable. This is a value between 0 and 10, with 0 being
|
|
||||||
the fastest with the poorest quality and 10 being the slowest with the highest quality. The default value is 3.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
6.4. General Data Conversion
|
6.4. General Data Conversion
|
||||||
----------------------------
|
----------------------------
|
||||||
@@ -2503,8 +2472,7 @@ MA_API ma_uint64 ma_linear_resampler_get_output_latency(const ma_linear_resample
|
|||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
ma_resample_algorithm_linear = 0, /* Fastest, lowest quality. Optional low-pass filtering. Default. */
|
ma_resample_algorithm_linear = 0 /* Fastest, lowest quality. Optional low-pass filtering. Default. */
|
||||||
ma_resample_algorithm_speex
|
|
||||||
} ma_resample_algorithm;
|
} ma_resample_algorithm;
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
@@ -2519,10 +2487,6 @@ typedef struct
|
|||||||
ma_uint32 lpfOrder;
|
ma_uint32 lpfOrder;
|
||||||
double lpfNyquistFactor;
|
double lpfNyquistFactor;
|
||||||
} linear;
|
} linear;
|
||||||
struct
|
|
||||||
{
|
|
||||||
int quality; /* 0 to 10. Defaults to 3. */
|
|
||||||
} speex;
|
|
||||||
} ma_resampler_config;
|
} ma_resampler_config;
|
||||||
|
|
||||||
MA_API ma_resampler_config ma_resampler_config_init(ma_format format, ma_uint32 channels, ma_uint32 sampleRateIn, ma_uint32 sampleRateOut, ma_resample_algorithm algorithm);
|
MA_API ma_resampler_config ma_resampler_config_init(ma_format format, ma_uint32 channels, ma_uint32 sampleRateIn, ma_uint32 sampleRateOut, ma_resample_algorithm algorithm);
|
||||||
@@ -2533,10 +2497,6 @@ typedef struct
|
|||||||
union
|
union
|
||||||
{
|
{
|
||||||
ma_linear_resampler linear;
|
ma_linear_resampler linear;
|
||||||
struct
|
|
||||||
{
|
|
||||||
void* pSpeexResamplerState; /* SpeexResamplerState* */
|
|
||||||
} speex;
|
|
||||||
} state;
|
} state;
|
||||||
} ma_resampler;
|
} ma_resampler;
|
||||||
|
|
||||||
@@ -2686,10 +2646,6 @@ typedef struct
|
|||||||
ma_uint32 lpfOrder;
|
ma_uint32 lpfOrder;
|
||||||
double lpfNyquistFactor;
|
double lpfNyquistFactor;
|
||||||
} linear;
|
} linear;
|
||||||
struct
|
|
||||||
{
|
|
||||||
int quality;
|
|
||||||
} speex;
|
|
||||||
} resampling;
|
} resampling;
|
||||||
} ma_data_converter_config;
|
} ma_data_converter_config;
|
||||||
|
|
||||||
@@ -3398,10 +3354,6 @@ struct ma_device_config
|
|||||||
{
|
{
|
||||||
ma_uint32 lpfOrder;
|
ma_uint32 lpfOrder;
|
||||||
} linear;
|
} linear;
|
||||||
struct
|
|
||||||
{
|
|
||||||
int quality;
|
|
||||||
} speex;
|
|
||||||
} resampling;
|
} resampling;
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
@@ -4071,10 +4023,6 @@ struct ma_device
|
|||||||
{
|
{
|
||||||
ma_uint32 lpfOrder;
|
ma_uint32 lpfOrder;
|
||||||
} linear;
|
} linear;
|
||||||
struct
|
|
||||||
{
|
|
||||||
int quality;
|
|
||||||
} speex;
|
|
||||||
} resampling;
|
} resampling;
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
@@ -6171,10 +6119,6 @@ typedef struct
|
|||||||
{
|
{
|
||||||
ma_uint32 lpfOrder;
|
ma_uint32 lpfOrder;
|
||||||
} linear;
|
} linear;
|
||||||
struct
|
|
||||||
{
|
|
||||||
int quality;
|
|
||||||
} speex;
|
|
||||||
} resampling;
|
} resampling;
|
||||||
ma_allocation_callbacks allocationCallbacks;
|
ma_allocation_callbacks allocationCallbacks;
|
||||||
ma_encoding_format encodingFormat;
|
ma_encoding_format encodingFormat;
|
||||||
@@ -32620,7 +32564,6 @@ static ma_result ma_device__post_init_setup(ma_device* pDevice, ma_device_type d
|
|||||||
converterConfig.resampling.allowDynamicSampleRate = MA_FALSE;
|
converterConfig.resampling.allowDynamicSampleRate = MA_FALSE;
|
||||||
converterConfig.resampling.algorithm = pDevice->resampling.algorithm;
|
converterConfig.resampling.algorithm = pDevice->resampling.algorithm;
|
||||||
converterConfig.resampling.linear.lpfOrder = pDevice->resampling.linear.lpfOrder;
|
converterConfig.resampling.linear.lpfOrder = pDevice->resampling.linear.lpfOrder;
|
||||||
converterConfig.resampling.speex.quality = pDevice->resampling.speex.quality;
|
|
||||||
|
|
||||||
result = ma_data_converter_init(&converterConfig, &pDevice->capture.converter);
|
result = ma_data_converter_init(&converterConfig, &pDevice->capture.converter);
|
||||||
if (result != MA_SUCCESS) {
|
if (result != MA_SUCCESS) {
|
||||||
@@ -32643,7 +32586,6 @@ static ma_result ma_device__post_init_setup(ma_device* pDevice, ma_device_type d
|
|||||||
converterConfig.resampling.allowDynamicSampleRate = MA_FALSE;
|
converterConfig.resampling.allowDynamicSampleRate = MA_FALSE;
|
||||||
converterConfig.resampling.algorithm = pDevice->resampling.algorithm;
|
converterConfig.resampling.algorithm = pDevice->resampling.algorithm;
|
||||||
converterConfig.resampling.linear.lpfOrder = pDevice->resampling.linear.lpfOrder;
|
converterConfig.resampling.linear.lpfOrder = pDevice->resampling.linear.lpfOrder;
|
||||||
converterConfig.resampling.speex.quality = pDevice->resampling.speex.quality;
|
|
||||||
|
|
||||||
result = ma_data_converter_init(&converterConfig, &pDevice->playback.converter);
|
result = ma_data_converter_init(&converterConfig, &pDevice->playback.converter);
|
||||||
if (result != MA_SUCCESS) {
|
if (result != MA_SUCCESS) {
|
||||||
@@ -33350,7 +33292,6 @@ MA_API ma_device_config ma_device_config_init(ma_device_type deviceType)
|
|||||||
/* Resampling defaults. We must never use the Speex backend by default because it uses licensed third party code. */
|
/* Resampling defaults. We must never use the Speex backend by default because it uses licensed third party code. */
|
||||||
config.resampling.algorithm = ma_resample_algorithm_linear;
|
config.resampling.algorithm = ma_resample_algorithm_linear;
|
||||||
config.resampling.linear.lpfOrder = ma_min(MA_DEFAULT_RESAMPLER_LPF_ORDER, MA_MAX_FILTER_ORDER);
|
config.resampling.linear.lpfOrder = ma_min(MA_DEFAULT_RESAMPLER_LPF_ORDER, MA_MAX_FILTER_ORDER);
|
||||||
config.resampling.speex.quality = 3;
|
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
@@ -33427,7 +33368,6 @@ MA_API ma_result ma_device_init(ma_context* pContext, const ma_device_config* pC
|
|||||||
pDevice->sampleRate = pConfig->sampleRate;
|
pDevice->sampleRate = pConfig->sampleRate;
|
||||||
pDevice->resampling.algorithm = pConfig->resampling.algorithm;
|
pDevice->resampling.algorithm = pConfig->resampling.algorithm;
|
||||||
pDevice->resampling.linear.lpfOrder = pConfig->resampling.linear.lpfOrder;
|
pDevice->resampling.linear.lpfOrder = pConfig->resampling.linear.lpfOrder;
|
||||||
pDevice->resampling.speex.quality = pConfig->resampling.speex.quality;
|
|
||||||
|
|
||||||
pDevice->capture.shareMode = pConfig->capture.shareMode;
|
pDevice->capture.shareMode = pConfig->capture.shareMode;
|
||||||
pDevice->capture.format = pConfig->capture.format;
|
pDevice->capture.format = pConfig->capture.format;
|
||||||
@@ -39361,24 +39301,6 @@ MA_API ma_uint64 ma_linear_resampler_get_output_latency(const ma_linear_resample
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if defined(ma_speex_resampler_h)
|
|
||||||
#define MA_HAS_SPEEX_RESAMPLER
|
|
||||||
|
|
||||||
static ma_result ma_result_from_speex_err(int err)
|
|
||||||
{
|
|
||||||
switch (err)
|
|
||||||
{
|
|
||||||
case RESAMPLER_ERR_SUCCESS: return MA_SUCCESS;
|
|
||||||
case RESAMPLER_ERR_ALLOC_FAILED: return MA_OUT_OF_MEMORY;
|
|
||||||
case RESAMPLER_ERR_BAD_STATE: return MA_ERROR;
|
|
||||||
case RESAMPLER_ERR_INVALID_ARG: return MA_INVALID_ARGS;
|
|
||||||
case RESAMPLER_ERR_PTR_OVERLAP: return MA_INVALID_ARGS;
|
|
||||||
case RESAMPLER_ERR_OVERFLOW: return MA_ERROR;
|
|
||||||
default: return MA_ERROR;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif /* ma_speex_resampler_h */
|
|
||||||
|
|
||||||
MA_API ma_resampler_config ma_resampler_config_init(ma_format format, ma_uint32 channels, ma_uint32 sampleRateIn, ma_uint32 sampleRateOut, ma_resample_algorithm algorithm)
|
MA_API ma_resampler_config ma_resampler_config_init(ma_format format, ma_uint32 channels, ma_uint32 sampleRateIn, ma_uint32 sampleRateOut, ma_resample_algorithm algorithm)
|
||||||
{
|
{
|
||||||
ma_resampler_config config;
|
ma_resampler_config config;
|
||||||
@@ -39394,9 +39316,6 @@ MA_API ma_resampler_config ma_resampler_config_init(ma_format format, ma_uint32
|
|||||||
config.linear.lpfOrder = ma_min(MA_DEFAULT_RESAMPLER_LPF_ORDER, MA_MAX_FILTER_ORDER);
|
config.linear.lpfOrder = ma_min(MA_DEFAULT_RESAMPLER_LPF_ORDER, MA_MAX_FILTER_ORDER);
|
||||||
config.linear.lpfNyquistFactor = 1;
|
config.linear.lpfNyquistFactor = 1;
|
||||||
|
|
||||||
/* Speex. */
|
|
||||||
config.speex.quality = 3; /* Cannot leave this as 0 as that is actually a valid value for Speex resampling quality. */
|
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39435,20 +39354,6 @@ MA_API ma_result ma_resampler_init(const ma_resampler_config* pConfig, ma_resamp
|
|||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case ma_resample_algorithm_speex:
|
|
||||||
{
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
int speexErr;
|
|
||||||
pResampler->state.speex.pSpeexResamplerState = speex_resampler_init(pConfig->channels, pConfig->sampleRateIn, pConfig->sampleRateOut, pConfig->speex.quality, &speexErr);
|
|
||||||
if (pResampler->state.speex.pSpeexResamplerState == NULL) {
|
|
||||||
return ma_result_from_speex_err(speexErr);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
/* Speex resampler not available. */
|
|
||||||
return MA_NO_BACKEND;
|
|
||||||
#endif
|
|
||||||
} break;
|
|
||||||
|
|
||||||
default: return MA_INVALID_ARGS;
|
default: return MA_INVALID_ARGS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39464,12 +39369,6 @@ MA_API void ma_resampler_uninit(ma_resampler* pResampler)
|
|||||||
if (pResampler->config.algorithm == ma_resample_algorithm_linear) {
|
if (pResampler->config.algorithm == ma_resample_algorithm_linear) {
|
||||||
ma_linear_resampler_uninit(&pResampler->state.linear);
|
ma_linear_resampler_uninit(&pResampler->state.linear);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
if (pResampler->config.algorithm == ma_resample_algorithm_speex) {
|
|
||||||
speex_resampler_destroy((SpeexResamplerState*)pResampler->state.speex.pSpeexResamplerState);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static ma_result ma_resampler_process_pcm_frames__read__linear(ma_resampler* pResampler, const void* pFramesIn, ma_uint64* pFrameCountIn, void* pFramesOut, ma_uint64* pFrameCountOut)
|
static ma_result ma_resampler_process_pcm_frames__read__linear(ma_resampler* pResampler, const void* pFramesIn, ma_uint64* pFrameCountIn, void* pFramesOut, ma_uint64* pFrameCountOut)
|
||||||
@@ -39477,76 +39376,6 @@ static ma_result ma_resampler_process_pcm_frames__read__linear(ma_resampler* pRe
|
|||||||
return ma_linear_resampler_process_pcm_frames(&pResampler->state.linear, pFramesIn, pFrameCountIn, pFramesOut, pFrameCountOut);
|
return ma_linear_resampler_process_pcm_frames(&pResampler->state.linear, pFramesIn, pFrameCountIn, pFramesOut, pFrameCountOut);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
static ma_result ma_resampler_process_pcm_frames__read__speex(ma_resampler* pResampler, const void* pFramesIn, ma_uint64* pFrameCountIn, void* pFramesOut, ma_uint64* pFrameCountOut)
|
|
||||||
{
|
|
||||||
int speexErr;
|
|
||||||
ma_uint64 frameCountOut;
|
|
||||||
ma_uint64 frameCountIn;
|
|
||||||
ma_uint64 framesProcessedOut;
|
|
||||||
ma_uint64 framesProcessedIn;
|
|
||||||
unsigned int framesPerIteration = UINT_MAX;
|
|
||||||
|
|
||||||
MA_ASSERT(pResampler != NULL);
|
|
||||||
MA_ASSERT(pFramesOut != NULL);
|
|
||||||
MA_ASSERT(pFrameCountOut != NULL);
|
|
||||||
MA_ASSERT(pFrameCountIn != NULL);
|
|
||||||
|
|
||||||
/*
|
|
||||||
Reading from the Speex resampler requires a bit of dancing around for a few reasons. The first thing is that it's frame counts
|
|
||||||
are in unsigned int's whereas ours is in ma_uint64. We therefore need to run the conversion in a loop. The other, more complicated
|
|
||||||
problem, is that we need to keep track of the input time, similar to what we do with the linear resampler. The reason we need to
|
|
||||||
do this is for ma_resampler_get_required_input_frame_count() and ma_resampler_get_expected_output_frame_count().
|
|
||||||
*/
|
|
||||||
frameCountOut = *pFrameCountOut;
|
|
||||||
frameCountIn = *pFrameCountIn;
|
|
||||||
framesProcessedOut = 0;
|
|
||||||
framesProcessedIn = 0;
|
|
||||||
|
|
||||||
while (framesProcessedOut < frameCountOut && framesProcessedIn < frameCountIn) {
|
|
||||||
unsigned int frameCountInThisIteration;
|
|
||||||
unsigned int frameCountOutThisIteration;
|
|
||||||
const void* pFramesInThisIteration;
|
|
||||||
void* pFramesOutThisIteration;
|
|
||||||
|
|
||||||
frameCountInThisIteration = framesPerIteration;
|
|
||||||
if ((ma_uint64)frameCountInThisIteration > (frameCountIn - framesProcessedIn)) {
|
|
||||||
frameCountInThisIteration = (unsigned int)(frameCountIn - framesProcessedIn);
|
|
||||||
}
|
|
||||||
|
|
||||||
frameCountOutThisIteration = framesPerIteration;
|
|
||||||
if ((ma_uint64)frameCountOutThisIteration > (frameCountOut - framesProcessedOut)) {
|
|
||||||
frameCountOutThisIteration = (unsigned int)(frameCountOut - framesProcessedOut);
|
|
||||||
}
|
|
||||||
|
|
||||||
pFramesInThisIteration = ma_offset_ptr(pFramesIn, framesProcessedIn * ma_get_bytes_per_frame(pResampler->config.format, pResampler->config.channels));
|
|
||||||
pFramesOutThisIteration = ma_offset_ptr(pFramesOut, framesProcessedOut * ma_get_bytes_per_frame(pResampler->config.format, pResampler->config.channels));
|
|
||||||
|
|
||||||
if (pResampler->config.format == ma_format_f32) {
|
|
||||||
speexErr = speex_resampler_process_interleaved_float((SpeexResamplerState*)pResampler->state.speex.pSpeexResamplerState, (const float*)pFramesInThisIteration, &frameCountInThisIteration, (float*)pFramesOutThisIteration, &frameCountOutThisIteration);
|
|
||||||
} else if (pResampler->config.format == ma_format_s16) {
|
|
||||||
speexErr = speex_resampler_process_interleaved_int((SpeexResamplerState*)pResampler->state.speex.pSpeexResamplerState, (const spx_int16_t*)pFramesInThisIteration, &frameCountInThisIteration, (spx_int16_t*)pFramesOutThisIteration, &frameCountOutThisIteration);
|
|
||||||
} else {
|
|
||||||
/* Format not supported. Should never get here. */
|
|
||||||
MA_ASSERT(MA_FALSE);
|
|
||||||
return MA_INVALID_OPERATION;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (speexErr != RESAMPLER_ERR_SUCCESS) {
|
|
||||||
return ma_result_from_speex_err(speexErr);
|
|
||||||
}
|
|
||||||
|
|
||||||
framesProcessedIn += frameCountInThisIteration;
|
|
||||||
framesProcessedOut += frameCountOutThisIteration;
|
|
||||||
}
|
|
||||||
|
|
||||||
*pFrameCountOut = framesProcessedOut;
|
|
||||||
*pFrameCountIn = framesProcessedIn;
|
|
||||||
|
|
||||||
return MA_SUCCESS;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static ma_result ma_resampler_process_pcm_frames__read(ma_resampler* pResampler, const void* pFramesIn, ma_uint64* pFrameCountIn, void* pFramesOut, ma_uint64* pFrameCountOut)
|
static ma_result ma_resampler_process_pcm_frames__read(ma_resampler* pResampler, const void* pFramesIn, ma_uint64* pFrameCountIn, void* pFramesOut, ma_uint64* pFrameCountOut)
|
||||||
{
|
{
|
||||||
MA_ASSERT(pResampler != NULL);
|
MA_ASSERT(pResampler != NULL);
|
||||||
@@ -39569,15 +39398,6 @@ static ma_result ma_resampler_process_pcm_frames__read(ma_resampler* pResampler,
|
|||||||
return ma_resampler_process_pcm_frames__read__linear(pResampler, pFramesIn, pFrameCountIn, pFramesOut, pFrameCountOut);
|
return ma_resampler_process_pcm_frames__read__linear(pResampler, pFramesIn, pFrameCountIn, pFramesOut, pFrameCountOut);
|
||||||
}
|
}
|
||||||
|
|
||||||
case ma_resample_algorithm_speex:
|
|
||||||
{
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
return ma_resampler_process_pcm_frames__read__speex(pResampler, pFramesIn, pFrameCountIn, pFramesOut, pFrameCountOut);
|
|
||||||
#else
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39595,81 +39415,6 @@ static ma_result ma_resampler_process_pcm_frames__seek__linear(ma_resampler* pRe
|
|||||||
return ma_linear_resampler_process_pcm_frames(&pResampler->state.linear, pFramesIn, pFrameCountIn, NULL, pFrameCountOut);
|
return ma_linear_resampler_process_pcm_frames(&pResampler->state.linear, pFramesIn, pFrameCountIn, NULL, pFrameCountOut);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
static ma_result ma_resampler_process_pcm_frames__seek__speex(ma_resampler* pResampler, const void* pFramesIn, ma_uint64* pFrameCountIn, ma_uint64* pFrameCountOut)
|
|
||||||
{
|
|
||||||
/* The generic seek method is implemented in on top of ma_resampler_process_pcm_frames__read() by just processing into a dummy buffer. */
|
|
||||||
float devnull[4096];
|
|
||||||
ma_uint64 totalOutputFramesToProcess;
|
|
||||||
ma_uint64 totalOutputFramesProcessed;
|
|
||||||
ma_uint64 totalInputFramesProcessed;
|
|
||||||
ma_uint32 bpf;
|
|
||||||
ma_result result;
|
|
||||||
|
|
||||||
MA_ASSERT(pResampler != NULL);
|
|
||||||
|
|
||||||
totalOutputFramesProcessed = 0;
|
|
||||||
totalInputFramesProcessed = 0;
|
|
||||||
bpf = ma_get_bytes_per_frame(pResampler->config.format, pResampler->config.channels);
|
|
||||||
|
|
||||||
if (pFrameCountOut != NULL) {
|
|
||||||
/* Seek by output frames. */
|
|
||||||
totalOutputFramesToProcess = *pFrameCountOut;
|
|
||||||
} else {
|
|
||||||
/* Seek by input frames. */
|
|
||||||
MA_ASSERT(pFrameCountIn != NULL);
|
|
||||||
totalOutputFramesToProcess = ma_resampler_get_expected_output_frame_count(pResampler, *pFrameCountIn);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pFramesIn != NULL) {
|
|
||||||
/* Process input data. */
|
|
||||||
MA_ASSERT(pFrameCountIn != NULL);
|
|
||||||
while (totalOutputFramesProcessed < totalOutputFramesToProcess && totalInputFramesProcessed < *pFrameCountIn) {
|
|
||||||
ma_uint64 inputFramesToProcessThisIteration = (*pFrameCountIn - totalInputFramesProcessed);
|
|
||||||
ma_uint64 outputFramesToProcessThisIteration = (totalOutputFramesToProcess - totalOutputFramesProcessed);
|
|
||||||
if (outputFramesToProcessThisIteration > sizeof(devnull) / bpf) {
|
|
||||||
outputFramesToProcessThisIteration = sizeof(devnull) / bpf;
|
|
||||||
}
|
|
||||||
|
|
||||||
result = ma_resampler_process_pcm_frames__read(pResampler, ma_offset_ptr(pFramesIn, totalInputFramesProcessed*bpf), &inputFramesToProcessThisIteration, ma_offset_ptr(devnull, totalOutputFramesProcessed*bpf), &outputFramesToProcessThisIteration);
|
|
||||||
if (result != MA_SUCCESS) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
totalOutputFramesProcessed += outputFramesToProcessThisIteration;
|
|
||||||
totalInputFramesProcessed += inputFramesToProcessThisIteration;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
/* Don't process input data - just update timing and filter state as if zeroes were passed in. */
|
|
||||||
while (totalOutputFramesProcessed < totalOutputFramesToProcess) {
|
|
||||||
ma_uint64 inputFramesToProcessThisIteration = 16384;
|
|
||||||
ma_uint64 outputFramesToProcessThisIteration = (totalOutputFramesToProcess - totalOutputFramesProcessed);
|
|
||||||
if (outputFramesToProcessThisIteration > sizeof(devnull) / bpf) {
|
|
||||||
outputFramesToProcessThisIteration = sizeof(devnull) / bpf;
|
|
||||||
}
|
|
||||||
|
|
||||||
result = ma_resampler_process_pcm_frames__read(pResampler, NULL, &inputFramesToProcessThisIteration, ma_offset_ptr(devnull, totalOutputFramesProcessed*bpf), &outputFramesToProcessThisIteration);
|
|
||||||
if (result != MA_SUCCESS) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
totalOutputFramesProcessed += outputFramesToProcessThisIteration;
|
|
||||||
totalInputFramesProcessed += inputFramesToProcessThisIteration;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (pFrameCountIn != NULL) {
|
|
||||||
*pFrameCountIn = totalInputFramesProcessed;
|
|
||||||
}
|
|
||||||
if (pFrameCountOut != NULL) {
|
|
||||||
*pFrameCountOut = totalOutputFramesProcessed;
|
|
||||||
}
|
|
||||||
|
|
||||||
return MA_SUCCESS;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static ma_result ma_resampler_process_pcm_frames__seek(ma_resampler* pResampler, const void* pFramesIn, ma_uint64* pFrameCountIn, ma_uint64* pFrameCountOut)
|
static ma_result ma_resampler_process_pcm_frames__seek(ma_resampler* pResampler, const void* pFramesIn, ma_uint64* pFrameCountIn, ma_uint64* pFrameCountOut)
|
||||||
{
|
{
|
||||||
MA_ASSERT(pResampler != NULL);
|
MA_ASSERT(pResampler != NULL);
|
||||||
@@ -39681,15 +39426,6 @@ static ma_result ma_resampler_process_pcm_frames__seek(ma_resampler* pResampler,
|
|||||||
return ma_resampler_process_pcm_frames__seek__linear(pResampler, pFramesIn, pFrameCountIn, pFrameCountOut);
|
return ma_resampler_process_pcm_frames__seek__linear(pResampler, pFramesIn, pFrameCountIn, pFrameCountOut);
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case ma_resample_algorithm_speex:
|
|
||||||
{
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
return ma_resampler_process_pcm_frames__seek__speex(pResampler, pFramesIn, pFrameCountIn, pFrameCountOut);
|
|
||||||
#else
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39738,15 +39474,6 @@ MA_API ma_result ma_resampler_set_rate(ma_resampler* pResampler, ma_uint32 sampl
|
|||||||
return ma_linear_resampler_set_rate(&pResampler->state.linear, sampleRateIn, sampleRateOut);
|
return ma_linear_resampler_set_rate(&pResampler->state.linear, sampleRateIn, sampleRateOut);
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case ma_resample_algorithm_speex:
|
|
||||||
{
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
return ma_result_from_speex_err(speex_resampler_set_rate((SpeexResamplerState*)pResampler->state.speex.pSpeexResamplerState, sampleRateIn, sampleRateOut));
|
|
||||||
#else
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39798,21 +39525,6 @@ MA_API ma_uint64 ma_resampler_get_required_input_frame_count(const ma_resampler*
|
|||||||
return ma_linear_resampler_get_required_input_frame_count(&pResampler->state.linear, outputFrameCount);
|
return ma_linear_resampler_get_required_input_frame_count(&pResampler->state.linear, outputFrameCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
case ma_resample_algorithm_speex:
|
|
||||||
{
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
spx_uint64_t count;
|
|
||||||
int speexErr = ma_speex_resampler_get_required_input_frame_count((SpeexResamplerState*)pResampler->state.speex.pSpeexResamplerState, outputFrameCount, &count);
|
|
||||||
if (speexErr != RESAMPLER_ERR_SUCCESS) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (ma_uint64)count;
|
|
||||||
#else
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39838,21 +39550,6 @@ MA_API ma_uint64 ma_resampler_get_expected_output_frame_count(const ma_resampler
|
|||||||
return ma_linear_resampler_get_expected_output_frame_count(&pResampler->state.linear, inputFrameCount);
|
return ma_linear_resampler_get_expected_output_frame_count(&pResampler->state.linear, inputFrameCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
case ma_resample_algorithm_speex:
|
|
||||||
{
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
spx_uint64_t count;
|
|
||||||
int speexErr = ma_speex_resampler_get_expected_output_frame_count((SpeexResamplerState*)pResampler->state.speex.pSpeexResamplerState, inputFrameCount, &count);
|
|
||||||
if (speexErr != RESAMPLER_ERR_SUCCESS) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (ma_uint64)count;
|
|
||||||
#else
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39874,15 +39571,6 @@ MA_API ma_uint64 ma_resampler_get_input_latency(const ma_resampler* pResampler)
|
|||||||
return ma_linear_resampler_get_input_latency(&pResampler->state.linear);
|
return ma_linear_resampler_get_input_latency(&pResampler->state.linear);
|
||||||
}
|
}
|
||||||
|
|
||||||
case ma_resample_algorithm_speex:
|
|
||||||
{
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
return (ma_uint64)ma_speex_resampler_get_input_latency((SpeexResamplerState*)pResampler->state.speex.pSpeexResamplerState);
|
|
||||||
#else
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39904,15 +39592,6 @@ MA_API ma_uint64 ma_resampler_get_output_latency(const ma_resampler* pResampler)
|
|||||||
return ma_linear_resampler_get_output_latency(&pResampler->state.linear);
|
return ma_linear_resampler_get_output_latency(&pResampler->state.linear);
|
||||||
}
|
}
|
||||||
|
|
||||||
case ma_resample_algorithm_speex:
|
|
||||||
{
|
|
||||||
#if defined(MA_HAS_SPEEX_RESAMPLER)
|
|
||||||
return (ma_uint64)ma_speex_resampler_get_output_latency((SpeexResamplerState*)pResampler->state.speex.pSpeexResamplerState);
|
|
||||||
#else
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40825,9 +40504,6 @@ MA_API ma_data_converter_config ma_data_converter_config_init_default()
|
|||||||
config.resampling.linear.lpfOrder = 1;
|
config.resampling.linear.lpfOrder = 1;
|
||||||
config.resampling.linear.lpfNyquistFactor = 1;
|
config.resampling.linear.lpfNyquistFactor = 1;
|
||||||
|
|
||||||
/* Speex resampling defaults. */
|
|
||||||
config.resampling.speex.quality = 3;
|
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40928,7 +40604,6 @@ MA_API ma_result ma_data_converter_init(const ma_data_converter_config* pConfig,
|
|||||||
resamplerConfig = ma_resampler_config_init(midFormat, resamplerChannels, pConverter->config.sampleRateIn, pConverter->config.sampleRateOut, pConverter->config.resampling.algorithm);
|
resamplerConfig = ma_resampler_config_init(midFormat, resamplerChannels, pConverter->config.sampleRateIn, pConverter->config.sampleRateOut, pConverter->config.resampling.algorithm);
|
||||||
resamplerConfig.linear.lpfOrder = pConverter->config.resampling.linear.lpfOrder;
|
resamplerConfig.linear.lpfOrder = pConverter->config.resampling.linear.lpfOrder;
|
||||||
resamplerConfig.linear.lpfNyquistFactor = pConverter->config.resampling.linear.lpfNyquistFactor;
|
resamplerConfig.linear.lpfNyquistFactor = pConverter->config.resampling.linear.lpfNyquistFactor;
|
||||||
resamplerConfig.speex.quality = pConverter->config.resampling.speex.quality;
|
|
||||||
|
|
||||||
result = ma_resampler_init(&resamplerConfig, &pConverter->resampler);
|
result = ma_resampler_init(&resamplerConfig, &pConverter->resampler);
|
||||||
if (result != MA_SUCCESS) {
|
if (result != MA_SUCCESS) {
|
||||||
@@ -46793,7 +46468,6 @@ MA_API ma_decoder_config ma_decoder_config_init(ma_format outputFormat, ma_uint3
|
|||||||
config.sampleRate = outputSampleRate;
|
config.sampleRate = outputSampleRate;
|
||||||
config.resampling.algorithm = ma_resample_algorithm_linear;
|
config.resampling.algorithm = ma_resample_algorithm_linear;
|
||||||
config.resampling.linear.lpfOrder = ma_min(MA_DEFAULT_RESAMPLER_LPF_ORDER, MA_MAX_FILTER_ORDER);
|
config.resampling.linear.lpfOrder = ma_min(MA_DEFAULT_RESAMPLER_LPF_ORDER, MA_MAX_FILTER_ORDER);
|
||||||
config.resampling.speex.quality = 3;
|
|
||||||
config.encodingFormat = ma_encoding_format_unknown;
|
config.encodingFormat = ma_encoding_format_unknown;
|
||||||
|
|
||||||
/* Note that we are intentionally leaving the channel map empty here which will cause the default channel map to be used. */
|
/* Note that we are intentionally leaving the channel map empty here which will cause the default channel map to be used. */
|
||||||
@@ -46885,7 +46559,6 @@ static ma_result ma_decoder__init_data_converter(ma_decoder* pDecoder, const ma_
|
|||||||
converterConfig.resampling.allowDynamicSampleRate = MA_FALSE; /* Never allow dynamic sample rate conversion. Setting this to true will disable passthrough optimizations. */
|
converterConfig.resampling.allowDynamicSampleRate = MA_FALSE; /* Never allow dynamic sample rate conversion. Setting this to true will disable passthrough optimizations. */
|
||||||
converterConfig.resampling.algorithm = pConfig->resampling.algorithm;
|
converterConfig.resampling.algorithm = pConfig->resampling.algorithm;
|
||||||
converterConfig.resampling.linear.lpfOrder = pConfig->resampling.linear.lpfOrder;
|
converterConfig.resampling.linear.lpfOrder = pConfig->resampling.linear.lpfOrder;
|
||||||
converterConfig.resampling.speex.quality = pConfig->resampling.speex.quality;
|
|
||||||
|
|
||||||
return ma_data_converter_init(&converterConfig, &pDecoder->converter);
|
return ma_data_converter_init(&converterConfig, &pDecoder->converter);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,25 +4,12 @@ USAGE: audioconverter [input file] [output file] [format] [channels] [rate]
|
|||||||
EXAMPLES:
|
EXAMPLES:
|
||||||
audioconverter my_file.flac my_file.wav
|
audioconverter my_file.flac my_file.wav
|
||||||
audioconverter my_file.flac my_file.wav f32 44100 linear --linear-order 8
|
audioconverter my_file.flac my_file.wav f32 44100 linear --linear-order 8
|
||||||
audioconverter my_file.flac my_file.wav s16 2 44100 speex --speex-quality 10
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
Note about Speex resampling. If you decide to enable the Speex resampler with ENABLE_SPEEX, this program will use licensed third party code. If you compile and
|
|
||||||
redistribute this program you need to include a copy of the license which can be found at https://github.com/xiph/opus-tools/blob/master/COPYING. You can also
|
|
||||||
find a copy of this text in extras/speex_resampler/README.md in the miniaudio repository.
|
|
||||||
*/
|
*/
|
||||||
#define _CRT_SECURE_NO_WARNINGS /* For stb_vorbis' usage of fopen() instead of fopen_s(). */
|
#define _CRT_SECURE_NO_WARNINGS /* For stb_vorbis' usage of fopen() instead of fopen_s(). */
|
||||||
|
|
||||||
#define STB_VORBIS_HEADER_ONLY
|
#define STB_VORBIS_HEADER_ONLY
|
||||||
#include "../../extras/stb_vorbis.c" /* Enables Vorbis decoding. */
|
#include "../../extras/stb_vorbis.c" /* Enables Vorbis decoding. */
|
||||||
|
|
||||||
/* Enable Speex resampling, but only if requested on the command line at build time. */
|
|
||||||
#if defined(ENABLE_SPEEX)
|
|
||||||
#define MINIAUDIO_SPEEX_RESAMPLER_IMPLEMENTATION
|
|
||||||
#include "../../extras/speex_resampler/ma_speex_resampler.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MA_NO_DEVICE_IO
|
#define MA_NO_DEVICE_IO
|
||||||
#define MA_NO_THREADING
|
#define MA_NO_THREADING
|
||||||
#define MINIAUDIO_IMPLEMENTATION
|
#define MINIAUDIO_IMPLEMENTATION
|
||||||
@@ -44,7 +31,6 @@ void print_usage()
|
|||||||
printf("\n");
|
printf("\n");
|
||||||
printf("PARAMETERS:\n");
|
printf("PARAMETERS:\n");
|
||||||
printf(" --linear-order [0..%d]\n", MA_MAX_FILTER_ORDER);
|
printf(" --linear-order [0..%d]\n", MA_MAX_FILTER_ORDER);
|
||||||
printf(" --speex-quality [0..10]\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ma_result do_conversion(ma_decoder* pDecoder, ma_encoder* pEncoder)
|
ma_result do_conversion(ma_decoder* pDecoder, ma_encoder* pEncoder)
|
||||||
@@ -64,9 +50,9 @@ ma_result do_conversion(ma_decoder* pDecoder, ma_encoder* pEncoder)
|
|||||||
ma_uint64 framesToReadThisIteration;
|
ma_uint64 framesToReadThisIteration;
|
||||||
|
|
||||||
framesToReadThisIteration = sizeof(pRawData) / ma_get_bytes_per_frame(pDecoder->outputFormat, pDecoder->outputChannels);
|
framesToReadThisIteration = sizeof(pRawData) / ma_get_bytes_per_frame(pDecoder->outputFormat, pDecoder->outputChannels);
|
||||||
framesReadThisIteration = ma_decoder_read_pcm_frames(pDecoder, pRawData, framesToReadThisIteration);
|
result = ma_decoder_read_pcm_frames(pDecoder, pRawData, framesToReadThisIteration, &framesReadThisIteration);
|
||||||
if (framesReadThisIteration == 0) {
|
if (result != MA_SUCCESS) {
|
||||||
break; /* Reached the end. */
|
break; /* Reached the end, or an error occurred. */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* At this point we have the raw data from the decoder. We now just need to write it to the encoder. */
|
/* At this point we have the raw data from the decoder. We now just need to write it to the encoder. */
|
||||||
@@ -159,8 +145,6 @@ ma_bool32 try_parse_resample_algorithm(const char* str, ma_resample_algorithm* p
|
|||||||
|
|
||||||
/* */ if (strcmp(str, "linear") == 0) {
|
/* */ if (strcmp(str, "linear") == 0) {
|
||||||
algorithm = ma_resample_algorithm_linear;
|
algorithm = ma_resample_algorithm_linear;
|
||||||
} else if (strcmp(str, "speex") == 0) {
|
|
||||||
algorithm = ma_resample_algorithm_speex;
|
|
||||||
} else {
|
} else {
|
||||||
return MA_FALSE; /* Not a valid algorithm */
|
return MA_FALSE; /* Not a valid algorithm */
|
||||||
}
|
}
|
||||||
@@ -179,13 +163,12 @@ int main(int argc, char** argv)
|
|||||||
ma_decoder decoder;
|
ma_decoder decoder;
|
||||||
ma_encoder_config encoderConfig;
|
ma_encoder_config encoderConfig;
|
||||||
ma_encoder encoder;
|
ma_encoder encoder;
|
||||||
ma_resource_format outputResourceFormat;
|
ma_encoding_format outputEncodingFormat;
|
||||||
ma_format format = ma_format_unknown;
|
ma_format format = ma_format_unknown;
|
||||||
ma_uint32 channels = 0;
|
ma_uint32 channels = 0;
|
||||||
ma_uint32 rate = 0;
|
ma_uint32 rate = 0;
|
||||||
ma_resample_algorithm resampleAlgorithm;
|
ma_resample_algorithm resampleAlgorithm;
|
||||||
ma_uint32 linearOrder = 8;
|
ma_uint32 linearOrder = 8;
|
||||||
ma_uint32 speexQuality = 3;
|
|
||||||
int iarg;
|
int iarg;
|
||||||
const char* pOutputFilePath;
|
const char* pOutputFilePath;
|
||||||
|
|
||||||
@@ -204,12 +187,7 @@ int main(int argc, char** argv)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Default to Speex if it's enabled. */
|
|
||||||
#if defined(ENABLE_SPEEX)
|
|
||||||
resampleAlgorithm = ma_resample_algorithm_speex;
|
|
||||||
#else
|
|
||||||
resampleAlgorithm = ma_resample_algorithm_linear;
|
resampleAlgorithm = ma_resample_algorithm_linear;
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
The fourth and fifth arguments can be a format and/or rate specifier. It doesn't matter which order they are in as we can identify them by whether or
|
The fourth and fifth arguments can be a format and/or rate specifier. It doesn't matter which order they are in as we can identify them by whether or
|
||||||
@@ -230,20 +208,6 @@ int main(int argc, char** argv)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp(argv[iarg], "--speex-quality") == 0) {
|
|
||||||
iarg += 1;
|
|
||||||
if (iarg >= argc) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!try_parse_uint32_in_range(argv[iarg], &speexQuality, 0, 10)) {
|
|
||||||
printf("Expecting a number between 0 and 10 for --speex-quality.\n");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (try_parse_resample_algorithm(argv[iarg], &resampleAlgorithm)) {
|
if (try_parse_resample_algorithm(argv[iarg], &resampleAlgorithm)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -268,9 +232,6 @@ int main(int argc, char** argv)
|
|||||||
decoderConfig = ma_decoder_config_init(format, channels, rate);
|
decoderConfig = ma_decoder_config_init(format, channels, rate);
|
||||||
decoderConfig.resampling.algorithm = resampleAlgorithm;
|
decoderConfig.resampling.algorithm = resampleAlgorithm;
|
||||||
decoderConfig.resampling.linear.lpfOrder = linearOrder;
|
decoderConfig.resampling.linear.lpfOrder = linearOrder;
|
||||||
#if defined(ENABLE_SPEEX)
|
|
||||||
decoderConfig.resampling.speex.quality = speexQuality;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
result = ma_decoder_init_file(argv[1], &decoderConfig, &decoder);
|
result = ma_decoder_init_file(argv[1], &decoderConfig, &decoder);
|
||||||
if (result != MA_SUCCESS) {
|
if (result != MA_SUCCESS) {
|
||||||
@@ -296,15 +257,15 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
pOutputFilePath = argv[2];
|
pOutputFilePath = argv[2];
|
||||||
|
|
||||||
outputResourceFormat = ma_resource_format_wav; /* Wave by default in case we don't know the file extension. */
|
outputEncodingFormat = ma_encoding_format_wav; /* Wave by default in case we don't know the file extension. */
|
||||||
if (ma_path_extension_equal(pOutputFilePath, "wav")) {
|
if (ma_path_extension_equal(pOutputFilePath, "wav")) {
|
||||||
outputResourceFormat = ma_resource_format_wav;
|
outputEncodingFormat = ma_encoding_format_wav;
|
||||||
} else {
|
} else {
|
||||||
printf("Warning: Unknown file extension \"%s\". Encoding as WAV.\n", ma_path_extension(pOutputFilePath));
|
printf("Warning: Unknown file extension \"%s\". Encoding as WAV.\n", ma_path_extension(pOutputFilePath));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize the encoder for the output file. */
|
/* Initialize the encoder for the output file. */
|
||||||
encoderConfig = ma_encoder_config_init(ma_resource_format_wav, decoder.outputFormat, decoder.outputChannels, decoder.outputSampleRate);
|
encoderConfig = ma_encoder_config_init(outputEncodingFormat, decoder.outputFormat, decoder.outputChannels, decoder.outputSampleRate);
|
||||||
result = ma_encoder_init_file(pOutputFilePath, &encoderConfig, &encoder);
|
result = ma_encoder_init_file(pOutputFilePath, &encoderConfig, &encoder);
|
||||||
if (result != MA_SUCCESS) {
|
if (result != MA_SUCCESS) {
|
||||||
ma_decoder_uninit(&decoder);
|
ma_decoder_uninit(&decoder);
|
||||||
|
|||||||
Reference in New Issue
Block a user