reformatting (only wsp changes)

sayer/1.4-spce2.6
Stefan Sayer 16 years ago
parent b6e4cd1c87
commit f1be62d5d7

@ -46,18 +46,18 @@ static unsigned int G722NB_samples2bytes(long, unsigned int);
BEGIN_EXPORTS("g722", AMCI_NO_MODULEINIT, AMCI_NO_MODULEDESTROY)
BEGIN_CODECS
CODEC(CODEC_G722_NB, Pcm16_2_G722NB, G722NB_2_Pcm16, AMCI_NO_CODEC_PLC,
G722NB_create, G722NB_destroy,
G722NB_bytes2samples, G722NB_samples2bytes)
END_CODECS
BEGIN_CODECS
CODEC(CODEC_G722_NB, Pcm16_2_G722NB, G722NB_2_Pcm16, AMCI_NO_CODEC_PLC,
G722NB_create, G722NB_destroy,
G722NB_bytes2samples, G722NB_samples2bytes)
END_CODECS
BEGIN_PAYLOADS
PAYLOAD(9, "g722", 8000, 1, CODEC_G722_NB, AMCI_PT_AUDIO_FRAME)
END_PAYLOADS
BEGIN_PAYLOADS
PAYLOAD(9, "g722", 8000, 1, CODEC_G722_NB, AMCI_PT_AUDIO_FRAME)
END_PAYLOADS
BEGIN_FILE_FORMATS
END_FILE_FORMATS
BEGIN_FILE_FORMATS
END_FILE_FORMATS
END_EXPORTS

@ -48,17 +48,17 @@ static unsigned int gsm_samples2bytes(long, unsigned int);
BEGIN_EXPORTS( "gsm", AMCI_NO_MODULEINIT, AMCI_NO_MODULEDESTROY )
BEGIN_CODECS
CODEC( CODEC_GSM0610, pcm16_2_gsm, gsm_2_pcm16, AMCI_NO_CODEC_PLC,
gsm_create_if, (amci_codec_destroy_t)gsm_destroy_if, gsm_bytes2samples, gsm_samples2bytes )
END_CODECS
BEGIN_CODECS
CODEC( CODEC_GSM0610, pcm16_2_gsm, gsm_2_pcm16, AMCI_NO_CODEC_PLC,
gsm_create_if, (amci_codec_destroy_t)gsm_destroy_if, gsm_bytes2samples, gsm_samples2bytes )
END_CODECS
BEGIN_PAYLOADS
PAYLOAD( 3, "GSM", 8000, 1, CODEC_GSM0610, AMCI_PT_AUDIO_FRAME )
END_PAYLOADS
BEGIN_PAYLOADS
PAYLOAD( 3, "GSM", 8000, 1, CODEC_GSM0610, AMCI_PT_AUDIO_FRAME )
END_PAYLOADS
BEGIN_FILE_FORMATS
END_FILE_FORMATS
BEGIN_FILE_FORMATS
END_FILE_FORMATS
END_EXPORTS

@ -79,25 +79,25 @@ static unsigned int ilbc_samples2bytes(long, unsigned int);
BEGIN_EXPORTS( "ilbc" , AMCI_NO_MODULEINIT, AMCI_NO_MODULEDESTROY )
BEGIN_CODECS
CODEC( CODEC_ILBC, Pcm16_2_iLBC, iLBC_2_Pcm16, iLBC_PLC,
iLBC_create,
iLBC_destroy,
ilbc_bytes2samples, ilbc_samples2bytes )
END_CODECS
BEGIN_CODECS
CODEC( CODEC_ILBC, Pcm16_2_iLBC, iLBC_2_Pcm16, iLBC_PLC,
iLBC_create,
iLBC_destroy,
ilbc_bytes2samples, ilbc_samples2bytes )
END_CODECS
BEGIN_PAYLOADS
PAYLOAD( -1, "iLBC", 8000, 1, CODEC_ILBC, AMCI_PT_AUDIO_FRAME )
END_PAYLOADS
BEGIN_FILE_FORMATS
BEGIN_FILE_FORMAT( "iLBC", "ilbc", "audio/iLBC", iLBC_open, iLBC_close, 0, 0)
BEGIN_SUBTYPES
SUBTYPE( ILBC30, "iLBC30", 8000, 1, CODEC_ILBC )
SUBTYPE( ILBC20, "iLBC20", 8000, 1, CODEC_ILBC )
END_SUBTYPES
END_FILE_FORMAT
END_FILE_FORMATS
BEGIN_PAYLOADS
PAYLOAD( -1, "iLBC", 8000, 1, CODEC_ILBC, AMCI_PT_AUDIO_FRAME )
END_PAYLOADS
BEGIN_FILE_FORMATS
BEGIN_FILE_FORMAT( "iLBC", "ilbc", "audio/iLBC", iLBC_open, iLBC_close, 0, 0)
BEGIN_SUBTYPES
SUBTYPE( ILBC30, "iLBC30", 8000, 1, CODEC_ILBC )
SUBTYPE( ILBC20, "iLBC20", 8000, 1, CODEC_ILBC )
END_SUBTYPES
END_FILE_FORMAT
END_FILE_FORMATS
END_EXPORTS

