Changeset 4335 for pjproject/trunk/pjmedia/src/pjmedia-codec/opencore_amr.c

Timestamp:

Jan 29, 2013 8:09:15 AM (11 years ago)

Author:

ming

Message:

Re #1608: Fixed the way codec is initialized, enumerated, and deinit since both NB and WB use the same factory

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/opencore_amr.c (modified) (6 diffs)

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

@@ -199 +199 @@
  * Initialize and register AMR codec factory to pjmedia endpoint.
  */
-static pj_status_t amr_init( pjmedia_endpt *endpt )
+PJ_DEF(pj_status_t) pjmedia_codec_opencore_amr_init( pjmedia_endpt *endpt,
+                                                     unsigned options)
 {
     pjmedia_codec_mgr *codec_mgr;
@@ -212 +213 @@
     amr_codec_factory.base.factory_data = NULL;
     amr_codec_factory.endpt = endpt;
-
-    amr_codec_factory.pool = pjmedia_endpt_create_pool(endpt, "amr", 1000, 
+#ifdef USE_AMRNB
+    amr_codec_factory.init[IDX_AMR_NB] = ((options & PJMEDIA_AMR_NO_NB) == 0);
+#else
+    amr_codec_factory.init[IDX_AMR_NB] = PJ_FALSE;
+#endif
+#ifdef USE_AMRWB
+    amr_codec_factory.init[IDX_AMR_WB] = ((options & PJMEDIA_AMR_NO_WB) == 0);
+#else
+    amr_codec_factory.init[IDX_AMR_WB] = PJ_FALSE;
+#endif
+
+    amr_codec_factory.pool = pjmedia_endpt_create_pool(endpt, "amr", 1000,
                                                        1000);
     if (!amr_codec_factory.pool)
@@ -248 +259 @@
 }
 
+PJ_DEF(pj_status_t)
+pjmedia_codec_opencore_amr_init_default( pjmedia_endpt *endpt )
+{
+    return pjmedia_codec_opencore_amr_init(endpt, 0);
+}
+
 PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_init( pjmedia_endpt *endpt )
 {
-    amr_codec_factory.init[IDX_AMR_NB] = PJ_TRUE;
-    
-    return amr_init(endpt);
-}
-
-PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrwb_init( pjmedia_endpt *endpt )
-{
-    amr_codec_factory.init[IDX_AMR_WB] = PJ_TRUE;
-    
-    return amr_init(endpt);    
+    return pjmedia_codec_opencore_amr_init(endpt, PJMEDIA_AMR_NO_WB);
 }
 
@@ -267 +275 @@
  * the AMR codec library.
  */
-static pj_status_t amr_deinit(void)
+PJ_DEF(pj_status_t) pjmedia_codec_opencore_amr_deinit(void)
 {
     pjmedia_codec_mgr *codec_mgr;
     pj_status_t status;
 
-    if (amr_codec_factory.init[IDX_AMR_NB] ||
-        amr_codec_factory.init[IDX_AMR_WB])
-    {
-        return PJ_SUCCESS;
-    }
+    amr_codec_factory.init[IDX_AMR_NB] = PJ_FALSE;
+    amr_codec_factory.init[IDX_AMR_WB] = PJ_FALSE;
     
     if (amr_codec_factory.pool == NULL)
@@ -302 +307 @@
 PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_deinit(void)
 {
-    amr_codec_factory.init[IDX_AMR_NB] = PJ_FALSE;
+    if (amr_codec_factory.init[IDX_AMR_NB] &&
+        amr_codec_factory.init[IDX_AMR_WB])
+    {
+        PJ_LOG(4, (THIS_FILE, "Should call "
+                              "pjmedia_codec_opencore_amr_deinit() instead"));
+        
+        return PJ_EINVALIDOP;
+    }
     
-    return amr_deinit();
-}
-
-PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrwb_deinit(void)
-{
-    amr_codec_factory.init[IDX_AMR_WB] = PJ_FALSE;
-    
-    return amr_deinit();
+    return pjmedia_codec_opencore_amr_deinit();
 }
 
@@ -448 +453 @@
     }
     
-    if (amr_codec_factory.init[IDX_AMR_NB]) {
+    if (amr_codec_factory.init[IDX_AMR_WB]) {
         pj_bzero(&codecs[*count], sizeof(pjmedia_codec_info));
         codecs[*count].encoding_name = pj_str("AMR-WB");