diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2010-08-11 07:18:08 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2010-08-11 07:18:08 +0000 |
| commit | 3ba193765e2b418e7688eb9088fbbeb6ce492e56 (patch) | |
| tree | ea932c16fbae9946c0fdbf39c70dda34ec723f1e /pjmedia/src | |
| parent | eac79b106f7b928ef0ff06350f4486ae39008fc3 (diff) | |
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
Diffstat (limited to 'pjmedia/src')
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ipp_codecs.c | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c index 86449268..1caf08c4 100644 --- a/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -644,6 +644,19 @@ static pj_status_t pack_g7221( ipp_private_t *codec_data, void *pkt, return PJ_SUCCESS; } + +#include <pjmedia-codec/g7221.h> + + +PJ_DEF(pj_status_t) pjmedia_codec_g7221_set_pcm_shift(int val) +{ + PJ_ASSERT_RETURN(val >= 0, PJ_EINVAL); + + ipp_factory.g7221_pcm_shift = val; + return PJ_SUCCESS; +} + + #endif /* PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 */ /* @@ -734,34 +747,6 @@ PJ_DEF(pj_status_t) pjmedia_codec_ipp_deinit(void) return status; } -/* - * Get current IPP codecs configuration settings. - */ -PJ_DEF(pj_status_t) pjmedia_codec_ipp_get_config( - pjmedia_codec_ipp_config *cfg) -{ - PJ_ASSERT_RETURN(cfg, PJ_EINVAL); - - pj_bzero(cfg, sizeof(*cfg)); - cfg->g7221_pcm_shift = ipp_factory.g7221_pcm_shift; - - return PJ_SUCCESS; -} - - -/* - * Set IPP codecs configuration settings. - */ -PJ_DECL(pj_status_t) pjmedia_codec_ipp_set_config( - const pjmedia_codec_ipp_config *cfg) -{ - PJ_ASSERT_RETURN(cfg, PJ_EINVAL); - - ipp_factory.g7221_pcm_shift = cfg->g7221_pcm_shift; - - return PJ_SUCCESS; -} - /* * Check if factory can allocate the specified codec. |