Changeset 2457 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-codec/passthrough.c

Timestamp:

Feb 17, 2009 3:19:45 PM (14 years ago)

Author:

bennylp

Message:

Added bitrate and vad info in pjmedia_format, and changed audio route to use enumeration rather than boolean

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-codec/passthrough.c (modified) (7 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-codec/passthrough.c

@@ -156 +156 @@
     const char      *name;              /* Codec name.                      */
     pj_uint8_t       pt;                /* Payload type.                    */
-    pjmedia_format   format;            /* Source format.                   */
+    pjmedia_format_id fmt_id;           /* Source format.                   */
     unsigned         clock_rate;        /* Codec's clock rate.              */
     unsigned         channel_count;     /* Codec's channel count.           */
@@ -173 +173 @@
 {
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR
-    {1, "AMR",      PJMEDIA_RTP_PT_AMR,       {PJMEDIA_FORMAT_AMR},
+    {1, "AMR",      PJMEDIA_RTP_PT_AMR,       PJMEDIA_FORMAT_AMR,
                     8000, 1, 160, 
                     7400, 12200, 2, 1, 1,
@@ -182 +182 @@
 
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_G729
-    {1, "G729",     PJMEDIA_RTP_PT_G729,      {PJMEDIA_FORMAT_G729},
+    {1, "G729",     PJMEDIA_RTP_PT_G729,      PJMEDIA_FORMAT_G729,
                     8000, 1,  80,
                     8000, 8000, 2, 1, 1
@@ -189 +189 @@
 
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC
-    {1, "iLBC",     PJMEDIA_RTP_PT_ILBC,      {PJMEDIA_FORMAT_ILBC},
+    {1, "iLBC",     PJMEDIA_RTP_PT_ILBC,      PJMEDIA_FORMAT_ILBC,
                     8000, 1,  240,
                     13333, 15200, 1, 1, 1,
@@ -198 +198 @@
 
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU
-    {1, "PCMU",     PJMEDIA_RTP_PT_PCMU,      {PJMEDIA_FORMAT_PCMU},
+    {1, "PCMU",     PJMEDIA_RTP_PT_PCMU,      PJMEDIA_FORMAT_PCMU,
                     8000, 1,  80,
                     64000, 64000, 2, 1, 1
@@ -205 +205 @@
 
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA
-    {1, "PCMA",     PJMEDIA_RTP_PT_PCMA,      {PJMEDIA_FORMAT_PCMA},
+    {1, "PCMA",     PJMEDIA_RTP_PT_PCMA,      PJMEDIA_FORMAT_PCMA,
                     8000, 1,  80,
                     64000, 64000, 2, 1, 1
@@ -450 +450 @@
                                     codec_desc[i].channel_count / 
                                     codec_desc[i].clock_rate);
-            attr->info.format = codec_desc[i].format;
+            attr->info.fmt_id = codec_desc[i].fmt_id;
 
             /* Default flags. */