From 3ba193765e2b418e7688eb9088fbbeb6ce492e56 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Wed, 11 Aug 2010 07:18:08 +0000 Subject: Re #1106: Reverted back the IPP codec APIs pjmedia_codec_ipp_set/get_config() as currently to set PCM signal level adjustment can be done using the existing G722.1 API pjmedia_codec_g7221_set_pcm_shift(). git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3263 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/include/pjmedia-codec/g7221.h | 4 +++ pjmedia/include/pjmedia-codec/ipp_codecs.h | 39 ------------------------------ 2 files changed, 4 insertions(+), 39 deletions(-) (limited to 'pjmedia/include/pjmedia-codec') diff --git a/pjmedia/include/pjmedia-codec/g7221.h b/pjmedia/include/pjmedia-codec/g7221.h index 9785b44a..737dedd2 100644 --- a/pjmedia/include/pjmedia-codec/g7221.h +++ b/pjmedia/include/pjmedia-codec/g7221.h @@ -129,6 +129,10 @@ PJ_DECL(pj_status_t) pjmedia_codec_g7221_set_mode(unsigned sample_rate, * be shifted right by this value, and similarly PCM output samples from * the decoder will be shifted left by this value. * + * \note + * This function is also applicable for G722.1 implementation with IPP + * back-end. + * * Default value is PJMEDIA_G7221_DEFAULT_PCM_SHIFT. * * @param val The value diff --git a/pjmedia/include/pjmedia-codec/ipp_codecs.h b/pjmedia/include/pjmedia-codec/ipp_codecs.h index 42db8a0f..f0642382 100644 --- a/pjmedia/include/pjmedia-codec/ipp_codecs.h +++ b/pjmedia/include/pjmedia-codec/ipp_codecs.h @@ -291,23 +291,6 @@ PJ_BEGIN_DECL -/** - * IPP codecs configuration settings. - */ -typedef struct pjmedia_codec_ipp_config -{ - /** - * Specifies the G.722.1 codec encoder and decoder level adjustment. - * If the value is non-zero, then PCM input samples to the encoder will - * be shifted right by this value, and similarly PCM output samples from - * the decoder will be shifted left by this value. - * - * Default value is PJMEDIA_G7221_DEFAULT_PCM_SHIFT. - */ - unsigned g7221_pcm_shift; - -} pjmedia_codec_ipp_config; - /** * Initialize and register IPP codecs factory to pjmedia endpoint. @@ -319,28 +302,6 @@ typedef struct pjmedia_codec_ipp_config PJ_DECL(pj_status_t) pjmedia_codec_ipp_init( pjmedia_endpt *endpt ); -/** - * Get current IPP codecs configuration settings. - * - * @param cfg The IPP codecs configuration settings buffer. - * - * @return PJ_SUCCESS on success. - */ -PJ_DECL(pj_status_t) pjmedia_codec_ipp_get_config( - pjmedia_codec_ipp_config *cfg); - - -/** - * Set IPP codecs configuration settings. - * - * @param setting The IPP codecs configuration settings to be applied. - * - * @return PJ_SUCCESS on success. - */ -PJ_DECL(pj_status_t) pjmedia_codec_ipp_set_config( - const pjmedia_codec_ipp_config *cfg); - - /** * Unregister IPP codecs factory from pjmedia endpoint and deinitialize * the IPP codecs library. -- cgit v1.2.3