summaryrefslogtreecommitdiff
path: root/pjsip/src/pjsua-lib/pjsua_media.c
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2009-04-01 12:05:34 +0000
committerNanang Izzuddin <nanang@teluu.com>2009-04-01 12:05:34 +0000
commitd35a8221a34a562a88bdb7c947a7018080539c59 (patch)
treeaa5a5abd2d4421426668329a193d079d2d0b293d /pjsip/src/pjsua-lib/pjsua_media.c
parent5c2400ce2b6ca229272457be1ff383df1d9c6139 (diff)
Ticket #774:
- Initial source of G.722.1/Annex C integration. - Disabled some "odd" modes of L16 codec (11kHz & 22kHz mono & stereo) while releasing some payload types. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2563 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_media.c')
-rw-r--r--pjsip/src/pjsua-lib/pjsua_media.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c
index f49214a9..bd41186a 100644
--- a/pjsip/src/pjsua-lib/pjsua_media.c
+++ b/pjsip/src/pjsua-lib/pjsua_media.c
@@ -202,6 +202,16 @@ pj_status_t pjsua_media_subsys_init(const pjsua_media_config *cfg)
}
#endif /* PJMEDIA_HAS_PASSTHROUGH_CODECS */
+#if PJMEDIA_HAS_G7221_CODEC
+ /* Register G722.1 codecs */
+ status = pjmedia_codec_g7221_init(pjsua_var.med_endpt);
+ if (status != PJ_SUCCESS) {
+ pjsua_perror(THIS_FILE, "Error initializing G722.1 codec",
+ status);
+ return status;
+ }
+#endif /* PJMEDIA_HAS_G7221_CODEC */
+
#if PJMEDIA_HAS_L16_CODEC
/* Register L16 family codecs, but disable all */
status = pjmedia_codec_l16_init(pjsua_var.med_endpt, 0);
@@ -612,6 +622,10 @@ pj_status_t pjsua_media_subsys_destroy(void)
pjmedia_codec_passthrough_deinit();
# endif /* PJMEDIA_HAS_PASSTHROUGH_CODECS */
+# if PJMEDIA_HAS_G7221_CODEC
+ pjmedia_codec_g7221_deinit();
+# endif /* PJMEDIA_HAS_G7221_CODEC */
+
# if PJMEDIA_HAS_L16_CODEC
pjmedia_codec_l16_deinit();
# endif /* PJMEDIA_HAS_L16_CODEC */