Changeset 3816

Timestamp:

Oct 14, 2011 4:15:15 AM (13 years ago)

Author:

bennylp

Message:

Committing re #1388: Support for OpenCORE AMR-NB codec (thank you Dan Arrhenius for the contribution!)

Location:

pjproject/branches/1.x

Files:

• aconfigure (modified) (4 diffs)
• aconfigure.ac (modified) (1 diff)
• pjmedia/build/os-auto.mak.in (modified) (2 diffs)
• pjmedia/include/pjmedia-codec.h (modified) (1 diff)
• pjmedia/include/pjmedia-codec/config.h (modified) (1 diff)
• pjmedia/include/pjmedia-codec/config_auto.h.in (modified) (1 diff)
• pjmedia/include/pjmedia-codec/opencore_amrnb.h (added)
• pjmedia/src/pjmedia-codec/opencore_amrnb.c (added)
• pjmedia/src/test/mips_test.c (modified) (4 diffs)
• pjsip-apps/src/samples/encdec.c (modified) (1 diff)
• pjsip-apps/src/samples/jbsim.c (modified) (1 diff)
• pjsip-apps/src/samples/pcaputil.c (modified) (1 diff)
• pjsip-apps/src/samples/pjsip-perf.c (modified) (1 diff)
• pjsip-apps/src/samples/streamutil.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/branches/1.x/aconfigure

@@ -597 +597 @@
 ac_linux_poll
 ac_cross_compile
+opencore_amrnb_present
+opencore_amrnb_h_present
+ac_no_opencore_amrnb
 libcrypto_present
 libssl_present
@@ -722 +725 @@
 with_ipp_arch
 enable_ssl
+enable_opencore_amrnb
 '
       ac_precious_vars='build_alias
@@ -1374 +1378 @@
                           --with-ipp-samples options
   --disable-ssl           Exclude SSL support the build (default: autodetect)
+
+  --disable-opencore-amrnb
+                          Exclude OpenCORE AMR-NB support from the build
+                          (default: autodetect)
 
 
@@ -6260 +6268 @@
 
 
+# Check whether --enable-opencore_amrnb was given.
+if test "${enable_opencore_amrnb+set}" = set; then :
+  enableval=$enable_opencore_amrnb;
+                if test "$enable_opencore_amrnb" = "no"; then
+                 ac_no_opencore_amrnb=1
+                 $as_echo "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h
+
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenCORE AMR-NB support is disabled... yes" >&5
+$as_echo "Checking if OpenCORE AMR-NB support is disabled... yes" >&6; }
+                fi
+
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for OpenCORE AMR-NB installations.." >&5
+$as_echo "checking for OpenCORE AMR-NB installations.." >&6; }
+
+
+                ac_fn_c_check_header_mongrel "$LINENO" "opencore-amrnb/interf_enc.h" "ac_cv_header_opencore_amrnb_interf_enc_h" "$ac_includes_default"
+if test "x$ac_cv_header_opencore_amrnb_interf_enc_h" = x""yes; then :
+  opencore_amrnb_h_present=1
+fi
+
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Encoder_Interface_init in -lopencore-amrnb" >&5
+$as_echo_n "checking for Encoder_Interface_init in -lopencore-amrnb... " >&6; }
+if test "${ac_cv_lib_opencore_amrnb_Encoder_Interface_init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lopencore-amrnb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char Encoder_Interface_init ();
+int
+main ()
+{
+return Encoder_Interface_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_opencore_amrnb_Encoder_Interface_init=yes
+else
+  ac_cv_lib_opencore_amrnb_Encoder_Interface_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&5
+$as_echo "$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&6; }
+if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = x""yes; then :
+  opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"
+fi
+
+                if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-NB library found, AMR-NB support enabled" >&5
+$as_echo "OpenCORE AMR-NB library found, AMR-NB support enabled" >&6; }
+                        $as_echo "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 1" >>confdefs.h
+
+                else
+                        ac_no_opencore_amrnb=1
+                        $as_echo "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h
+
+                fi
+
+fi
+
+
+
 
 

pjproject/branches/1.x/aconfigure.ac

@@ -998 +998 @@
               ])
 
