Add support for G.722 as passthrough codec. (#4390)

Author: amubiera

pjlib/include/pj/config_site_sample.h

@@ -234,6 +234,7 @@
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU  1
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA  1
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR   1
+    #define PJMEDIA_HAS_PASSTHROUGH_CODEC_G722  0
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_G729  1
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC  1
 
@@ -263,6 +264,7 @@
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU  1
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA  1
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR   1
+    #define PJMEDIA_HAS_PASSTHROUGH_CODEC_G722  0
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_G729  1
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC  1
 
@@ -289,6 +291,7 @@
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU  1
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA  1
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR   0
+    #define PJMEDIA_HAS_PASSTHROUGH_CODEC_G722  0
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_G729  0
     #define PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC  0
 

pjmedia/include/pjmedia-codec/config.h

@@ -319,6 +319,15 @@
 #   define PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR    1
 #endif
 
+/**
+ * Enable G.722 passthrough codec.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_G722
+#   define PJMEDIA_HAS_PASSTHROUGH_CODEC_G722   1
+#endif
+
 /**
  * Enable G.729 passthrough codec.
  *
@@ -372,6 +381,14 @@
 #   define PJMEDIA_HAS_G7221_CODEC              0
 #endif
 
+/* If passthrough and G.722 is enabled, disable the software
+ * G.722 codec
+ */
+#if PJMEDIA_HAS_PASSTHROUGH_CODECS && PJMEDIA_HAS_PASSTHROUGH_CODEC_G722
+#   undef PJMEDIA_HAS_G722_CODEC
+#   define PJMEDIA_HAS_G722_CODEC               0
+#endif
+
 /**
  * Enable OpenCORE AMR-NB codec.
  * See https://github.com/pjsip/pjproject/issues/1388 for some info.

pjmedia/include/pjmedia/format.h

@@ -78,6 +78,9 @@ typedef enum pjmedia_format_id
     /** AMR narrowband */
     PJMEDIA_FORMAT_AMR      = PJMEDIA_FORMAT_PACK(' ', 'A', 'M', 'R'),
 
+    /** ITU G.722 */
+    PJMEDIA_FORMAT_G722     = PJMEDIA_FORMAT_PACK('G', '7', '2', '2'),
+
     /** ITU G.729 */
     PJMEDIA_FORMAT_G729     = PJMEDIA_FORMAT_PACK('G', '7', '2', '9'),
 

pjmedia/src/pjmedia-codec/passthrough.c

@@ -186,6 +186,13 @@ codec_desc[] =
     },
 #   endif
 
+#   if PJMEDIA_HAS_PASSTHROUGH_CODEC_G722
+    {1, "G722",     PJMEDIA_RTP_PT_G722,      PJMEDIA_FORMAT_G722,
+                    16000, 1,  160,
+                    64000, 64000, 2, 1, 1
+    },
+#   endif
+
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_G729
     {1, "G729",     PJMEDIA_RTP_PT_G729,      PJMEDIA_FORMAT_G729,
                     8000, 1,  80,
@@ -684,11 +691,8 @@ static pj_status_t codec_open( pjmedia_codec *codec,
 {
     codec_private_t *codec_data = (codec_private_t*) codec->codec_data;
     struct codec_desc *desc = &codec_desc[codec_data->codec_idx];
-    pj_pool_t *pool;
     int i, j;
 
-    pool = codec_data->pool;
-
     /* Cache samples per frame value */
     codec_data->samples_per_frame = desc->samples_per_frame;
 
@@ -770,7 +774,7 @@ static pj_status_t codec_open( pjmedia_codec *codec,
             }
         }
 
-        s = PJ_POOL_ZALLOC_T(pool, amr_settings_t);
+        s = PJ_POOL_ZALLOC_T(codec_data->pool, amr_settings_t);
         codec_data->codec_setting = s;
 
         s->enc_mode = enc_mode;
@@ -839,7 +843,7 @@ static pj_status_t codec_open( pjmedia_codec *codec,
          */
         if (enc_fmtp_mode != dec_fmtp_mode) {
             enc_fmtp_mode = dec_fmtp_mode = DEFAULT_MODE;
-            PJ_LOG(4,(pool->obj_name, 
+            PJ_LOG(4,(codec_data->pool->obj_name, 
                       "Normalized iLBC encoder and decoder modes to %d", 
                       DEFAULT_MODE));
         }