Ticket #507: ticket507.3.patch

pjsip/src/pjsua-lib/pjsua_media.c

@@ -139 +139 @@
     }
 #endif  /* PJMEDIA_HAS_G711_CODEC */
 
+#if PJMEDIA_HAS_G722_CODEC
+    status = pjmedia_codec_g722_init( pjsua_var.med_endpt );
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error initializing G722 codec",
+                     status);
+        return status;
+    }
+#endif  /* PJMEDIA_HAS_G722_CODEC */
+
 #if PJMEDIA_HAS_L16_CODEC
     /* Register L16 family codecs, but disable all */
     status = pjmedia_codec_l16_init(pjsua_var.med_endpt, 0);
@@ -500 +509 @@
             pjmedia_codec_g711_deinit();
 #       endif   /* PJMEDIA_HAS_G711_CODEC */
 
+#       if PJMEDIA_HAS_G722_CODEC
+            pjmedia_codec_g722_deinit();
+#       endif   /* PJMEDIA_HAS_G722_CODEC */
+
 #       if PJMEDIA_HAS_L16_CODEC
             pjmedia_codec_l16_deinit();
 #       endif   /* PJMEDIA_HAS_L16_CODEC */
 
-
         pjmedia_endpt_destroy(pjsua_var.med_endpt);
         pjsua_var.med_endpt = NULL;
 

pjsip-apps/src/samples/pjsip-perf.c

@@ -936 +936 @@
 #if defined(PJMEDIA_HAS_SPEEX_CODEC) && PJMEDIA_HAS_SPEEX_CODEC!=0
     pjmedia_codec_speex_init(app.med_endpt, PJMEDIA_SPEEX_NO_UWB, 3, 3);
 #endif
+#if defined(PJMEDIA_HAS_G722_CODEC) && PJMEDIA_HAS_G722_CODEC!=0
+    pjmedia_codec_g722_init(app.med_endpt);
+#endif
 
     /* Init dummy socket addresses */
     app.skinfo_cnt = 0;

pjsip-apps/src/samples/encdec.c

@@ -266 +266 @@
 #if HAS_G729_CODEC
     CHECK( keystream_g729ab_init(mept) );
 #endif
+#if PJMEDIA_HAS_G722_CODEC
+    CHECK( pjmedia_codec_g722_init(mept) );
+#endif
 
     pj_gettimeofday(&t0);
     status = enc_dec_test(argv[1], argv[2], argv[3]);

pjsip-apps/src/samples/pcaputil.c

@@ -243 +243 @@
     T( pjmedia_codec_g711_init(app.mept) );
 #endif  /* PJMEDIA_HAS_G711_CODEC */
 
+#if PJMEDIA_HAS_G722_CODEC
+    T( pjmedia_codec_g722_init(app.mept) );
+#endif  /* PJMEDIA_HAS_G722_CODEC */
+
 #if PJMEDIA_HAS_L16_CODEC
     T( pjmedia_codec_l16_init(app.mept, 0) );
 #endif  /* PJMEDIA_HAS_L16_CODEC */

pjsip-apps/src/samples/streamutil.c

@@ -118 +118 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 #endif
 
+#if defined(PJMEDIA_HAS_G722_CODEC) && PJMEDIA_HAS_G722_CODEC!=0
+    status = pjmedia_codec_g722_init(med_endpt);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+#endif
+
 #if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0
     status = pjmedia_codec_l16_init(med_endpt, 0);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);

pjlib/include/pj/config_site_sample.h

@@ -55 +55 @@
 #   define PJMEDIA_HAS_L16_CODEC        0
 #   define PJMEDIA_HAS_ILBC_CODEC       0
 #   define PJMEDIA_HAS_SPEEX_CODEC      0
+#   define PJMEDIA_HAS_G722_CODEC       0
 
     /* Need larger sound buffers */
 #   define PJMEDIA_SOUND_BUFFER_COUNT   16