mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-14 01:49:05 +00:00
merge more build stuff for shout and flite. (FSBUILD-62 and FSBUILD-63)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9161 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -81,7 +81,7 @@ int synth_1to1(struct mpstr *mp, real * bandPtr, int channel, unsigned char *out
|
||||
|
||||
{
|
||||
register int j;
|
||||
real *window = decwin + 16 - bo1;
|
||||
real *window = (mp->decwin) + 16 - bo1;
|
||||
|
||||
for (j = 16; j; j--, b0 += 0x10, window += 0x20, samples += step) {
|
||||
real sum;
|
||||
|
@@ -13,7 +13,7 @@ void InitMP3Constants(void)
|
||||
}
|
||||
|
||||
|
||||
BOOL InitMP3(struct mpstr *mp, long outscale, int samplerate)
|
||||
MPGLIB_BOOL InitMP3(struct mpstr *mp, long outscale, int samplerate)
|
||||
{
|
||||
/* quiet 4096 med 8192 */
|
||||
|
||||
|
@@ -32,8 +32,11 @@ struct bandInfoStruct {
|
||||
short shortDiff[13];
|
||||
};
|
||||
|
||||
|
||||
#ifndef _WIN32
|
||||
static inline real find_pow(int i)
|
||||
#else
|
||||
static real find_pow(int i)
|
||||
#endif
|
||||
{
|
||||
|
||||
return (i > 0 && i < 8207) ? __ispow[i] : 1;
|
||||
|
@@ -1,3 +1,6 @@
|
||||
#ifndef MPG123_DEFINED
|
||||
#define MPG123_DEFINED
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
@@ -127,3 +130,5 @@ struct pcm_workingsample {
|
||||
extern long freqs[9];
|
||||
extern struct parameter param;
|
||||
extern real *pnts[5];
|
||||
|
||||
#endif
|
||||
|
@@ -5,6 +5,10 @@
|
||||
#endif
|
||||
#define NTOM_MUL (32768)
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "mpg123.h"
|
||||
#endif
|
||||
|
||||
struct buf {
|
||||
unsigned char *pnt;
|
||||
long size;
|
||||
@@ -44,7 +48,7 @@ struct mpstr {
|
||||
unsigned long ntom_step;
|
||||
};
|
||||
|
||||
#define BOOL int
|
||||
#define MPGLIB_BOOL int
|
||||
|
||||
#define MP3_ERR -1
|
||||
#define MP3_OK 0
|
||||
@@ -52,7 +56,7 @@ struct mpstr {
|
||||
#define MP3_TOOSMALL 2
|
||||
|
||||
void InitMP3Constants(void);
|
||||
BOOL InitMP3(struct mpstr *mp, long outscale, int samplerate);
|
||||
MPGLIB_BOOL InitMP3(struct mpstr *mp, long outscale, int samplerate);
|
||||
int decodeMP3(struct mpstr *mp, char *inmemory, int inmemsize, char *outmemory, int outmemsize, int *done);
|
||||
void ExitMP3(struct mpstr *mp);
|
||||
|
||||
|
Reference in New Issue
Block a user