Changeset 5632

Timestamp:

Jul 27, 2017 6:45:48 AM (6 years ago)

Author:

ming

Message:

Fixed #2031: Add compile-time config for L16 codec

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia-codec/config.h (modified) (1 diff)
• include/pjmedia-codec/types.h (modified) (1 diff)
• src/pjmedia-codec/l16.c (modified) (6 diffs)

pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

@@ -48 +48 @@
 #ifndef PJMEDIA_HAS_L16_CODEC
 #   define PJMEDIA_HAS_L16_CODEC    1
+#endif
+
+
+/**
+ * Settings to enable L16 codec 8KHz, mono. By default it is disabled.
+ */
+#ifndef PJMEDIA_CODEC_L16_HAS_8KHZ_MONO
+#   define PJMEDIA_CODEC_L16_HAS_8KHZ_MONO      0
+#endif
+
+
+/**
+ * Settings to enable L16 codec 8KHz, stereo. By default it is disabled.
+ */
+#ifndef PJMEDIA_CODEC_L16_HAS_8KHZ_STEREO
+#   define PJMEDIA_CODEC_L16_HAS_8KHZ_STEREO    0
+#endif
+
+
+/**
+ * Settings to enable L16 codec 16KHz, mono. By default it is disabled.
+ */
+#ifndef PJMEDIA_CODEC_L16_HAS_16KHZ_MONO
+#   define PJMEDIA_CODEC_L16_HAS_16KHZ_MONO     0
+#endif
+
+
+/**
+ * Settings to enable L16 codec 16KHz, stereo. By default it is disabled.
+ */
+#ifndef PJMEDIA_CODEC_L16_HAS_16KHZ_STEREO
+#   define PJMEDIA_CODEC_L16_HAS_16KHZ_STEREO   0
 #endif
 

pjproject/trunk/pjmedia/include/pjmedia-codec/types.h

@@ -85 +85 @@
     PJMEDIA_RTP_PT_G7221_RSV2,                  /**< G722.1 reserve         */
     PJMEDIA_RTP_PT_OPUS,                        /**< OPUS                   */
+#if PJMEDIA_CODEC_L16_HAS_8KHZ_MONO
     PJMEDIA_RTP_PT_L16_8KHZ_MONO,               /**< L16 @ 8KHz, mono       */
+#endif
+#if PJMEDIA_CODEC_L16_HAS_8KHZ_STEREO
     PJMEDIA_RTP_PT_L16_8KHZ_STEREO,             /**< L16 @ 8KHz, stereo     */
+#endif
     //PJMEDIA_RTP_PT_L16_11KHZ_MONO,            /**< L16 @ 11KHz, mono      */
     //PJMEDIA_RTP_PT_L16_11KHZ_STEREO,          /**< L16 @ 11KHz, stereo    */
+#if PJMEDIA_CODEC_L16_HAS_16KHZ_MONO
     PJMEDIA_RTP_PT_L16_16KHZ_MONO,              /**< L16 @ 16KHz, mono      */
+#endif
+#if PJMEDIA_CODEC_L16_HAS_16KHZ_STEREO
     PJMEDIA_RTP_PT_L16_16KHZ_STEREO,            /**< L16 @ 16KHz, stereo    */
+#endif
     //PJMEDIA_RTP_PT_L16_22KHZ_MONO,            /**< L16 @ 22KHz, mono      */
     //PJMEDIA_RTP_PT_L16_22KHZ_STEREO,          /**< L16 @ 22KHz, stereo    */

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

@@ -313 +313 @@
     }
 
+#if PJMEDIA_CODEC_L16_HAS_8KHZ_MONO
     if (count < *max_count) {
         /* 8KHz mono */
@@ -322 +323 @@
         ++count;
     }
-
+#endif
+
+#if PJMEDIA_CODEC_L16_HAS_8KHZ_STEREO
     if (count < *max_count) {
         /* 8KHz stereo */
@@ -332 +335 @@
         ++count;
     }
+#endif
 
 // disable some L16 modes
@@ -356 +360 @@
 #endif
 
+#if PJMEDIA_CODEC_L16_HAS_16KHZ_MONO
     if (count < *max_count) {
         /* 16000 Hz mono */
@@ -365 +370 @@
         ++count;
     }
-
-
+#endif
+
+#if PJMEDIA_CODEC_L16_HAS_16KHZ_STEREO
     if (count < *max_count) {
         /* 16000 Hz stereo */
@@ -376 +382 @@
         ++count;
     }
+#endif
 
 // disable some L16 modes