@ -54,18 +54,18 @@ static unsigned int L16_samples2bytes(long, unsigned int);
BEGIN_EXPORTS( "l16" , AMCI_NO_MODULEINIT, AMCI_NO_MODULEDESTROY )
BEGIN_CODECS
CODEC( CODEC_L16, Pcm16_2_L16, L16_2_Pcm16,
AMCI_NO_CODEC_PLC, AMCI_NO_CODECCREATE, AMCI_NO_CODECDESTROY,
L16_bytes2samples, L16_samples2bytes )
END_CODECS
BEGIN_CODECS
CODEC( CODEC_L16, Pcm16_2_L16, L16_2_Pcm16,
AMCI_NO_CODEC_PLC, AMCI_NO_CODECCREATE, AMCI_NO_CODECDESTROY,
L16_bytes2samples, L16_samples2bytes )
END_CODECS
BEGIN_PAYLOADS
PAYLOAD( -1, "L16", 8000, 1, CODEC_L16, AMCI_PT_AUDIO_LINEAR )
END_PAYLOADS
BEGIN_PAYLOADS
PAYLOAD( -1, "L16", 8000, 1, CODEC_L16, AMCI_PT_AUDIO_LINEAR )
END_PAYLOADS
BEGIN_FILE_FORMATS
END_FILE_FORMATS
BEGIN_FILE_FORMATS
END_FILE_FORMATS
END_EXPORTS

@ -123,7 +123,8 @@ static const int nb_encoded_frame_bits[] = { 5, 43, 119, 160, 220, 300, 364, 492
/*
Search for a parameter assignement in input string.
If it's not found *param_value is null, otherwise *param_value points to the right hand term.
If it's not found *param_value is null, otherwise *param_value points to the
right hand term.
In both cases a pointer suitable for a new search is returned
*/
static char* read_param(char* input, const char *param, char** param_value)
@ -240,7 +241,8 @@ long speexNB_create(const char* format_parameters, amci_codec_fmt_info_t* format
format_description[3].id = 0;
DBG("SpeexState %p inserted with mode %d and %d frames per packet,\n", ss, ss->mode, ss->frames_per_packet);
DBG("SpeexState %p inserted with mode %d and %d frames per packet,\n",
ss, ss->mode, ss->frames_per_packet);
return (long)ss;
}

@ -95,28 +95,28 @@ static unsigned int g711_samples2bytes(long, unsigned int);
BEGIN_EXPORTS( "wav" , AMCI_NO_MODULEINIT, AMCI_NO_MODULEDESTROY )
BEGIN_CODECS
CODEC( CODEC_ULAW, Pcm16_2_ULaw, ULaw_2_Pcm16,
AMCI_NO_CODEC_PLC, AMCI_NO_CODECCREATE, AMCI_NO_CODECDESTROY,
g711_bytes2samples, g711_samples2bytes )
CODEC( CODEC_ALAW, Pcm16_2_ALaw, ALaw_2_Pcm16,
AMCI_NO_CODEC_PLC, AMCI_NO_CODECCREATE, AMCI_NO_CODECDESTROY,
g711_bytes2samples, g711_samples2bytes )
CODEC( CODEC_ULAW, Pcm16_2_ULaw, ULaw_2_Pcm16,
AMCI_NO_CODEC_PLC, AMCI_NO_CODECCREATE, AMCI_NO_CODECDESTROY,
g711_bytes2samples, g711_samples2bytes )
CODEC( CODEC_ALAW, Pcm16_2_ALaw, ALaw_2_Pcm16,
AMCI_NO_CODEC_PLC, AMCI_NO_CODECCREATE, AMCI_NO_CODECDESTROY,
g711_bytes2samples, g711_samples2bytes )
END_CODECS
BEGIN_PAYLOADS
PAYLOAD( 0, "PCMU", 8000, 1, CODEC_ULAW, AMCI_PT_AUDIO_LINEAR )
PAYLOAD( 8, "PCMA", 8000, 1, CODEC_ALAW, AMCI_PT_AUDIO_LINEAR )
BEGIN_PAYLOADS
PAYLOAD( 0, "PCMU", 8000, 1, CODEC_ULAW, AMCI_PT_AUDIO_LINEAR )
PAYLOAD( 8, "PCMA", 8000, 1, CODEC_ALAW, AMCI_PT_AUDIO_LINEAR )
END_PAYLOADS
BEGIN_FILE_FORMATS
BEGIN_FILE_FORMAT( "Wav", "wav", "audio/x-wav", wav_open, wav_close, wav_mem_open, wav_mem_close)
BEGIN_SUBTYPES
SUBTYPE( WAV_PCM, "Pcm16", 8000, 1, CODEC_PCM16 ) // we only support 8000/1 channel !
SUBTYPE( WAV_ALAW, "A-Law", 8000, 1, CODEC_ALAW )
SUBTYPE( WAV_ULAW, "Mu-Law", 8000, 1, CODEC_ULAW )
END_SUBTYPES
END_FILE_FORMAT
END_FILE_FORMATS
BEGIN_FILE_FORMATS
BEGIN_FILE_FORMAT( "Wav", "wav", "audio/x-wav", wav_open, wav_close, wav_mem_open, wav_mem_close)
BEGIN_SUBTYPES
SUBTYPE( WAV_PCM, "Pcm16", 8000, 1, CODEC_PCM16 ) // we only support 8000/1 channel !
SUBTYPE( WAV_ALAW, "A-Law", 8000, 1, CODEC_ALAW )
SUBTYPE( WAV_ULAW, "Mu-Law", 8000, 1, CODEC_ULAW )
END_SUBTYPES
END_FILE_FORMAT
END_FILE_FORMATS
END_EXPORTS

Loading…
Cancel
Save