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

Timestamp:

Feb 17, 2009 3:19:45 PM (16 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/sound_port.c (modified) (6 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/sound_port.c

@@ -290 +290 @@
         unsigned i, size_decoded;
 
-        switch (snd_port->setting.format.u32) {
+        switch (snd_port->setting.format.fmt_id) {
         case PJMEDIA_FORMAT_PCMA:
             decoder = &pjmedia_alaw_decode;
@@ -299 +299 @@
         default:
             PJ_LOG(1,(THIS_FILE, "Unsupported format %d", 
-                      snd_port->setting.format.u32));
+                      snd_port->setting.format.fmt_id));
             goto no_frame;
         }
@@ -392 +392 @@
     fx->base.timestamp.u32.lo = timestamp;
 
-    switch (snd_port->setting.format.u32) {
+    switch (snd_port->setting.format.fmt_id) {
     case PJMEDIA_FORMAT_PCMA:
         encoder = &pjmedia_alaw_encode;
@@ -401 +401 @@
     default:
         PJ_LOG(1,(THIS_FILE, "Unsupported format %d", 
-                  snd_port->setting.format.u32));
+                  snd_port->setting.format.fmt_id));
         return PJ_SUCCESS;
     }
@@ -435 +435 @@
                      PJ_EBUG);
 
-    if (snd_port->setting.format.u32 == PJMEDIA_FORMAT_L16) {
+    if (snd_port->setting.format.fmt_id == PJMEDIA_FORMAT_L16) {
         snd_rec_cb = &rec_cb;
         snd_play_cb = &play_cb;
@@ -716 +716 @@
 #if !defined(PJMEDIA_SND_SUPPORT_OPEN2) || PJMEDIA_SND_SUPPORT_OPEN2==0
     /* For devices that doesn't support open2(), enable simulation */
-    if (snd_port->setting.format.u32 != PJMEDIA_FORMAT_L16) {
+    if (snd_port->setting.format.fmt_id != PJMEDIA_FORMAT_L16) {
         snd_port->frm_buf_size = sizeof(pjmedia_frame_ext) + 
                                  (samples_per_frame << 1) +