Changeset 1177 for pjproject/branches/split-3rd-party/pjmedia/src/pjmedia-codec/gsm.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-codec/gsm.c (modified) (11 diffs)

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

@@ -34 +34 @@
  */
 #if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC != 0
+
+/* We removed PLC in 0.6 */
+#define PLC_DISABLED    1
 
 
@@ -73 +76 @@
                                       unsigned output_buf_len, 
                                       struct pjmedia_frame *output);
+#if !PLC_DISABLED
 static pj_status_t  gsm_codec_recover(pjmedia_codec *codec,
                                       unsigned output_buf_len,
                                       struct pjmedia_frame *output);
+#endif
 
 /* Definition for GSM codec operations. */
@@ -87 +92 @@
     &gsm_codec_encode,
     &gsm_codec_decode,
+#if !PLC_DISABLED
     &gsm_codec_recover
+#else
+    NULL
+#endif
 };
 
@@ -117 +126 @@
     void                *decoder;
     pj_bool_t            plc_enabled;
+#if !PLC_DISABLED
     pjmedia_plc         *plc;
+#endif
     pj_bool_t            vad_enabled;
     pjmedia_silence_det *vad;
@@ -260 +271 @@
     attr->setting.frm_per_pkt = 1;
     attr->setting.vad = 1;
+#if !PLC_DISABLED
     attr->setting.plc = 1;
+#endif
 
     /* Default all other flag bits disabled. */
@@ -321 +334 @@
         codec->codec_data = gsm_data;
 
+#if !PLC_DISABLED
         /* Create PLC */
         status = pjmedia_plc_create(gsm_codec_factory.pool, 8000, 
@@ -328 +342 @@
             return status;
         }
+#endif
 
         /* Create silence detector */
@@ -352 +367 @@
 {
     struct gsm_data *gsm_data;
-    pj_int16_t frame[160];
     int i;
 
@@ -363 +377 @@
     gsm_codec_close(codec);
 
+#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[160];
         pjmedia_zero_samples(frame, PJ_ARRAY_SIZE(frame));
         pjmedia_plc_save(gsm_data->plc, frame);
     }
+#else
+    PJ_UNUSED_ARG(i);
+#endif
 
     /* Re-init silence_period */
@@ -570 +589 @@
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
 
+#if !PLC_DISABLED
     if (gsm_data->plc_enabled)
         pjmedia_plc_save( gsm_data->plc, output->buf);
-
-    return PJ_SUCCESS;
-}
-
-
+#endif
+
+    return PJ_SUCCESS;
+}
+
+
+#if !PLC_DISABLED
 /*
  * Recover lost frame.
@@ -595 +617 @@
     return PJ_SUCCESS;
 }
+#endif