Changeset 5791

Timestamp:

May 14, 2018 1:24:43 AM (6 years ago)

Author:

ming

Message:

Re #2059 (misc): Related to #2031. Add compile-time config for L16 48KHz.

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) (2 diffs)

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

@@ -80 +80 @@
 #ifndef PJMEDIA_CODEC_L16_HAS_16KHZ_STEREO
 #   define PJMEDIA_CODEC_L16_HAS_16KHZ_STEREO   0
+#endif
+
+
+/**
+ * Settings to enable L16 codec 48KHz, mono. By default it is disabled.
+ */
+#ifndef PJMEDIA_CODEC_L16_HAS_48KHZ_MONO
+#   define PJMEDIA_CODEC_L16_HAS_48KHZ_MONO     0
+#endif
+
+
+/**
+ * Settings to enable L16 codec 48KHz, stereo. By default it is disabled.
+ */
+#ifndef PJMEDIA_CODEC_L16_HAS_48KHZ_STEREO
+#   define PJMEDIA_CODEC_L16_HAS_48KHZ_STEREO   0
 #endif
 

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

@@ -103 +103 @@
     //PJMEDIA_RTP_PT_L16_32KHZ_MONO,            /**< L16 @ 32KHz, mono      */
     //PJMEDIA_RTP_PT_L16_32KHZ_STEREO,          /**< L16 @ 32KHz, stereo    */
-    //PJMEDIA_RTP_PT_L16_48KHZ_MONO,            /**< L16 @ 48KHz, mono      */
-    //PJMEDIA_RTP_PT_L16_48KHZ_STEREO,          /**< L16 @ 48KHz, stereo    */
+#if PJMEDIA_CODEC_L16_HAS_48KHZ_MONO
+    PJMEDIA_RTP_PT_L16_48KHZ_MONO,              /**< L16 @ 48KHz, mono      */
+#endif
+#if PJMEDIA_CODEC_L16_HAS_48KHZ_STEREO
+    PJMEDIA_RTP_PT_L16_48KHZ_STEREO,            /**< L16 @ 48KHz, stereo    */
+#endif
 
     /* Caution!

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

@@ -426 +426 @@
         ++count;
     }
-
+#endif
+
+#if PJMEDIA_CODEC_L16_HAS_48KHZ_MONO
     if (count < *max_count) {
         /* 48KHz mono */
@@ -436 +438 @@
         ++count;
     }
-
+#endif
+
+#if PJMEDIA_CODEC_L16_HAS_48KHZ_STEREO
     if (count < *max_count) {
         /* 48KHz stereo */