Changeset 334 for pjproject/trunk/pjmedia/src/pjmedia/file_port.c

Timestamp:

Mar 19, 2006 12:48:43 AM (18 years ago)

Author:

bennylp

Message:

Tested and fixed stereo audio support

File:

• pjproject/trunk/pjmedia/src/pjmedia/file_port.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/file_port.c

@@ -200 +200 @@
     }
 
+    /* Must be PCM with 16bits per sample */
     if (wave_hdr.fmt_hdr.fmt_tag != 1 ||
-        wave_hdr.fmt_hdr.bits_per_sample != 16 ||
-        wave_hdr.fmt_hdr.block_align != 2)
+        wave_hdr.fmt_hdr.bits_per_sample != 16)
     {
+        pj_file_close(fport->fd);
+        return PJMEDIA_EWAVEUNSUPP;
+    }
+
+    /* Block align must be 2*nchannels */
+    if (wave_hdr.fmt_hdr.block_align != wave_hdr.fmt_hdr.nchan*2) {
         pj_file_close(fport->fd);
         return PJMEDIA_EWAVEUNSUPP;
@@ -228 +234 @@
     fport->base.info.bits_per_sample = wave_hdr.fmt_hdr.bits_per_sample;
     fport->base.info.samples_per_frame = fport->base.info.sample_rate *
-                                             20 / 1000;
+                                         wave_hdr.fmt_hdr.nchan *
+                                         20 / 1000;
     fport->base.info.bytes_per_frame = 
         fport->base.info.samples_per_frame *