Changeset 411 for pjproject/trunk/pjmedia/src/pjmedia/g711.c

Timestamp:

Apr 27, 2006 10:36:40 PM (18 years ago)

Author:

bennylp

Message:

Initial support for stereo codecs, and added L16 codecs. Also better handling for case remote media is restarted

File:

• pjproject/trunk/pjmedia/src/pjmedia/g711.c (modified) (18 diffs)

pjproject/trunk/pjmedia/src/pjmedia/g711.c

@@ -36 +36 @@
 /* These are the only public functions exported to applications */
 PJ_DECL(pj_status_t) g711_init_factory (pjmedia_codec_factory *factory, pj_pool_t *pool);
-PJ_DECL(pj_status_t) g711_deinit_factory (pjmedia_codec_factory *factory);
 
 /* Algorithm prototypes. */
@@ -60 +59 @@
 
 /* Prototypes for G711 implementation. */
-static pj_status_t  g711_codec_default_attr (pjmedia_codec *codec, 
-                                             pjmedia_codec_param *attr);
 static pj_status_t  g711_init( pjmedia_codec *codec, 
                                pj_pool_t *pool );
@@ -84 +81 @@
 static pjmedia_codec_op g711_op = 
 {
-    &g711_codec_default_attr ,
     &g711_init,
     &g711_open,
@@ -120 +116 @@
 
 
-PJ_DEF(pj_status_t) g711_deinit_factory (pjmedia_codec_factory *factory)
-{
-    PJ_ASSERT_RETURN(factory==&g711_factory.base, PJ_EINVAL);
-
-    /* Invalidate member to help detect errors */
-    g711_factory.codec_list.next = g711_factory.codec_list.prev = NULL;
-    return 0;
-}
-
 PJ_DEF(pj_status_t) pjmedia_codec_g711_init(pjmedia_endpt *endpt)
 {
@@ -223 +210 @@
 }
 
-static pj_status_t g711_test_alloc( pjmedia_codec_factory *factory, const pjmedia_codec_info *id )
+static pj_status_t g711_test_alloc(pjmedia_codec_factory *factory, 
+                                   const pjmedia_codec_info *id )
 {
     PJ_UNUSED_ARG(factory);
@@ -238 +226 @@
 
     pj_memset(attr, 0, sizeof(pjmedia_codec_param));
-    attr->sample_rate = 8000;
+    attr->clock_rate = 8000;
+    attr->channel_cnt = 1;
     attr->avg_bps = G711_BPS;
     attr->pcm_bits_per_sample = 16;
@@ -261 +250 @@
         codecs[count].pt = PJMEDIA_RTP_PT_PCMU;
         codecs[count].encoding_name = pj_str("PCMU");
-        codecs[count].sample_rate = 8000;
+        codecs[count].clock_rate = 8000;
+        codecs[count].channel_cnt = 1;
         ++count;
     }
     if (count < *max_count) {
-        codecs[1].type = PJMEDIA_TYPE_AUDIO;
-        codecs[1].pt = PJMEDIA_RTP_PT_PCMA;
-        codecs[1].encoding_name = pj_str("PCMA");
-        codecs[1].sample_rate = 8000;
+        codecs[count].type = PJMEDIA_TYPE_AUDIO;
+        codecs[count].pt = PJMEDIA_RTP_PT_PCMA;
+        codecs[count].encoding_name = pj_str("PCMA");
+        codecs[count].clock_rate = 8000;
+        codecs[count].channel_cnt = 1;
         ++count;
     }
@@ -293 +284 @@
 
         codec = pj_pool_alloc(g711_factory.pool, sizeof(pjmedia_codec));
-        codec_priv = pj_pool_alloc(g711_factory.pool, sizeof(struct g711_private));
+        codec_priv = pj_pool_alloc(g711_factory.pool, 
+                                   sizeof(struct g711_private));
         if (!codec || !codec_priv) {
             pj_mutex_unlock(g711_factory.mutex);
@@ -320 +312 @@
 }
 
-static pj_status_t g711_dealloc_codec( pjmedia_codec_factory *factory, pjmedia_codec *codec )
+static pj_status_t g711_dealloc_codec(pjmedia_codec_factory *factory, 
+                                      pjmedia_codec *codec )
 {
     
@@ -343 +336 @@
 }
 
-static pj_status_t g711_codec_default_attr  (pjmedia_codec *codec, pjmedia_codec_param *attr)
-{
-    struct g711_private *priv = codec->codec_data;
-    pjmedia_codec_info id;
-
-    id.pt = priv->pt;
-    return g711_default_attr (NULL, &id, attr);
-}
-
 static pj_status_t g711_init( pjmedia_codec *codec, pj_pool_t *pool )
 {
@@ -361 +345 @@
 }
 
-static pj_status_t g711_open( pjmedia_codec *codec, pjmedia_codec_param *attr )
+static pj_status_t g711_open(pjmedia_codec *codec, 
+                             pjmedia_codec_param *attr )
 {
     struct g711_private *priv = codec->codec_data;
@@ -401 +386 @@
 }
 
-static pj_status_t  g711_encode( pjmedia_codec *codec, const struct pjmedia_frame *input,
-                                 unsigned output_buf_len, struct pjmedia_frame *output)
+static pj_status_t  g711_encode(pjmedia_codec *codec, 
+                                const struct pjmedia_frame *input,
+                                unsigned output_buf_len, 
+                                struct pjmedia_frame *output)
 {
     pj_int16_t *samples = (pj_int16_t*) input->buf;
@@ -409 +396 @@
     /* Check output buffer length */
     if (output_buf_len < input->size / 2)
-        return -1;
+        return PJMEDIA_CODEC_EFRMTOOSHORT;
 
     /* Encode */
@@ -428 +415 @@
 
     } else {
-        return -1;
+        return PJMEDIA_EINVALIDPT;
     }
 
@@ -434 +421 @@
     output->size = input->size / 2;
 
-    return 0;
-}
-
-static pj_status_t  g711_decode( pjmedia_codec *codec, const struct pjmedia_frame *input,
-                                 unsigned output_buf_len, struct pjmedia_frame *output)
+    return PJ_SUCCESS;
+}
+
+static pj_status_t  g711_decode(pjmedia_codec *codec, 
+                                const struct pjmedia_frame *input,
+                                unsigned output_buf_len, 
+                                struct pjmedia_frame *output)
 {
     struct g711_private *priv = codec->codec_data;
@@ -444 +433 @@
     /* Check output buffer length */
     if (output_buf_len < input->size * 2)
-        return -1;
+        return PJMEDIA_CODEC_EPCMTOOSHORT;
 
     /* Decode */
@@ -465 +454 @@
 
     } else {
-        return -1;
+        return PJMEDIA_EINVALIDPT;
     }
 
@@ -471 +460 @@
     output->size = input->size * 2;
 
-    return 0;
+    return PJ_SUCCESS;
 }