Changeset 5122 for pjproject/trunk

Timestamp:

Jul 1, 2015 1:45:57 AM (9 years ago)

Author:

riza

Message:

Misc (re #1843): Register fmt matching callbak for AMR-WB in opencore-amr implementation. Thanks to Alexander Traud for the initial patch.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/opencore_amr.c (modified) (1 diff)

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

@@ -243 +243 @@
 
     /* Register format match callback. */
-    pj_cstr(&codec_name, "AMR");
-    status = pjmedia_sdp_neg_register_fmt_match_cb(
-                                        &codec_name,
-                                        &pjmedia_codec_amr_match_sdp);
-    if (status != PJ_SUCCESS)
-        goto on_error;
+#ifdef USE_AMRNB
+    if ((options & PJMEDIA_AMR_NO_NB) == 0) {
+        pj_cstr(&codec_name, "AMR");
+        status = pjmedia_sdp_neg_register_fmt_match_cb(
+                                            &codec_name,
+                                            &pjmedia_codec_amr_match_sdp);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+    }
+#endif
+#ifdef USE_AMRWB
+    if ((options & PJMEDIA_AMR_NO_WB) == 0) {
+        pj_cstr(&codec_name, "AMR-WB");
+        status = pjmedia_sdp_neg_register_fmt_match_cb(
+                                            &codec_name,
+                                            &pjmedia_codec_amr_match_sdp);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+    }
+#endif
 
     /* Register codec factory to endpoint. */