+dnl # Include opencore-amrnb support
+AC_SUBST(ac_no_opencore_amrnb)
+AC_ARG_ENABLE(opencore_amrnb,
+              AC_HELP_STRING([--disable-opencore-amrnb],
+                             [Exclude OpenCORE AMR-NB support from the build (default: autodetect)])
+              ,
+              [
+                if test "$enable_opencore_amrnb" = "no"; then
+                 [ac_no_opencore_amrnb=1]
+                 AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,0)
+                 AC_MSG_RESULT([Checking if OpenCORE AMR-NB support is disabled... yes])
+                fi
+              ],
+              [
+                AC_MSG_RESULT([checking for OpenCORE AMR-NB installations..])
+                AC_SUBST(opencore_amrnb_h_present)
+                AC_SUBST(opencore_amrnb_present)
+                AC_CHECK_HEADER(opencore-amrnb/interf_enc.h,[opencore_amrnb_h_present=1])
+                AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"])
+                if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
+                        AC_MSG_RESULT([OpenCORE AMR-NB library found, AMR-NB support enabled])
+                        AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,1)
+                else
+                        [ac_no_opencore_amrnb=1]
+                        AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,0)
+                fi
+              ])
+
 
 dnl ##########################################

pjproject/branches/1.x/pjmedia/build/os-auto.mak.in

@@ -30 +30 @@
 AC_NO_G722_CODEC=@ac_no_g722_codec@
 AC_NO_G7221_CODEC=@ac_no_g7221_codec@
+AC_NO_OPENCORE_AMRNB=@ac_no_opencore_amrnb@
 
 export CODEC_OBJS=
@@ -82 +83 @@
 endif
 
+ifeq ($(AC_NO_OPENCORE_AMRNB),1)
+export CFLAGS += -DPJMEDIA_HAS_OPENCORE_AMRNB_CODEC=0
+else
+export CODEC_OBJS += opencore_amrnb.o
+endif
+
 
 #

pjproject/branches/1.x/pjmedia/include/pjmedia-codec.h

@@ -34 +34 @@
 #include <pjmedia-codec/ipp_codecs.h>
 #include <pjmedia-codec/passthrough.h>
+#include <pjmedia-codec/opencore_amrnb.h>
 
 

pjproject/branches/1.x/pjmedia/include/pjmedia-codec/config.h

@@ -314 +314 @@
 
 /**
+ * OpenCORE AMR-NB codec is enabled by default.
+ */
+#ifndef PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+#   define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC     0
+#endif
+
+/**
  * Default G.722.1 codec encoder and decoder level adjustment. 
  * If the value is non-zero, then PCM input samples to the encoder will 

pjproject/branches/1.x/pjmedia/include/pjmedia-codec/config_auto.h.in

@@ -70 +70 @@
 #endif
 
+/* OpenCORE AMR-NB codec */
+#ifndef PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+#undef PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+#endif
+
 
 #endif  /* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */

pjproject/branches/1.x/pjmedia/src/test/mips_test.c

@@ -917 +917 @@
 #endif  /* PJMEDIA_HAS_G7221_CODEC */
 
+#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+/* AMR-NB benchmark benchmark */
+static pjmedia_port* amr_encode_decode(pj_pool_t *pool,
+                                       unsigned clock_rate,
+                                       unsigned channel_count,
+                                       unsigned samples_per_frame,
+                                       unsigned flags,
+                                       struct test_entry *te)
+{
+    return codec_encode_decode(pool, "AMR/8000", 
+                               &pjmedia_codec_opencore_amrnb_init,
+                               &pjmedia_codec_opencore_amrnb_deinit,
+                               clock_rate, channel_count,
+                               samples_per_frame, flags, te);
+}
+#endif  /* PJMEDIA_HAS_OPENCORE_AMRNB_CODEC */
+
 #if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0
 static pj_status_t init_l16_default(pjmedia_endpt *endpt)
@@ -1974 +1991 @@
 }
 #endif  /* PJMEDIA_HAS_G7221_CODEC */ 
+
+/* AMR-NB stream */
+#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+static pjmedia_port* create_stream_amr( pj_pool_t *pool,
+                                        unsigned clock_rate,
+                                        unsigned channel_count,
+                                        unsigned samples_per_frame,
+                                        unsigned flags,
+                                        struct test_entry *te)
+{
+    return create_stream(pool, "AMR/8000", &pjmedia_codec_opencore_amrnb_init, 
+                         &pjmedia_codec_opencore_amrnb_deinit, 
+                         PJ_FALSE, PJ_FALSE, PJ_FALSE,
+                         clock_rate, channel_count,
+                         samples_per_frame, flags, te);
+}
+#endif  /* PJMEDIA_HAS_OPENCORE_AMRNB_CODEC */ 
 
 /***************************************************************************/
