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

Timestamp:

Jan 29, 2013 8:09:15 AM (12 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/audio_codecs.c (modified) (1 diff)

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

@@ -108 +108 @@
 #endif  /* PJMEDIA_HAS_L16_CODEC */
 
-#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
-    /* Register OpenCORE AMR-NB */
-    status = pjmedia_codec_opencore_amrnb_init(endpt);
-    if (status != PJ_SUCCESS)
-        return status;
-#endif
-    
-#if PJMEDIA_HAS_OPENCORE_AMRWB_CODEC
-    /* Register OpenCORE AMR-WB */
-    status = pjmedia_codec_opencore_amrwb_init(endpt);
+#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC || PJMEDIA_HAS_OPENCORE_AMRWB_CODEC
+    /* Register OpenCORE AMR */
+    status = pjmedia_codec_opencore_amr_init(endpt, 0);
     if (status != PJ_SUCCESS)
         return status;