Changeset 281 for pjproject/trunk

Timestamp:

Mar 5, 2006 11:50:53 AM (19 years ago)

Author:

bennylp

Message:

Fixed serious flaw in GSM where encoder and decoder shared the same state!

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/gsm.c (modified) (10 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/gsm.c

@@ -98 +98 @@
 
 /* GSM codec private data. */
-struct gsm_private
-{
-    int dummy;
+struct gsm_data
+{
+    void    *encoder;
+    void    *decoder;
 };
 
@@ -267 +268 @@
 {
     pjmedia_codec *codec;
+    struct gsm_data *gsm_data;
 
     PJ_ASSERT_RETURN(factory && id && p_codec, PJ_EINVAL);
@@ -284 +286 @@
         codec->op = &gsm_op;
         codec->factory = factory;
+
+        gsm_data = pj_pool_zalloc(gsm_codec_factory.pool, 
+                                  sizeof(struct gsm_data));
+        codec->codec_data = gsm_data;
     }
 
     pj_mutex_unlock(gsm_codec_factory.mutex);
-
-    pj_assert(codec->codec_data == NULL);
 
     *p_codec = codec;
@@ -300 +304 @@
                                       pjmedia_codec *codec )
 {
+    struct gsm_data *gsm_data;
+
     PJ_ASSERT_RETURN(factory && codec, PJ_EINVAL);
     PJ_ASSERT_RETURN(factory == &gsm_codec_factory.base, PJ_EINVAL);
 
+    gsm_data = codec->codec_data;
+
     /* Close codec, if it's not closed. */
-    if (codec->codec_data != NULL) {
-        gsm_destroy(codec->codec_data);
-        codec->codec_data = NULL;
-    }
+    gsm_codec_close(codec);
 
     /* Put in the free list. */
@@ -343 +348 @@
                                    pjmedia_codec_param *attr )
 {
-    pj_assert(codec->codec_data == NULL);
+    struct gsm_data *gsm_data = codec->codec_data;
+
+    pj_assert(gsm_data != NULL);
+    pj_assert(gsm_data->encoder == NULL && gsm_data->decoder == NULL);
 
     PJ_UNUSED_ARG(attr);
 
-    codec->codec_data = gsm_create();
-    if (!codec->codec_data)
+    gsm_data->encoder = gsm_create();
+    if (!gsm_data->encoder)
         return PJMEDIA_CODEC_EFAILED;
 
+    gsm_data->decoder = gsm_create();
+    if (!gsm_data->decoder)
+        return PJMEDIA_CODEC_EFAILED;
+
     return PJ_SUCCESS;
 }
@@ -359 +371 @@
 static pj_status_t gsm_codec_close( pjmedia_codec *codec )
 {
-    pj_assert(codec->codec_data != NULL);
-
-    if (codec->codec_data) {
-        gsm_destroy(codec->codec_data);
-        codec->codec_data = NULL;
+    struct gsm_data *gsm_data = codec->codec_data;
+
+    pj_assert(gsm_data != NULL);
+
+    if (gsm_data->encoder) {
+        gsm_destroy(gsm_data->encoder);
+        gsm_data->encoder = NULL;
+    }
+    if (gsm_data->decoder) {
+        gsm_destroy(gsm_data->decoder);
+        gsm_data->decoder = NULL;
     }
 
@@ -408 +426 @@
                                      struct pjmedia_frame *output)
 {
-    PJ_ASSERT_RETURN(codec && codec->codec_data && input && output,
-                     PJ_EINVAL);
+    struct gsm_data *gsm_data = codec->codec_data;
+
+    pj_assert(gsm_data != NULL);
+    PJ_ASSERT_RETURN(input && output, PJ_EINVAL);
 
     if (output_buf_len < 33)
@@ -417 +437 @@
         return PJMEDIA_CODEC_EPCMTOOSHORT;
 
-    gsm_encode(codec->codec_data, (short*)input->buf, 
+    gsm_encode(gsm_data->encoder, (short*)input->buf, 
                (unsigned char*)output->buf);
 
@@ -434 +454 @@
                                      struct pjmedia_frame *output)
 {
-    PJ_ASSERT_RETURN(codec && codec->codec_data && input && output,
-                     PJ_EINVAL);
+    struct gsm_data *gsm_data = codec->codec_data;
+
+    pj_assert(gsm_data != NULL);
+    PJ_ASSERT_RETURN(input && output, PJ_EINVAL);
 
     if (output_buf_len < 320)
@@ -443 +465 @@
         return PJMEDIA_CODEC_EFRMTOOSHORT;
 
-    gsm_decode(codec->codec_data, 
+    gsm_decode(gsm_data->decoder, 
                (unsigned char*)input->buf, 
                (short*)output->buf);