diff options
author | Liong Sauw Ming <ming@teluu.com> | 2013-01-23 06:18:18 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2013-01-23 06:18:18 +0000 |
commit | f7506f68b514a31348fe71f29f1fea571711bc33 (patch) | |
tree | 93fceee898f55de78f4176b4d366036581005ad8 /pjmedia | |
parent | 1b4137b1713944a4fcb42f52facce72f39d24578 (diff) |
Re #1608: Add support for OpenCORE AMR-WB
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4331 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/build/Makefile | 2 | ||||
-rw-r--r-- | pjmedia/build/os-auto.mak.in | 11 | ||||
-rw-r--r-- | pjmedia/include/pjmedia-codec.h | 2 | ||||
-rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 14 | ||||
-rw-r--r-- | pjmedia/include/pjmedia-codec/config_auto.h.in | 5 | ||||
-rw-r--r-- | pjmedia/include/pjmedia-codec/opencore_amr.h (renamed from pjmedia/include/pjmedia-codec/opencore_amrnb.h) | 46 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/audio_codecs.c | 7 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/opencore_amr.c (renamed from pjmedia/src/pjmedia-codec/opencore_amrnb.c) | 390 | ||||
-rw-r--r-- | pjmedia/src/test/mips_test.c | 42 |
9 files changed, 406 insertions, 113 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index e9e04fcf..026d89c9 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -113,7 +113,7 @@ export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_vid_codecs.o \ h263_packetizer.o h264_packetizer.o \ $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - ipp_codecs.o opencore_amrnb.o silk.o $(CODEC_OBJS) \ + ipp_codecs.o opencore_amr.o silk.o $(CODEC_OBJS) \ g7221_sdp_match.o amr_sdp_match.o export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS) diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index 98ecf288..04224e88 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -58,6 +58,7 @@ AC_NO_ILBC_CODEC=@ac_no_ilbc_codec@ AC_NO_G722_CODEC=@ac_no_g722_codec@ AC_NO_G7221_CODEC=@ac_no_g7221_codec@ AC_NO_OPENCORE_AMRNB=@ac_no_opencore_amrnb@ +AC_NO_OPENCORE_AMRWB=@ac_no_opencore_amrwb@ export CODEC_OBJS= @@ -113,7 +114,15 @@ endif ifeq ($(AC_NO_OPENCORE_AMRNB),1) export CFLAGS += -DPJMEDIA_HAS_OPENCORE_AMRNB_CODEC=0 else -export CODEC_OBJS += opencore_amrnb.o +export CODEC_OBJS += opencore_amr.o +endif + +ifeq ($(AC_NO_OPENCORE_AMRWB),1) +export CFLAGS += -DPJMEDIA_HAS_OPENCORE_AMRWB_CODEC=0 +else +ifeq ($(AC_NO_OPENCORE_AMRNB),1) +export CODEC_OBJS += opencore_amr.o +endif endif diff --git a/pjmedia/include/pjmedia-codec.h b/pjmedia/include/pjmedia-codec.h index 26389f8b..01e3e842 100644 --- a/pjmedia/include/pjmedia-codec.h +++ b/pjmedia/include/pjmedia-codec.h @@ -34,7 +34,7 @@ #include <pjmedia-codec/g722.h> #include <pjmedia-codec/g7221.h> #include <pjmedia-codec/ipp_codecs.h> -#include <pjmedia-codec/opencore_amrnb.h> +#include <pjmedia-codec/opencore_amr.h> #include <pjmedia-codec/passthrough.h> #include <pjmedia-codec/silk.h> diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index a6aa2d66..875c821a 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -323,8 +323,18 @@ #endif /** + * Enable OpenCORE AMR-WB codec. + * See https://trac.pjsip.org/repos/ticket/1608 for some info. + * + * Default: 0 + */ +#ifndef PJMEDIA_HAS_OPENCORE_AMRWB_CODEC +# define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0 +#endif + +/** * Link with libopencore-amrXX via pragma comment on Visual Studio. - * This option only makes sense if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC + * This option only makes sense if PJMEDIA_HAS_OPENCORE_AMRNB/WB_CODEC * is enabled. * * Default: 1 @@ -335,7 +345,7 @@ /** * Link with libopencore-amrXX.a that has been produced with gcc. - * This option only makes sense if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC + * This option only makes sense if PJMEDIA_HAS_OPENCORE_AMRNB/WB_CODEC * and PJMEDIA_AUTO_LINK_OPENCORE_AMR_LIBS are enabled. * * Default: 1 diff --git a/pjmedia/include/pjmedia-codec/config_auto.h.in b/pjmedia/include/pjmedia-codec/config_auto.h.in index c8ab8534..746c1fc7 100644 --- a/pjmedia/include/pjmedia-codec/config_auto.h.in +++ b/pjmedia/include/pjmedia-codec/config_auto.h.in @@ -74,6 +74,11 @@ #undef PJMEDIA_HAS_OPENCORE_AMRNB_CODEC #endif +/* OpenCORE AMR-WB codec */ +#ifndef PJMEDIA_HAS_OPENCORE_AMRWB_CODEC +#undef PJMEDIA_HAS_OPENCORE_AMRWB_CODEC +#endif + /* SILK codec */ #ifndef PJMEDIA_HAS_SILK_CODEC #undef PJMEDIA_HAS_SILK_CODEC diff --git a/pjmedia/include/pjmedia-codec/opencore_amrnb.h b/pjmedia/include/pjmedia-codec/opencore_amr.h index 3e618e46..56816415 100644 --- a/pjmedia/include/pjmedia-codec/opencore_amrnb.h +++ b/pjmedia/include/pjmedia-codec/opencore_amr.h @@ -1,6 +1,6 @@ /* $Id$ */ /* - * Copyright (C) 2011 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2011-2013 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2011 Dan Arrhenius <dan@keystream.se> * * This program is free software; you can redistribute it and/or modify @@ -17,25 +17,25 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __PJMEDIA_CODEC_OPENCORE_AMRNB_H__ -#define __PJMEDIA_CODEC_OPENCORE_AMRNB_H__ +#ifndef __PJMEDIA_CODEC_OPENCORE_AMR_H__ +#define __PJMEDIA_CODEC_OPENCORE_AMR_H__ #include <pjmedia-codec/types.h> /** - * @defgroup PJMED_OC_AMRNB OpenCORE AMR-NB Codec + * @defgroup PJMED_OC_AMR OpenCORE AMR Codec * @ingroup PJMEDIA_CODEC_CODECS - * @brief AMRCodec wrapper for OpenCORE AMR-NB codec + * @brief AMRCodec wrapper for OpenCORE AMR codec * @{ */ PJ_BEGIN_DECL /** - * Settings. Use #pjmedia_codec_opencore_amrnb_set_config() to + * Settings. Use #pjmedia_codec_opencore_amrnb/wb_set_config() to * activate. */ -typedef struct pjmedia_codec_amrnb_config +typedef struct pjmedia_codec_amr_config { /** * Control whether to use octent align. @@ -47,8 +47,10 @@ typedef struct pjmedia_codec_amrnb_config */ unsigned bitrate; -} pjmedia_codec_amrnb_config; +} pjmedia_codec_amr_config; +typedef pjmedia_codec_amr_config pjmedia_codec_amrnb_config; +typedef pjmedia_codec_amr_config pjmedia_codec_amrwb_config; /** * Initialize and register AMR-NB codec factory to pjmedia endpoint. @@ -78,6 +80,34 @@ PJ_DECL(pj_status_t) pjmedia_codec_opencore_amrnb_deinit(void); PJ_DECL(pj_status_t) pjmedia_codec_opencore_amrnb_set_config( const pjmedia_codec_amrnb_config* cfg); +/** + * Initialize and register AMR-WB codec factory to pjmedia endpoint. + * + * @param endpt The pjmedia endpoint. + * + * @return PJ_SUCCESS on success. + */ +PJ_DECL(pj_status_t) pjmedia_codec_opencore_amrwb_init(pjmedia_endpt* endpt); + +/** + * Unregister AMR-WB codec factory from pjmedia endpoint and deinitialize + * the OpenCORE codec library. + * + * @return PJ_SUCCESS on success. + */ +PJ_DECL(pj_status_t) pjmedia_codec_opencore_amrwb_deinit(void); + + +/** + * Set AMR-WB parameters. + * + * @param cfg The settings; + * + * @return PJ_SUCCESS on success. + */ +PJ_DECL(pj_status_t) pjmedia_codec_opencore_amrwb_set_config( + const pjmedia_codec_amrwb_config* cfg); + PJ_END_DECL diff --git a/pjmedia/src/pjmedia-codec/audio_codecs.c b/pjmedia/src/pjmedia-codec/audio_codecs.c index f338db80..3393fc5b 100644 --- a/pjmedia/src/pjmedia-codec/audio_codecs.c +++ b/pjmedia/src/pjmedia-codec/audio_codecs.c @@ -113,6 +113,13 @@ pjmedia_codec_register_audio_codecs(pjmedia_endpt *endpt, if (status != PJ_SUCCESS) return status; #endif + +#if PJMEDIA_HAS_OPENCORE_AMRWB_CODEC + /* Register OpenCORE AMR-WB */ + status = pjmedia_codec_opencore_amrwb_init(endpt); + if (status != PJ_SUCCESS) + return status; +#endif #if PJMEDIA_HAS_SILK_CODEC /* Register SILK */ diff --git a/pjmedia/src/pjmedia-codec/opencore_amrnb.c b/pjmedia/src/pjmedia-codec/opencore_amr.c index cdfdda01..0bd3a5f3 100644 --- a/pjmedia/src/pjmedia-codec/opencore_amrnb.c +++ b/pjmedia/src/pjmedia-codec/opencore_amr.c @@ -1,6 +1,6 @@ /* $Id$ */ /* - * Copyright (C) 2011 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2011-2013 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2011 Dan Arrhenius <dan@keystream.se> * * This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ */ /* - * AMR-NB codec implementation with OpenCORE AMRNB library + * AMR codec implementation with OpenCORE AMR library */ #include <pjmedia-codec/g722.h> #include <pjmedia-codec/amr_sdp_match.h> @@ -38,13 +38,30 @@ #if defined(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC) && \ (PJMEDIA_HAS_OPENCORE_AMRNB_CODEC != 0) +#define USE_AMRNB +#endif + +#if defined(PJMEDIA_HAS_OPENCORE_AMRWB_CODEC) && \ + (PJMEDIA_HAS_OPENCORE_AMRWB_CODEC != 0) +#define USE_AMRWB +#endif +#if defined(USE_AMRNB) || defined(USE_AMRWB) + +#ifdef USE_AMRNB #include <opencore-amrnb/interf_enc.h> #include <opencore-amrnb/interf_dec.h> +#endif + +#ifdef USE_AMRWB +#include <vo-amrwbenc/enc_if.h> +#include <opencore-amrwb/dec_if.h> +#endif + #include <pjmedia-codec/amr_helper.h> -#include <pjmedia-codec/opencore_amrnb.h> +#include <pjmedia-codec/opencore_amr.h> -#define THIS_FILE "opencore_amrnb.c" +#define THIS_FILE "opencore_amr.c" /* Tracing */ #define PJ_TRACE 0 @@ -58,9 +75,10 @@ /* Use PJMEDIA PLC */ #define USE_PJMEDIA_PLC 1 +#define FRAME_LENGTH_MS 20 -/* Prototypes for AMR-NB factory */ +/* Prototypes for AMR factory */ static pj_status_t amr_test_alloc(pjmedia_codec_factory *factory, const pjmedia_codec_info *id ); static pj_status_t amr_default_attr(pjmedia_codec_factory *factory, @@ -75,7 +93,7 @@ static pj_status_t amr_alloc_codec(pjmedia_codec_factory *factory, static pj_status_t amr_dealloc_codec(pjmedia_codec_factory *factory, pjmedia_codec *codec ); -/* Prototypes for AMR-NB implementation. */ +/* Prototypes for AMR implementation. */ static pj_status_t amr_codec_init(pjmedia_codec *codec, pj_pool_t *pool ); static pj_status_t amr_codec_open(pjmedia_codec *codec, @@ -103,7 +121,7 @@ static pj_status_t amr_codec_recover(pjmedia_codec *codec, -/* Definition for AMR-NB codec operations. */ +/* Definition for AMR codec operations. */ static pjmedia_codec_op amr_op = { &amr_codec_init, @@ -116,7 +134,7 @@ static pjmedia_codec_op amr_op = &amr_codec_recover }; -/* Definition for AMR-NB codec factory operations. */ +/* Definition for AMR codec factory operations. */ static pjmedia_codec_factory_op amr_factory_op = { &amr_test_alloc, @@ -128,19 +146,21 @@ static pjmedia_codec_factory_op amr_factory_op = }; -/* AMR-NB factory */ +/* AMR factory */ static struct amr_codec_factory { pjmedia_codec_factory base; pjmedia_endpt *endpt; pj_pool_t *pool; + pj_bool_t init[2]; } amr_codec_factory; -/* AMR-NB codec private data. */ +/* AMR codec private data. */ struct amr_data { pj_pool_t *pool; + unsigned clock_rate; void *encoder; void *decoder; pj_bool_t plc_enabled; @@ -154,18 +174,31 @@ struct amr_data pj_timestamp last_tx; }; -static pjmedia_codec_amrnb_config def_config = +/* Index for AMR tables. */ +enum { + IDX_AMR_NB, /* Index for narrowband. */ + IDX_AMR_WB /* Index for wideband. */ +}; + +static pjmedia_codec_amr_config def_config[2] = +{{ /* AMR-NB */ PJ_FALSE, /* octet align */ 5900 /* bitrate */ -}; + }, + { /* AMR-WB */ + PJ_FALSE, /* octet align */ + 12650 /* bitrate */ + }}; +static const pj_uint16_t* amr_bitrates[2] = + {pjmedia_codec_amrnb_bitrates, pjmedia_codec_amrwb_bitrates}; /* - * Initialize and register AMR-NB codec factory to pjmedia endpoint. + * Initialize and register AMR codec factory to pjmedia endpoint. */ -PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_init( pjmedia_endpt *endpt ) +static pj_status_t amr_init( pjmedia_endpt *endpt ) { pjmedia_codec_mgr *codec_mgr; pj_str_t codec_name; @@ -174,12 +207,12 @@ PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_init( pjmedia_endpt *endpt ) if (amr_codec_factory.pool != NULL) return PJ_SUCCESS; - /* Create AMR-NB codec factory. */ + /* Create AMR codec factory. */ amr_codec_factory.base.op = &amr_factory_op; amr_codec_factory.base.factory_data = NULL; amr_codec_factory.endpt = endpt; - amr_codec_factory.pool = pjmedia_endpt_create_pool(endpt, "amrnb", 1000, + amr_codec_factory.pool = pjmedia_endpt_create_pool(endpt, "amr", 1000, 1000); if (!amr_codec_factory.pool) return PJ_ENOMEM; @@ -214,16 +247,36 @@ on_error: return status; } +PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_init( pjmedia_endpt *endpt ) +{ + amr_codec_factory.init[IDX_AMR_NB] = PJ_TRUE; + + return amr_init(endpt); +} + +PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrwb_init( pjmedia_endpt *endpt ) +{ + amr_codec_factory.init[IDX_AMR_WB] = PJ_TRUE; + + return amr_init(endpt); +} + /* - * Unregister AMR-NB codec factory from pjmedia endpoint and deinitialize - * the AMR-NB codec library. + * Unregister AMR codec factory from pjmedia endpoint and deinitialize + * the AMR codec library. */ -PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_deinit(void) +static pj_status_t amr_deinit(void) { pjmedia_codec_mgr *codec_mgr; pj_status_t status; + if (amr_codec_factory.init[IDX_AMR_NB] || + amr_codec_factory.init[IDX_AMR_WB]) + { + return PJ_SUCCESS; + } + if (amr_codec_factory.pool == NULL) return PJ_SUCCESS; @@ -235,7 +288,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_deinit(void) return PJ_EINVALIDOP; } - /* Unregister AMR-NB codec factory. */ + /* Unregister AMR codec factory. */ status = pjmedia_codec_mgr_unregister_factory(codec_mgr, &amr_codec_factory.base); @@ -246,50 +299,93 @@ PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_deinit(void) return status; } +PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_deinit(void) +{ + amr_codec_factory.init[IDX_AMR_NB] = PJ_FALSE; + + return amr_deinit(); +} + +PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrwb_deinit(void) +{ + amr_codec_factory.init[IDX_AMR_WB] = PJ_FALSE; + + return amr_deinit(); +} -PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_set_config( - const pjmedia_codec_amrnb_config *config) +static pj_status_t +amr_set_config(unsigned idx, const pjmedia_codec_amr_config *config) { unsigned nbitrates; - - def_config = *config; + def_config[idx] = *config; /* Normalize bitrate. */ - nbitrates = PJ_ARRAY_SIZE(pjmedia_codec_amrnb_bitrates); - if (def_config.bitrate < pjmedia_codec_amrnb_bitrates[0]) - def_config.bitrate = pjmedia_codec_amrnb_bitrates[0]; - else if (def_config.bitrate > pjmedia_codec_amrnb_bitrates[nbitrates-1]) - def_config.bitrate = pjmedia_codec_amrnb_bitrates[nbitrates-1]; - else + nbitrates = PJ_ARRAY_SIZE(amr_bitrates[idx]); + if (def_config[idx].bitrate < amr_bitrates[idx][0]) { + def_config[idx].bitrate = amr_bitrates[idx][0]; + } else if (def_config[idx].bitrate > amr_bitrates[idx][nbitrates-1]) { + def_config[idx].bitrate = amr_bitrates[idx][nbitrates-1]; + } else { unsigned i; for (i = 0; i < nbitrates; ++i) { - if (def_config.bitrate <= pjmedia_codec_amrnb_bitrates[i]) + if (def_config[idx].bitrate <= amr_bitrates[idx][i]) break; } - def_config.bitrate = pjmedia_codec_amrnb_bitrates[i]; + def_config[idx].bitrate = amr_bitrates[idx][i]; } return PJ_SUCCESS; } -/* - * Check if factory can allocate the specified codec. +PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_set_config( + const pjmedia_codec_amrnb_config *config) +{ + return amr_set_config(IDX_AMR_NB, (const pjmedia_codec_amr_config *)config); +} + +PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrwb_set_config( + const pjmedia_codec_amrwb_config *config) +{ + return amr_set_config(IDX_AMR_WB, (const pjmedia_codec_amr_config *)config); +} + +/* + * Check if factory can allocate the specified codec. */ static pj_status_t amr_test_alloc( pjmedia_codec_factory *factory, const pjmedia_codec_info *info ) { + const pj_str_t amr_tag = { "AMR", 3}; + const pj_str_t amrwb_tag = { "AMR-WB", 6}; PJ_UNUSED_ARG(factory); + /* Type MUST be audio. */ + if (info->type != PJMEDIA_TYPE_AUDIO) + return PJMEDIA_CODEC_EUNSUP; + /* Check payload type. */ - if (info->pt != PJMEDIA_RTP_PT_AMR) + if (info->pt != PJMEDIA_RTP_PT_AMR && info->pt != PJMEDIA_RTP_PT_AMRWB) return PJMEDIA_CODEC_EUNSUP; + + /* Check encoding name. */ + if (pj_stricmp(&info->encoding_name, &amr_tag) != 0 && + pj_stricmp(&info->encoding_name, &amrwb_tag) != 0) + { + return PJMEDIA_CODEC_EUNSUP; + } + + /* Check clock-rate */ + if ((info->clock_rate == 8000 && amr_codec_factory.init[IDX_AMR_NB]) || + (info->clock_rate == 16000 && amr_codec_factory.init[IDX_AMR_WB])) + { + return PJ_SUCCESS; + } - /* Ignore the rest, since it's static payload type. */ - - return PJ_SUCCESS; + /* Unsupported or disabled. */ + return PJMEDIA_CODEC_EUNSUP; } /* @@ -299,23 +395,25 @@ static pj_status_t amr_default_attr( pjmedia_codec_factory *factory, const pjmedia_codec_info *id, pjmedia_codec_param *attr ) { + unsigned idx; + PJ_UNUSED_ARG(factory); - PJ_UNUSED_ARG(id); + idx = (id->clock_rate <= 8000? IDX_AMR_NB: IDX_AMR_WB); pj_bzero(attr, sizeof(pjmedia_codec_param)); - attr->info.clock_rate = 8000; + attr->info.clock_rate = (id->clock_rate <= 8000? 8000: 16000); attr->info.channel_cnt = 1; - attr->info.avg_bps = def_config.bitrate; - attr->info.max_bps = pjmedia_codec_amrnb_bitrates[7]; + attr->info.avg_bps = def_config[idx].bitrate; + attr->info.max_bps = amr_bitrates[idx][PJ_ARRAY_SIZE(amr_bitrates[idx])-1]; attr->info.pcm_bits_per_sample = 16; attr->info.frm_ptime = 20; - attr->info.pt = PJMEDIA_RTP_PT_AMR; + attr->info.pt = (pj_uint8_t)id->pt; attr->setting.frm_per_pkt = 2; attr->setting.vad = 1; attr->setting.plc = 1; - if (def_config.octet_align) { + if (def_config[idx].octet_align) { attr->setting.dec_fmtp.cnt = 1; attr->setting.dec_fmtp.param[0].name = pj_str("octet-align"); attr->setting.dec_fmtp.param[0].val = pj_str("1"); @@ -328,7 +426,7 @@ static pj_status_t amr_default_attr( pjmedia_codec_factory *factory, /* - * Enum codecs supported by this factory (i.e. only AMR-NB!). + * Enum codecs supported by this factory (i.e. AMR-NB and AMR-WB). */ static pj_status_t amr_enum_codecs( pjmedia_codec_factory *factory, unsigned *count, @@ -337,21 +435,34 @@ static pj_status_t amr_enum_codecs( pjmedia_codec_factory *factory, PJ_UNUSED_ARG(factory); PJ_ASSERT_RETURN(codecs && *count > 0, PJ_EINVAL); - pj_bzero(&codecs[0], sizeof(pjmedia_codec_info)); - codecs[0].encoding_name = pj_str("AMR"); - codecs[0].pt = PJMEDIA_RTP_PT_AMR; - codecs[0].type = PJMEDIA_TYPE_AUDIO; - codecs[0].clock_rate = 8000; - codecs[0].channel_cnt = 1; + *count = 0; - *count = 1; + if (amr_codec_factory.init[IDX_AMR_NB]) { + pj_bzero(&codecs[*count], sizeof(pjmedia_codec_info)); + codecs[*count].encoding_name = pj_str("AMR"); + codecs[*count].pt = PJMEDIA_RTP_PT_AMR; + codecs[*count].type = PJMEDIA_TYPE_AUDIO; + codecs[*count].clock_rate = 8000; + codecs[*count].channel_cnt = 1; + (*count)++; + } + + if (amr_codec_factory.init[IDX_AMR_NB]) { + pj_bzero(&codecs[*count], sizeof(pjmedia_codec_info)); + codecs[*count].encoding_name = pj_str("AMR-WB"); + codecs[*count].pt = PJMEDIA_RTP_PT_AMRWB; + codecs[*count].type = PJMEDIA_TYPE_AUDIO; + codecs[*count].clock_rate = 16000; + codecs[*count].channel_cnt = 1; + (*count)++; + } return PJ_SUCCESS; } /* - * Allocate a new AMR-NB codec instance. + * Allocate a new AMR codec instance. */ static pj_status_t amr_alloc_codec( pjmedia_codec_factory *factory, const pjmedia_codec_info *id, @@ -365,7 +476,7 @@ static pj_status_t amr_alloc_codec( pjmedia_codec_factory *factory, PJ_ASSERT_RETURN(factory && id && p_codec, PJ_EINVAL); PJ_ASSERT_RETURN(factory == &amr_codec_factory.base, PJ_EINVAL); - pool = pjmedia_endpt_create_pool(amr_codec_factory.endpt, "amrnb-inst", + pool = pjmedia_endpt_create_pool(amr_codec_factory.endpt, "amr-inst", 512, 512); codec = PJ_POOL_ZALLOC_T(pool, pjmedia_codec); @@ -379,7 +490,9 @@ static pj_status_t amr_alloc_codec( pjmedia_codec_factory *factory, #if USE_PJMEDIA_PLC /* Create PLC */ - status = pjmedia_plc_create(pool, 8000, 160, 0, &amr_data->plc); + status = pjmedia_plc_create(pool, id->clock_rate, + id->clock_rate * FRAME_LENGTH_MS / 1000, 0, + &amr_data->plc); if (status != PJ_SUCCESS) { return status; } @@ -437,12 +550,15 @@ static pj_status_t amr_codec_open( pjmedia_codec *codec, pj_uint8_t octet_align = 0; pj_int8_t enc_mode; const pj_str_t STR_FMTP_OCTET_ALIGN = {"octet-align", 11}; + unsigned idx; PJ_ASSERT_RETURN(codec && attr, PJ_EINVAL); PJ_ASSERT_RETURN(amr_data != NULL, PJ_EINVALIDOP); + idx = (attr->info.clock_rate <= 8000? IDX_AMR_NB: IDX_AMR_WB); enc_mode = pjmedia_codec_amr_get_mode(attr->info.avg_bps); - pj_assert(enc_mode >= 0 && enc_mode <= 7); + pj_assert(enc_mode >= 0 && + enc_mode < PJ_ARRAY_SIZE(amr_bitrates[idx])); /* Check octet-align */ for (i = 0; i < attr->setting.dec_fmtp.cnt; ++i) { @@ -476,7 +592,9 @@ static pj_status_t amr_codec_open( pjmedia_codec *codec, p = pj_strbuf(&attr->setting.enc_fmtp.param[i].val); l = pj_strlen(&attr->setting.enc_fmtp.param[i].val); while (l--) { - if (*p>='0' && *p<='7') { + if (*p>='0' && + *p<=('0'+PJ_ARRAY_SIZE(amr_bitrates[idx])-1)) + { pj_int8_t tmp = *p - '0' - enc_mode; if (PJ_ABS(diff) > PJ_ABS(tmp) || @@ -496,38 +614,56 @@ static pj_status_t amr_codec_open( pjmedia_codec *codec, } } + amr_data->clock_rate = attr->info.clock_rate; amr_data->vad_enabled = (attr->setting.vad != 0); amr_data->plc_enabled = (attr->setting.plc != 0); amr_data->enc_mode = enc_mode; - amr_data->encoder = Encoder_Interface_init(amr_data->vad_enabled); + if (idx == IDX_AMR_NB) { +#ifdef USE_AMRNB + amr_data->encoder = Encoder_Interface_init(amr_data->vad_enabled); +#endif + } else { +#ifdef USE_AMRWB + amr_data->encoder = E_IF_init(); +#endif + } if (amr_data->encoder == NULL) { - TRACE_((THIS_FILE, "Encoder_Interface_init() failed")); + TRACE_((THIS_FILE, "Encoder initialization failed")); amr_codec_close(codec); return PJMEDIA_CODEC_EFAILED; } setting = &amr_data->enc_setting; pj_bzero(setting, sizeof(pjmedia_codec_amr_pack_setting)); - setting->amr_nb = 1; + setting->amr_nb = (idx == IDX_AMR_NB? 1: 0); setting->reorder = 0; setting->octet_aligned = octet_align; setting->cmr = 15; - amr_data->decoder = Decoder_Interface_init(); + if (idx == IDX_AMR_NB) { +#ifdef USE_AMRNB + amr_data->decoder = Decoder_Interface_init(); +#endif + } else { +#ifdef USE_AMRWB + amr_data->decoder = D_IF_init(); +#endif + } if (amr_data->decoder == NULL) { - TRACE_((THIS_FILE, "Decoder_Interface_init() failed")); + TRACE_((THIS_FILE, "Decoder initialization failed")); amr_codec_close(codec); return PJMEDIA_CODEC_EFAILED; } setting = &amr_data->dec_setting; pj_bzero(setting, sizeof(pjmedia_codec_amr_pack_setting)); - setting->amr_nb = 1; + setting->amr_nb = (idx == IDX_AMR_NB? 1: 0); setting->reorder = 0; setting->octet_aligned = octet_align; - TRACE_((THIS_FILE, "AMR-NB codec allocated: vad=%d, plc=%d, bitrate=%d", + TRACE_((THIS_FILE, "AMR codec allocated: clockrate=%d vad=%d, plc=%d," + " bitrate=%d", amr_data->clock_rate, amr_data->vad_enabled, amr_data->plc_enabled, - pjmedia_codec_amrnb_bitrates[amr_data->enc_mode])); + amr_bitrates[idx][amr_data->enc_mode])); return PJ_SUCCESS; } @@ -545,16 +681,32 @@ static pj_status_t amr_codec_close( pjmedia_codec *codec ) PJ_ASSERT_RETURN(amr_data != NULL, PJ_EINVALIDOP); if (amr_data->encoder) { - Encoder_Interface_exit(amr_data->encoder); + if (amr_data->enc_setting.amr_nb) { +#ifdef USE_AMRNB + Encoder_Interface_exit(amr_data->encoder); +#endif + } else { +#ifdef USE_AMRWB + E_IF_exit(amr_data->encoder); +#endif + } amr_data->encoder = NULL; } if (amr_data->decoder) { - Decoder_Interface_exit(amr_data->decoder); + if (amr_data->dec_setting.amr_nb) { +#ifdef USE_AMRNB + Decoder_Interface_exit(amr_data->decoder); +#endif + } else { +#ifdef USE_AMRWB + D_IF_exit(amr_data->decoder); +#endif + } amr_data->decoder = NULL; } - TRACE_((THIS_FILE, "AMR-NB codec closed")); + TRACE_((THIS_FILE, "AMR codec closed")); return PJ_SUCCESS; } @@ -575,11 +727,15 @@ static pj_status_t amr_codec_modify( pjmedia_codec *codec, amr_data->vad_enabled = (attr->setting.vad != 0); amr_data->plc_enabled = (attr->setting.plc != 0); - if (prev_vad_state != amr_data->vad_enabled) { + if (amr_data->enc_setting.amr_nb && + prev_vad_state != amr_data->vad_enabled) + { /* Reinit AMR encoder to update VAD setting */ TRACE_((THIS_FILE, "Reiniting AMR encoder to update VAD setting.")); +#ifdef USE_AMRNB Encoder_Interface_exit(amr_data->encoder); amr_data->encoder = Encoder_Interface_init(amr_data->vad_enabled); +#endif if (amr_data->encoder == NULL) { TRACE_((THIS_FILE, "Encoder_Interface_init() failed")); amr_codec_close(codec); @@ -587,7 +743,7 @@ static pj_status_t amr_codec_modify( pjmedia_codec *codec, } } - TRACE_((THIS_FILE, "AMR-NB codec modified: vad=%d, plc=%d", + TRACE_((THIS_FILE, "AMR codec modified: vad=%d, plc=%d", amr_data->vad_enabled, amr_data->plc_enabled)); return PJ_SUCCESS; } @@ -606,6 +762,7 @@ static pj_status_t amr_codec_parse( pjmedia_codec *codec, struct amr_data *amr_data = (struct amr_data*) codec->codec_data; pj_uint8_t cmr; pj_status_t status; + unsigned idx = (amr_data->enc_setting.amr_nb? 0: 1); status = pjmedia_codec_amr_parse(pkt, pkt_size, ts, &amr_data->dec_setting, frames, frame_cnt, &cmr); @@ -613,11 +770,11 @@ static pj_status_t amr_codec_parse( pjmedia_codec *codec, return status; /* Check for Change Mode Request. */ - if (cmr <= 7 && amr_data->enc_mode != cmr) { + if (cmr < PJ_ARRAY_SIZE(amr_bitrates[idx]) && amr_data->enc_mode != cmr) { amr_data->enc_mode = cmr; - TRACE_((THIS_FILE, "AMR-NB encoder switched mode to %d (%dbps)", - amr_data->enc_mode, - pjmedia_codec_amrnb_bitrates[amr_data->enc_mode])); + TRACE_((THIS_FILE, "AMR encoder switched mode to %d (%dbps)", + amr_data->enc_mode, + amr_bitrates[idx][amr_data->enc_mode])); } return PJ_SUCCESS; @@ -649,7 +806,7 @@ static pj_status_t amr_codec_encode( pjmedia_codec *codec, PJ_ASSERT_RETURN(input && output, PJ_EINVAL); nsamples = input->size >> 1; - samples_per_frame = 160; + samples_per_frame = amr_data->clock_rate * FRAME_LENGTH_MS / 1000; PJ_ASSERT_RETURN(nsamples % samples_per_frame == 0, PJMEDIA_CODEC_EPCMFRMINLEN); @@ -661,20 +818,30 @@ static pj_status_t amr_codec_encode( pjmedia_codec *codec, speech = (pj_int16_t*)input->buf; bitstream = (unsigned char*)output->buf; while (nsamples >= samples_per_frame) { - size = Encoder_Interface_Encode (amr_data->encoder, amr_data->enc_mode, - speech, bitstream, 0); + if (amr_data->enc_setting.amr_nb) { +#ifdef USE_AMRNB + size = Encoder_Interface_Encode (amr_data->encoder, + amr_data->enc_mode, + speech, bitstream, 0); +#endif + } else { +#ifdef USE_AMRWB + size = E_IF_encode (amr_data->encoder, amr_data->enc_mode, + speech, bitstream, 0); +#endif + } if (size == 0) { output->size = 0; output->buf = NULL; output->type = PJMEDIA_FRAME_TYPE_NONE; - TRACE_((THIS_FILE, "AMR-NB encode() failed")); + TRACE_((THIS_FILE, "AMR encode() failed")); return PJMEDIA_CODEC_EFAILED; } - nsamples -= 160; + nsamples -= samples_per_frame; speech += samples_per_frame; bitstream += size; out_size += size; - TRACE_((THIS_FILE, "AMR-NB encode(): mode=%d, size=%d", + TRACE_((THIS_FILE, "AMR encode(): mode=%d, size=%d", amr_data->enc_mode, out_size)); } @@ -690,8 +857,13 @@ static pj_status_t amr_codec_encode( pjmedia_codec *codec, info->mode = (pj_int8_t)amr_data->enc_mode; info->start_bit = 0; frames[i].buf = p + 1; - frames[i].size = (info->frame_type <= 8)? - pjmedia_codec_amrnb_framelen[info->frame_type] : 0; + if (amr_data->enc_setting.amr_nb) { + frames[i].size = (info->frame_type <= 8)? + pjmedia_codec_amrnb_framelen[info->frame_type] : 0; + } else { + frames[i].size = (info->frame_type <= 9)? + pjmedia_codec_amrwb_framelen[info->frame_type] : 0; + } p += frames[i].size + 1; /* Count the number of SID and DTX frames */ @@ -713,7 +885,8 @@ static pj_status_t amr_codec_encode( pjmedia_codec *codec, dtx_duration = pj_timestamp_diff32(&amr_data->last_tx, &input->timestamp); if (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || - dtx_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) + dtx_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD* + amr_data->clock_rate/1000) { output->size = 0; output->type = PJMEDIA_FRAME_TYPE_NONE; @@ -755,31 +928,43 @@ static pj_status_t amr_codec_decode( pjmedia_codec *codec, struct amr_data *amr_data = (struct amr_data*) codec->codec_data; pjmedia_frame input_; pjmedia_codec_amr_bit_info *info; - /* VA AMR-NB decoding buffer: AMR-NB max frame size + 1 byte header. */ - unsigned char bitstream[32]; + unsigned out_size; + /* AMR decoding buffer: AMR max frame size + 1 byte header. */ + unsigned char bitstream[61]; pj_assert(amr_data != NULL); PJ_ASSERT_RETURN(input && output, PJ_EINVAL); - if (output_buf_len < 320) + out_size = amr_data->clock_rate * FRAME_LENGTH_MS / 1000 * 2; + if (output_buf_len < out_size) return PJMEDIA_CODEC_EPCMTOOSHORT; input_.buf = &bitstream[1]; - input_.size = 31; /* AMR-NB max frame size */ + /* AMR max frame size */ + input_.size = (amr_data->dec_setting.amr_nb? 31: 60); pjmedia_codec_amr_predecode(input, &amr_data->dec_setting, &input_); info = (pjmedia_codec_amr_bit_info*)&input_.bit_info; - /* VA AMRNB decoder requires frame info in the first byte. */ + /* VA AMR decoder requires frame info in the first byte. */ bitstream[0] = (info->frame_type << 3) | (info->good_quality << 2); - TRACE_((THIS_FILE, "AMR-NB decode(): mode=%d, ft=%d, size=%d", + TRACE_((THIS_FILE, "AMR decode(): mode=%d, ft=%d, size=%d", info->mode, info->frame_type, input_.size)); /* Decode */ - Decoder_Interface_Decode(amr_data->decoder, bitstream, - (pj_int16_t*)output->buf, 0); + if (amr_data->dec_setting.amr_nb) { +#ifdef USE_AMRNB + Decoder_Interface_Decode(amr_data->decoder, bitstream, + (pj_int16_t*)output->buf, 0); +#endif + } else { +#ifdef USE_AMRWB + D_IF_decode(amr_data->decoder, bitstream, + (pj_int16_t*)output->buf, 0); +#endif + } - output->size = 320; + output->size = out_size; output->type = PJMEDIA_FRAME_TYPE_AUDIO; output->timestamp = input->timestamp; @@ -804,16 +989,17 @@ static pj_status_t amr_codec_recover( pjmedia_codec *codec, struct pjmedia_frame *output) { struct amr_data *amr_data = codec->codec_data; + unsigned out_size = amr_data->clock_rate * FRAME_LENGTH_MS / 1000 * 2; TRACE_((THIS_FILE, "amr_codec_recover")); PJ_ASSERT_RETURN(amr_data->plc_enabled, PJ_EINVALIDOP); - PJ_ASSERT_RETURN(output_buf_len >= 320, PJMEDIA_CODEC_EPCMTOOSHORT); + PJ_ASSERT_RETURN(output_buf_len >= out_size, PJMEDIA_CODEC_EPCMTOOSHORT); pjmedia_plc_generate(amr_data->plc, (pj_int16_t*)output->buf); - output->size = 320; + output->size = out_size; output->type = PJMEDIA_FRAME_TYPE_AUDIO; return PJ_SUCCESS; @@ -821,11 +1007,17 @@ static pj_status_t amr_codec_recover( pjmedia_codec *codec, #endif #if defined(_MSC_VER) && PJMEDIA_AUTO_LINK_OPENCORE_AMR_LIBS -# if PJMEDIA_OPENCORE_AMR_BUILT_WITH_GCC -# pragma comment( lib, "libopencore-amrnb.a") -# else -# error Unsupported OpenCORE AMR library, fix here -# endif +# if PJMEDIA_OPENCORE_AMR_BUILT_WITH_GCC +# ifdef USE_AMRNB +# pragma comment( lib, "libopencore-amrnb.a") +# endif +# ifdef USE_AMRWB +# pragma comment( lib, "libopencore-amrwb.a") +# pragma comment( lib, "libvo-amrwbenc.a") +# endif +# else +# error Unsupported OpenCORE AMR library, fix here +# endif #endif #endif diff --git a/pjmedia/src/test/mips_test.c b/pjmedia/src/test/mips_test.c index 4d5c94cb..933b9b3b 100644 --- a/pjmedia/src/test/mips_test.c +++ b/pjmedia/src/test/mips_test.c @@ -943,6 +943,23 @@ static pjmedia_port* amr_encode_decode(pj_pool_t *pool, } #endif /* PJMEDIA_HAS_OPENCORE_AMRNB_CODEC */ +#if PJMEDIA_HAS_OPENCORE_AMRWB_CODEC +/* AMR-WB benchmark benchmark */ +static pjmedia_port* amrwb_encode_decode(pj_pool_t *pool, + unsigned clock_rate, + unsigned channel_count, + unsigned samples_per_frame, + unsigned flags, + struct test_entry *te) +{ + return codec_encode_decode(pool, "AMR/16000", + &pjmedia_codec_opencore_amrwb_init, + &pjmedia_codec_opencore_amrwb_deinit, + clock_rate, channel_count, + samples_per_frame, flags, te); +} +#endif /* PJMEDIA_HAS_OPENCORE_AMRWB_CODEC */ + #if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0 static pj_status_t init_l16_default(pjmedia_endpt *endpt) { @@ -2024,7 +2041,24 @@ static pjmedia_port* create_stream_amr( pj_pool_t *pool, clock_rate, channel_count, samples_per_frame, flags, te); } -#endif /* PJMEDIA_HAS_OPENCORE_AMRNB_CODEC */ +#endif /* PJMEDIA_HAS_OPENCORE_AMRNB_CODEC */ + +/* AMR-WB stream */ +#if PJMEDIA_HAS_OPENCORE_AMRWB_CODEC +static pjmedia_port* create_stream_amrwb( pj_pool_t *pool, + unsigned clock_rate, + unsigned channel_count, + unsigned samples_per_frame, + unsigned flags, + struct test_entry *te) +{ + return create_stream(pool, "AMR/16000", &pjmedia_codec_opencore_amrwb_init, + &pjmedia_codec_opencore_amrwb_deinit, + PJ_FALSE, PJ_FALSE, PJ_FALSE, + clock_rate, channel_count, + samples_per_frame, flags, te); +} +#endif /* PJMEDIA_HAS_OPENCORE_AMRWB_CODEC */ /***************************************************************************/ /* Delay buffer */ @@ -2419,6 +2453,9 @@ int mips_test(void) #if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC { "codec encode/decode - AMR-NB", OP_PUT, K8, &amr_encode_decode}, #endif +#if PJMEDIA_HAS_OPENCORE_AMRWB_CODEC + { "codec encode/decode - AMR-WB", OP_PUT, K16, &amrwb_encode_decode}, +#endif #if PJMEDIA_HAS_L16_CODEC { "codec encode/decode - L16/8000/1", OP_PUT, K8, &l16_8_encode_decode}, { "codec encode/decode - L16/16000/1", OP_PUT, K16, &l16_16_encode_decode}, @@ -2447,6 +2484,9 @@ int mips_test(void) #if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC { "stream TX/RX - AMR-NB", OP_PUT_GET, K8, &create_stream_amr}, #endif +#if PJMEDIA_HAS_OPENCORE_AMRWB_CODEC + { "stream TX/RX - AMR-WB", OP_PUT_GET, K16, &create_stream_amrwb}, +#endif }; unsigned i, c, k[3] = {K8, K16, K32}, clock_rates[3] = {8000, 16000, 32000}; |