From 0a6d3066caa52060975537f81a352efe463a807a Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sat, 6 Jan 2018 19:40:46 +0100 Subject: update some modules with new aucodec api --- modules/g711/g711.c | 4 ++-- modules/l16/l16.c | 16 ++++++++-------- modules/speex/speex.c | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'modules') diff --git a/modules/g711/g711.c b/modules/g711/g711.c index 7c01b61..d264153 100644 --- a/modules/g711/g711.c +++ b/modules/g711/g711.c @@ -98,12 +98,12 @@ static int pcma_decode(struct audec_state *ads, int16_t *sampv, static struct aucodec pcmu = { LE_INIT, "0", "PCMU", 8000, 8000, 1, NULL, - NULL, pcmu_encode, NULL, pcmu_decode, NULL, NULL, NULL + NULL, pcmu_encode, NULL, pcmu_decode, NULL, NULL, NULL, NULL, NULL }; static struct aucodec pcma = { LE_INIT, "8", "PCMA", 8000, 8000, 1, NULL, - NULL, pcma_encode, NULL, pcma_decode, NULL, NULL, NULL + NULL, pcma_encode, NULL, pcma_decode, NULL, NULL, NULL, NULL, NULL }; diff --git a/modules/l16/l16.c b/modules/l16/l16.c index 204a8f5..ce131a0 100644 --- a/modules/l16/l16.c +++ b/modules/l16/l16.c @@ -62,14 +62,14 @@ static int decode(struct audec_state *st, int16_t *sampv, size_t *sampc, /* See RFC 3551 */ static struct aucodec l16v[NR_CODECS] = { -{LE_INIT, "10", "L16", 44100, 44100, 2, 0, 0, encode, 0, decode, 0, 0, 0}, -{LE_INIT, 0, "L16", 32000, 32000, 2, 0, 0, encode, 0, decode, 0, 0, 0}, -{LE_INIT, 0, "L16", 16000, 16000, 2, 0, 0, encode, 0, decode, 0, 0, 0}, -{LE_INIT, 0, "L16", 8000, 8000, 2, 0, 0, encode, 0, decode, 0, 0, 0}, -{LE_INIT, "11", "L16", 44100, 44100, 1, 0, 0, encode, 0, decode, 0, 0, 0}, -{LE_INIT, 0, "L16", 32000, 32000, 1, 0, 0, encode, 0, decode, 0, 0, 0}, -{LE_INIT, 0, "L16", 16000, 16000, 1, 0, 0, encode, 0, decode, 0, 0, 0}, -{LE_INIT, 0, "L16", 8000, 8000, 1, 0, 0, encode, 0, decode, 0, 0, 0}, +{LE_INIT, "10", "L16", 44100, 44100, 2, 0, 0, encode, 0, decode, 0, 0, 0,0,0}, +{LE_INIT, 0, "L16", 32000, 32000, 2, 0, 0, encode, 0, decode, 0, 0, 0,0,0}, +{LE_INIT, 0, "L16", 16000, 16000, 2, 0, 0, encode, 0, decode, 0, 0, 0,0,0}, +{LE_INIT, 0, "L16", 8000, 8000, 2, 0, 0, encode, 0, decode, 0, 0, 0,0,0}, +{LE_INIT, "11", "L16", 44100, 44100, 1, 0, 0, encode, 0, decode, 0, 0, 0,0,0}, +{LE_INIT, 0, "L16", 32000, 32000, 1, 0, 0, encode, 0, decode, 0, 0, 0,0,0}, +{LE_INIT, 0, "L16", 16000, 16000, 1, 0, 0, encode, 0, decode, 0, 0, 0,0,0}, +{LE_INIT, 0, "L16", 8000, 8000, 1, 0, 0, encode, 0, decode, 0, 0, 0,0,0}, }; diff --git a/modules/speex/speex.c b/modules/speex/speex.c index 33b52e2..66a7ff4 100644 --- a/modules/speex/speex.c +++ b/modules/speex/speex.c @@ -465,19 +465,19 @@ static struct aucodec speexv[] = { /* Stereo Speex */ {LE_INIT, 0, "speex", 32000, 32000, 2, speex_fmtp_wb, - encode_update, encode, decode_update, decode, pkloss, 0, 0}, + encode_update, encode, decode_update, decode, pkloss, 0, 0, 0, 0}, {LE_INIT, 0, "speex", 16000, 16000, 2, speex_fmtp_wb, - encode_update, encode, decode_update, decode, pkloss, 0, 0}, + encode_update, encode, decode_update, decode, pkloss, 0, 0, 0, 0}, {LE_INIT, 0, "speex", 8000, 8000, 2, speex_fmtp_nb, - encode_update, encode, decode_update, decode, pkloss, 0, 0}, + encode_update, encode, decode_update, decode, pkloss, 0, 0, 0, 0}, /* Standard Speex */ {LE_INIT, 0, "speex", 32000, 32000, 1, speex_fmtp_wb, - encode_update, encode, decode_update, decode, pkloss, 0, 0}, + encode_update, encode, decode_update, decode, pkloss, 0, 0, 0, 0}, {LE_INIT, 0, "speex", 16000, 16000, 1, speex_fmtp_wb, - encode_update, encode, decode_update, decode, pkloss, 0, 0}, + encode_update, encode, decode_update, decode, pkloss, 0, 0, 0, 0}, {LE_INIT, 0, "speex", 8000, 8000, 1, speex_fmtp_nb, - encode_update, encode, decode_update, decode, pkloss, 0, 0}, + encode_update, encode, decode_update, decode, pkloss, 0, 0, 0, 0}, }; -- cgit v1.2.3