@@ -2365 +2399 @@
         { "codec encode/decode - G.722.1c", OP_PUT, K32, &g7221c_encode_decode},
 #endif
+#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+        { "codec encode/decode - AMR-NB", OP_PUT, K8, &amr_encode_decode},
+#endif
 #if PJMEDIA_HAS_L16_CODEC
         { "codec encode/decode - L16/8000/1", OP_PUT, K8, &l16_8_encode_decode},
@@ -2390 +2427 @@
         { "stream TX/RX - G.722.1c", OP_PUT_GET, K32, &create_stream_g7221c},
 #endif
+#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+        { "stream TX/RX - AMR-NB", OP_PUT_GET, K8, &create_stream_amr},
+#endif
     };
 

pjproject/branches/1.x/pjsip-apps/src/samples/encdec.c

@@ -254 +254 @@
     CHECK( pjmedia_codec_g722_init(mept) );
 #endif
+#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+    CHECK( pjmedia_codec_opencore_amrnb_init(mept) );
+#endif
 
     pj_gettimeofday(&t0);

pjproject/branches/1.x/pjsip-apps/src/samples/jbsim.c

@@ -494 +494 @@
 #if defined(PJMEDIA_HAS_INTEL_IPP) && PJMEDIA_HAS_INTEL_IPP != 0
     pjmedia_codec_ipp_init(g_app.endpt);
+#endif
+#if defined(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC) && (PJMEDIA_HAS_OPENCORE_AMRNB_CODEC != 0)
+    pjmedia_codec_opencore_amrnb_init(g_app.endpt);
 #endif
 #if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC != 0

pjproject/branches/1.x/pjsip-apps/src/samples/pcaputil.c

@@ -306 +306 @@
 #endif  /* PJMEDIA_HAS_L16_CODEC */
 
+#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+    T( pjmedia_codec_opencore_amrnb_init(app.mept) );
+#endif  /* PJMEDIA_HAS_L16_CODEC */
+
 #if PJMEDIA_HAS_INTEL_IPP
     T( pjmedia_codec_ipp_init(app.mept) );

pjproject/branches/1.x/pjsip-apps/src/samples/pjsip-perf.c

@@ -940 +940 @@
 #if defined(PJMEDIA_HAS_G722_CODEC) && PJMEDIA_HAS_G722_CODEC!=0
     pjmedia_codec_g722_init(app.med_endpt);
+#endif
+#if defined(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC) && PJMEDIA_HAS_OPENCORE_AMRNB_CODEC!=0
+    pjmedia_codec_opencore_amrnb_init(app.med_endpt);
 #endif
 

pjproject/branches/1.x/pjsip-apps/src/samples/streamutil.c

@@ -123 +123 @@
 #if defined(PJMEDIA_HAS_G722_CODEC) && PJMEDIA_HAS_G722_CODEC!=0
     status = pjmedia_codec_g722_init(med_endpt);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+#endif
+
+#if defined(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC) && PJMEDIA_HAS_OPENCORE_AMRNB_CODEC!=0
+    status = pjmedia_codec_opencore_amrnb_init(med_endpt);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 #endif

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c

@@ -275 +275 @@
 #endif  /* PJMEDIA_HAS_L16_CODEC */
 
+#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+    /* Register OpenCORE AMR-NB codec */
+    status = pjmedia_codec_opencore_amrnb_init(pjsua_var.med_endpt);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Error initializing OpenCORE AMR-NB codec",
+                     status);
+        return status;
+    }
+#endif /* PJMEDIA_HAS_OPENCORE_AMRNB_CODEC */
+
 
     /* Save additional conference bridge parameters for future
@@ -729 +739 @@
             pjmedia_codec_l16_deinit();
 #       endif   /* PJMEDIA_HAS_L16_CODEC */
+
+#       if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC
+            pjmedia_codec_opencore_amrnb_deinit();
+#       endif   /* PJMEDIA_HAS_OPENCORE_AMRNB_CODEC */
 
         pjmedia_endpt_destroy(pjsua_var.med_endpt);