Changeset 1177 for pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/g711.c

Timestamp:

Apr 9, 2007 7:06:08 AM (17 years ago)

Author:

bennylp

Message:

Fixed all VS6 and VS8 projects with new third party projects layout

File:

• pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/g711.c (modified) (13 diffs)

pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/g711.c

@@ -33 +33 @@
 #if defined(PJMEDIA_HAS_G711_CODEC) && PJMEDIA_HAS_G711_CODEC!=0
 
+/* We removed PLC in 0.6 */
+#define PLC_DISABLED    1
+
 
 #define G711_BPS            64000
@@ -81 +84 @@
                                  unsigned output_buf_len, 
                                  struct pjmedia_frame *output);
+#if !PLC_DISABLED
 static pj_status_t  g711_recover( pjmedia_codec *codec,
                                   unsigned output_buf_len,
                                   struct pjmedia_frame *output);
+#endif
 
 /* Definition for G711 codec operations. */
@@ -95 +100 @@
     &g711_encode,
     &g711_decode,
+#if !PLC_DISABLED
     &g711_recover
+#else
+    NULL
+#endif
 };
 
@@ -122 +131 @@
 {
     unsigned             pt;
+#if !PLC_DISABLED
     pj_bool_t            plc_enabled;
     pjmedia_plc         *plc;
+#endif
     pj_bool_t            vad_enabled;
     pjmedia_silence_det *vad;
@@ -250 +261 @@
     attr->setting.frm_per_pkt = 2;
 
+#if !PLC_DISABLED
     /* Enable plc by default. */
     attr->setting.plc = 1;
+#endif
 
     /* Enable VAD by default. */
@@ -318 +331 @@
         codec_priv->pt = id->pt;
 
+#if !PLC_DISABLED
         /* Create PLC, always with 10ms ptime */
         status = pjmedia_plc_create(g711_factory.pool, 8000, 80,
@@ -325 +339 @@
             return status;
         }
+#endif
 
         /* Create VAD */
@@ -358 +373 @@
 {
     struct g711_private *priv = codec->codec_data;
-    pj_int16_t frame[SAMPLES_PER_FRAME];
     int i;
 
@@ -369 +383 @@
     }
 
+#if !PLC_DISABLED
     /* Clear left samples in the PLC, since codec+plc will be reused
      * next time.
      */
     for (i=0; i<2; ++i) {
+        pj_int16_t frame[SAMPLES_PER_FRAME];
         pjmedia_zero_samples(frame, PJ_ARRAY_SIZE(frame));
         pjmedia_plc_save(priv->plc, frame);
     }
+#else
+    PJ_UNUSED_ARG(i);
+    PJ_UNUSED_ARG(priv);
+#endif
 
     /* Lock mutex. */
@@ -403 +423 @@
     struct g711_private *priv = codec->codec_data;
     priv->pt = attr->info.pt;
+#if !PLC_DISABLED
     priv->plc_enabled = (attr->setting.plc != 0);
+#endif
     priv->vad_enabled = (attr->setting.vad != 0);
     return PJ_SUCCESS;
@@ -423 +445 @@
         return PJMEDIA_EINVALIDPT;
 
+#if !PLC_DISABLED
     priv->plc_enabled = (attr->setting.plc != 0);
+#endif
     priv->vad_enabled = (attr->setting.vad != 0);
 
@@ -562 +586 @@
     output->size = (input->size << 1);
 
+#if !PLC_DISABLED
     if (priv->plc_enabled)
         pjmedia_plc_save( priv->plc, output->buf);
-
-    return PJ_SUCCESS;
-}
-
+#endif
+
+    return PJ_SUCCESS;
+}
+
+#if !PLC_DISABLED
 static pj_status_t  g711_recover( pjmedia_codec *codec,
                                   unsigned output_buf_len,
@@ -585 +612 @@
     return PJ_SUCCESS;
 }
+#endif
 
 #endif  /* PJMEDIA_HAS_G711_CODEC */