diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2008-08-19 11:23:33 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2008-08-19 11:23:33 +0000 |
| commit | 51853fdf4039cb3fe9d4691756b3c0fa916650fe (patch) | |
| tree | e410811d285ea5e2b9cb924d1e0ce55c41019e21 | |
| parent | 5c4dfab39616ef259653a2a45b4034db13a81854 (diff) | |
Ticket #583: Added missing IPP codec deinit and fixed matching #if-#endif in IPP codec encode.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2223 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ipp_codecs.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c index 476e54e3..861bc706 100644 --- a/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -921,13 +921,13 @@ static pj_status_t ipp_codec_encode( pjmedia_codec *codec, if (nsamples == samples_per_frame) *info |= 0x40; } +#endif pcm_in += samples_per_frame; nsamples -= samples_per_frame; tx += out.nbytes; bits_out += out.nbytes; } -#endif if (ipp_codec[codec_data->codec_idx].pack != NULL) { ipp_codec[codec_data->codec_idx].pack(codec_data, output->buf, diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 6c677622..2882c4ae 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -569,6 +569,10 @@ pj_status_t pjsua_media_subsys_destroy(void) pjmedia_codec_g722_deinit(); # endif /* PJMEDIA_HAS_G722_CODEC */ +# if PJMEDIA_HAS_INTEL_IPP_CODECS + pjmedia_codec_ipp_deinit(); +# endif /* PJMEDIA_HAS_INTEL_IPP_CODECS */ + # if PJMEDIA_HAS_L16_CODEC pjmedia_codec_l16_deinit(); # endif /* PJMEDIA_HAS_L16_CODEC */ |