diff options
Diffstat (limited to 'pjmedia/include')
| -rw-r--r-- | pjmedia/include/pjmedia-codec.h | 1 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 8 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-codec/g7221.h | 113 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-codec/types.h | 14 |
4 files changed, 131 insertions, 5 deletions
diff --git a/pjmedia/include/pjmedia-codec.h b/pjmedia/include/pjmedia-codec.h index 8b7c3f64..e6d211da 100644 --- a/pjmedia/include/pjmedia-codec.h +++ b/pjmedia/include/pjmedia-codec.h @@ -30,6 +30,7 @@ #include <pjmedia-codec/speex.h> #include <pjmedia-codec/ilbc.h> #include <pjmedia-codec/g722.h> +#include <pjmedia-codec/g7221.h> #include <pjmedia-codec/ipp_codecs.h> #include <pjmedia-codec/passthrough.h> diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index 805ac63c..046c8618 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -233,4 +233,12 @@ #endif +/** + * G.722.1 codec is disabled by default, it's currently under development. + */ +#ifndef PJMEDIA_HAS_G7221_CODEC +# define PJMEDIA_HAS_G7221_CODEC 0 +#endif + + #endif /* __PJMEDIA_CODEC_CONFIG_H__ */ diff --git a/pjmedia/include/pjmedia-codec/g7221.h b/pjmedia/include/pjmedia-codec/g7221.h new file mode 100644 index 00000000..11ec11f4 --- /dev/null +++ b/pjmedia/include/pjmedia-codec/g7221.h @@ -0,0 +1,113 @@ +/* $Id$ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * 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_CODECS_G7221_H__ +#define __PJMEDIA_CODECS_G7221_H__ + +/** + * @file pjmedia-codec/g7221.h + * @brief G722.1 codec. + */ + +#include <pjmedia-codec/types.h> + +/** + * @defgroup PJMED_G7221_CODEC G722.1 Codec + * @ingroup PJMEDIA_CODEC + * @brief Implementation of G722.1 codec + * @{ + * + * <b>G722.1 licensed from PolycomŽ</b> + * <b>G722.1 Annex C licensed from PolycomŽ</b> + * + * This section describes functions to register and register G722.1 codec + * factory to the codec manager. After the codec factory has been registered, + * application can use @ref PJMEDIA_CODEC API to manipulate the codec. + * + * PJMEDIA G722.1 codec implementation is based on ITU-T Recommendation + * G.722.1 (05/2005) C fixed point implementation including its Annex C. + * + * G722.1 is a low complexity codec that supports for 7kHz and 14kHz bandwidth + * audio signals working at bitrates ranging from 16kbps to 48kbps. It may be + * used with speech or music inputs. + * + * The codec implementation supports for standard and non-standard bitrates. + * By default, the standard bitrates are enabled upon initialization, i.e.: + * - 24kbps and 32kbps for audio bandwidth 7 kHz (16kHz sampling rate), + * - 24kbps, 32kbps, and 48kbps for audio bandwidth 14 kHz (32kHz sampling + * rate). + * The usage of non-standard bitrates must follow this requirements: + * - for sampling rate 16kHz: 16000 to 32000 bps, it must be a multiple of 400 + * - for sampling rate 32kHz: 24000 to 48000 bps, it must be a multiple of 400 + * Note that currently it is only up to two non-standard modes can be enabled + * at one time. + */ + +PJ_BEGIN_DECL + +/** + * Initialize and register G722.1 codec factory to pjmedia endpoint. + * + * @param endpt The pjmedia endpoint. + * + * @return PJ_SUCCESS on success. + */ +PJ_DECL(pj_status_t) pjmedia_codec_g7221_init( pjmedia_endpt *endpt ); + + +/** + * Enable and disable G722.1 mode. By default, the standard modes are + * enabled upon initialization, i.e.: + * - sampling rate 16kHz, bitrate 24kbps and 32kbps. + * - sampling rate 32kHz, bitrate 24kbps, 32kbps, and 48kbps. + * This function can also be used for enabling non-standard modes. + * Note that currently it is only up to two non-standard modes can be + * enabled at one time. + * + * @param sample_rate PCM sampling rate, in Hz, valid values are only + * 16000 and 32000. + * @param bitrate G722.1 bitrate, in bps, the valid values are + * standard and non-standard bitrates as described + * above. + * @param enabled PJ_TRUE for enabling specified mode. + * + * @return PJ_SUCCESS on success. + */ +PJ_DECL(pj_status_t) pjmedia_codec_g7221_set_mode(unsigned sample_rate, + unsigned bitrate, + pj_bool_t enabled); + + +/** + * Unregister G722.1 codecs factory from pjmedia endpoint. + * + * @return PJ_SUCCESS on success. + */ +PJ_DECL(pj_status_t) pjmedia_codec_g7221_deinit(void); + + +PJ_END_DECL + + +/** + * @} + */ + +#endif /* __PJMEDIA_CODECS_G7221_H__ */ + diff --git a/pjmedia/include/pjmedia-codec/types.h b/pjmedia/include/pjmedia-codec/types.h index c1bae165..dde1371d 100644 --- a/pjmedia/include/pjmedia-codec/types.h +++ b/pjmedia/include/pjmedia-codec/types.h @@ -22,7 +22,6 @@ #include <pjmedia-codec/config.h> - /** * These are the dynamic payload types that are used by codecs in * this library. Also see the header file <pjmedia/codec.h> for list @@ -44,12 +43,12 @@ enum PJMEDIA_RTP_PT_SPEEX_UWB, /**< Speex 32KHz */ PJMEDIA_RTP_PT_L16_8KHZ_MONO, /**< L16 @ 8KHz, mono */ PJMEDIA_RTP_PT_L16_8KHZ_STEREO, /**< L16 @ 8KHz, stereo */ - PJMEDIA_RTP_PT_L16_11KHZ_MONO, /**< L16 @ 11KHz, mono */ - PJMEDIA_RTP_PT_L16_11KHZ_STEREO, /**< L16 @ 11KHz, stereo */ + //PJMEDIA_RTP_PT_L16_11KHZ_MONO, /**< L16 @ 11KHz, mono */ + //PJMEDIA_RTP_PT_L16_11KHZ_STEREO, /**< L16 @ 11KHz, stereo */ PJMEDIA_RTP_PT_L16_16KHZ_MONO, /**< L16 @ 16KHz, mono */ PJMEDIA_RTP_PT_L16_16KHZ_STEREO, /**< L16 @ 16KHz, stereo */ - PJMEDIA_RTP_PT_L16_22KHZ_MONO, /**< L16 @ 22KHz, mono */ - PJMEDIA_RTP_PT_L16_22KHZ_STEREO, /**< L16 @ 22KHz, stereo */ + //PJMEDIA_RTP_PT_L16_22KHZ_MONO, /**< L16 @ 22KHz, mono */ + //PJMEDIA_RTP_PT_L16_22KHZ_STEREO, /**< L16 @ 22KHz, stereo */ PJMEDIA_RTP_PT_L16_32KHZ_MONO, /**< L16 @ 32KHz, mono */ PJMEDIA_RTP_PT_L16_32KHZ_STEREO, /**< L16 @ 32KHz, stereo */ PJMEDIA_RTP_PT_L16_48KHZ_MONO, /**< L16 @ 48KHz, mono */ @@ -65,6 +64,11 @@ enum PJMEDIA_RTP_PT_G722_1_16, /**< G722.1 (16Kbps) */ PJMEDIA_RTP_PT_G722_1_24, /**< G722.1 (24Kbps) */ PJMEDIA_RTP_PT_G722_1_32, /**< G722.1 (32Kbps) */ + PJMEDIA_RTP_PT_G7221C_24, /**< G722.1 Annex C (24Kbps)*/ + PJMEDIA_RTP_PT_G7221C_32, /**< G722.1 Annex C (32Kbps)*/ + PJMEDIA_RTP_PT_G7221C_48, /**< G722.1 Annex C (48Kbps)*/ + PJMEDIA_RTP_PT_G7221_RSV1, /**< G722.1 reserve */ + PJMEDIA_RTP_PT_G7221_RSV2, /**< G722.1 reserve */ }; |