forked from osmocom/wireshark
Have HAVE_SPANDSP just go over entire file rather than individual functions.
svn path=/trunk/; revision=54645
This commit is contained in:
parent
2adcfcd914
commit
a6ed8a1de9
|
@ -29,33 +29,23 @@
|
|||
#ifdef HAVE_SPANDSP
|
||||
#include "telephony.h"
|
||||
#include "g722.h"
|
||||
#endif
|
||||
#include "G722decode.h"
|
||||
|
||||
#ifdef HAVE_SPANDSP
|
||||
static g722_decode_state_t state;
|
||||
#endif
|
||||
|
||||
void
|
||||
initG722(void)
|
||||
{
|
||||
#ifdef HAVE_SPANDSP
|
||||
memset (&state, 0, sizeof (state));
|
||||
g722_decode_init(&state, 64000, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef HAVE_SPANDSP
|
||||
#define _U_NOSPANDSP_
|
||||
#else
|
||||
#define _U_NOSPANDSP_ _U_
|
||||
#endif
|
||||
int
|
||||
decodeG722(void *input _U_NOSPANDSP_, int inputSizeBytes _U_NOSPANDSP_,
|
||||
void *output _U_NOSPANDSP_, int *outputSizeBytes _U_NOSPANDSP_)
|
||||
{
|
||||
#ifdef HAVE_SPANDSP
|
||||
*outputSizeBytes = g722_decode(&state, output, input, inputSizeBytes);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -29,39 +29,29 @@
|
|||
#include "telephony.h"
|
||||
#include "bitstream.h"
|
||||
#include "g726.h"
|
||||
#endif
|
||||
#include "G726decode.h"
|
||||
|
||||
#ifdef HAVE_SPANDSP
|
||||
/* this isn't reentrant. Making it might involve quite a few changes to be able to pass a g726 state
|
||||
* variable to the various functions involved in G.726 decoding.
|
||||
*/
|
||||
static g726_state_t state;
|
||||
#endif
|
||||
|
||||
/* Currently, only G.726-32, linear encoding, left packed is supported */
|
||||
void initG726_32(void)
|
||||
{
|
||||
#ifdef HAVE_SPANDSP
|
||||
memset (&state, 0, sizeof (state));
|
||||
g726_init(&state, 32000, 0, 1);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Packing should be user defined (via the decode dialog) since due to historical reasons two diverging
|
||||
* de facto standards are in use today (see RFC3551).
|
||||
*/
|
||||
#ifdef HAVE_SPANDSP
|
||||
#define _U_NOSPANDSP_
|
||||
#else
|
||||
#define _U_NOSPANDSP_ _U_
|
||||
#endif
|
||||
int
|
||||
decodeG726_32(void *input _U_NOSPANDSP_, int inputSizeBytes _U_NOSPANDSP_,
|
||||
void *output _U_NOSPANDSP_, int *outputSizeBytes _U_NOSPANDSP_)
|
||||
decodeG726_32(void *input, int inputSizeBytes,
|
||||
void *output, int *outputSizeBytes)
|
||||
{
|
||||
#ifdef HAVE_SPANDSP
|
||||
*outputSizeBytes = 2 * g726_decode(&state, output, (void*) input, inputSizeBytes);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue