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

Timestamp:

Feb 16, 2009 4:29:05 PM (15 years ago)

Author:

nanang

Message:

Changed term 'fourcc' to 'format' and few minor fixes/updates.

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/sound_port.c (modified) (5 diffs)

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

@@ -291 +291 @@
 
         switch (snd_port->setting.format.u32) {
-        case PJMEDIA_FOURCC_PCMA:
+        case PJMEDIA_FORMAT_PCMA:
             decoder = &pjmedia_alaw_decode;
             break;
-        case PJMEDIA_FOURCC_PCMU:
+        case PJMEDIA_FORMAT_PCMU:
             decoder = &pjmedia_ulaw_decode;
             break;
@@ -393 +393 @@
 
     switch (snd_port->setting.format.u32) {
-    case PJMEDIA_FOURCC_PCMA:
+    case PJMEDIA_FORMAT_PCMA:
         encoder = &pjmedia_alaw_encode;
         break;
-    case PJMEDIA_FOURCC_PCMU:
+    case PJMEDIA_FORMAT_PCMU:
         encoder = &pjmedia_ulaw_encode;
         break;
@@ -435 +435 @@
                      PJ_EBUG);
 
-    if (snd_port->setting.format.u32 == 0 ||
-        snd_port->setting.format.u32 == PJMEDIA_FOURCC_L16)
-    {
+    if (snd_port->setting.format.u32 == PJMEDIA_FORMAT_L16) {
         snd_rec_cb = &rec_cb;
         snd_play_cb = &play_cb;
@@ -701 +699 @@
     
 #if PJMEDIA_SOUND_USE_DELAYBUF
-    if (snd_port->setting.format.u32 == 0 ||
-        snd_port->setting.format.u32 == PJMEDIA_FOURCC_L16) 
-    {
+    if (snd_port->setting.format.u32 == PJMEDIA_FORMAT_L16) {
         pj_status_t status;
         unsigned ptime;
@@ -720 +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 != 0 &&
-        snd_port->setting.format.u32 != PJMEDIA_FOURCC_L16) 
-    {
+    if (snd_port->setting.format.u32 != PJMEDIA_FORMAT_L16) {
         snd_port->frm_buf_size = sizeof(pjmedia_frame_ext) + 
                                  (samples_per_frame << 1) +