Changeset 2270 for pjproject/trunk/pjmedia/src/pjmedia/wav_writer.c

Timestamp:

Sep 10, 2008 7:48:45 PM (16 years ago)

Author:

nanang

Message:

Ticket #614: Added support for writing and reading WAV files encoded as 8 bit A-law/U-law.

File:

• pjproject/trunk/pjmedia/src/pjmedia/wav_writer.c (modified) (11 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wav_writer.c

@@ -18 +18 @@
  */
 #include <pjmedia/wav_port.h>
+#include <pjmedia/alaw_ulaw.h>
 #include <pjmedia/errno.h>
 #include <pjmedia/wave.h>
@@ -30 +31 @@
 #define THIS_FILE           "wav_writer.c"
 #define SIGNATURE           PJMEDIA_PORT_SIGNATURE('F', 'W', 'R', 'T')
-#define BYTES_PER_SAMPLE    2
 
 
@@ -36 +36 @@
 {
     pjmedia_port     base;
+    pjmedia_wave_fmt_tag fmt_tag;
+    pj_uint16_t      bytes_per_sample;
+
     pj_size_t        bufsize;
     char            *buf;
@@ -73 +76 @@
     pj_status_t status;
 
-    PJ_UNUSED_ARG(flags);
-
     /* Check arguments. */
     PJ_ASSERT_RETURN(pool && filename && p_port, PJ_EINVAL);
@@ -97 +98 @@
     fport->base.on_destroy = &file_on_destroy;
 
+    if (flags == PJMEDIA_FILE_WRITE_ALAW) {
+        fport->fmt_tag = PJMEDIA_WAVE_FMT_TAG_ALAW;
+        fport->bytes_per_sample = 1;
+    } else if (flags == PJMEDIA_FILE_WRITE_ULAW) {
+        fport->fmt_tag = PJMEDIA_WAVE_FMT_TAG_ULAW;
+        fport->bytes_per_sample = 1;
+    } else {
+        fport->fmt_tag = PJMEDIA_WAVE_FMT_TAG_PCM;
+        fport->bytes_per_sample = 2;
+    }
 
     /* Open file in write and read mode.
@@ -114 +125 @@
     wave_hdr.fmt_hdr.fmt = PJMEDIA_FMT_TAG;
     wave_hdr.fmt_hdr.len = 16;
-    wave_hdr.fmt_hdr.fmt_tag = 1;
+    wave_hdr.fmt_hdr.fmt_tag = fport->fmt_tag;
     wave_hdr.fmt_hdr.nchan = (pj_int16_t)channel_count;
     wave_hdr.fmt_hdr.sample_rate = sampling_rate;
     wave_hdr.fmt_hdr.bytes_per_sec = sampling_rate * channel_count * 
-                                     bits_per_sample / 8;
-    wave_hdr.fmt_hdr.block_align = (pj_int16_t) (channel_count * 
-                                                 bits_per_sample / 8);
-    wave_hdr.fmt_hdr.bits_per_sample = (pj_int16_t)bits_per_sample;
+                                     fport->bytes_per_sample;
+    wave_hdr.fmt_hdr.block_align = fport->bytes_per_sample * channel_count;
+    wave_hdr.fmt_hdr.bits_per_sample = fport->bytes_per_sample * 8;
 
     wave_hdr.data_hdr.data = PJMEDIA_DATA_TAG;
@@ -134 +144 @@
 
     /* Write WAVE header */
-    size = sizeof(pjmedia_wave_hdr);
-    status = pj_file_write(fport->fd, &wave_hdr, &size);
-    if (status != PJ_SUCCESS) {
-        pj_file_close(fport->fd);
-        return status;
+    if (fport->fmt_tag != PJMEDIA_WAVE_FMT_TAG_PCM) {
+        pjmedia_wave_subchunk fact_chunk;
+        pj_uint32_t tmp = 0;
+
+        fact_chunk.id = PJMEDIA_FACT_TAG;
+        fact_chunk.len = 4;
+
+        PJMEDIA_WAVE_NORMALIZE_SUBCHUNK(&fact_chunk);
+
+        /* Write WAVE header without DATA chunk header */
+        size = sizeof(pjmedia_wave_hdr) - sizeof(wave_hdr.data_hdr);
+        status = pj_file_write(fport->fd, &wave_hdr, &size);
+        if (status != PJ_SUCCESS) {
+            pj_file_close(fport->fd);
+            return status;
+        }
+
+        /* Write FACT chunk if it stores compressed data */
+        size = sizeof(fact_chunk);
+        status = pj_file_write(fport->fd, &fact_chunk, &size);
+        if (status != PJ_SUCCESS) {
+            pj_file_close(fport->fd);
+            return status;
+        }
+        size = 4;
+        status = pj_file_write(fport->fd, &tmp, &size);
+        if (status != PJ_SUCCESS) {
+            pj_file_close(fport->fd);
+            return status;
+        }
+
+        /* Write DATA chunk header */
+        size = sizeof(wave_hdr.data_hdr);
+        status = pj_file_write(fport->fd, &wave_hdr.data_hdr, &size);
+        if (status != PJ_SUCCESS) {
+            pj_file_close(fport->fd);
+            return status;
+        }
+    } else {
+        size = sizeof(pjmedia_wave_hdr);
+        status = pj_file_write(fport->fd, &wave_hdr, &size);
+        if (status != PJ_SUCCESS) {
+            pj_file_close(fport->fd);
+            return status;
+        }
     }
 
@@ -259 +309 @@
 {
     struct file_port *fport = (struct file_port *)this_port;
+    unsigned frame_size;
+
+    if (fport->fmt_tag == PJMEDIA_WAVE_FMT_TAG_PCM)
+        frame_size = frame->size;
+    else
+        frame_size = frame->size >> 1;
 
     /* Flush buffer if we don't have enough room for the frame. */
-    if (fport->writepos + frame->size > fport->buf + fport->bufsize) {
+    if (fport->writepos + frame_size > fport->buf + fport->bufsize) {
         pj_status_t status;
         status = flush_buffer(fport);
@@ -269 +325 @@
 
     /* Check if frame is not too large. */
-    PJ_ASSERT_RETURN(fport->writepos+frame->size <= fport->buf+fport->bufsize,
+    PJ_ASSERT_RETURN(fport->writepos+frame_size <= fport->buf+fport->bufsize,
                      PJMEDIA_EFRMFILETOOBIG);
 
     /* Copy frame to buffer. */
-    pj_memcpy(fport->writepos, frame->buf, frame->size);
-    fport->writepos += frame->size;
+    if (fport->fmt_tag == PJMEDIA_WAVE_FMT_TAG_PCM) {
+        pj_memcpy(fport->writepos, frame->buf, frame->size);
+    } else {
+        unsigned i;
+        pj_int16_t *src = (pj_int16_t*)frame->buf;
+        pj_uint8_t *dst = (pj_uint8_t*)fport->writepos;
+
+        if (fport->fmt_tag == PJMEDIA_WAVE_FMT_TAG_ULAW) {
+            for (i = 0; i < frame_size; ++i) {
+                *dst++ = pjmedia_linear2ulaw(*src++);
+            }
+        } else {
+            for (i = 0; i < frame_size; ++i) {
+                *dst++ = pjmedia_linear2alaw(*src++);
+            }
+        }
+
+    }
+    fport->writepos += frame_size;
 
     /* Increment total written, and check if we need to call callback */
-    fport->total += frame->size;
+    fport->total += frame_size;
     if (fport->cb && fport->total >= fport->cb_size) {
         pj_status_t (*cb)(pjmedia_port*, void*);
@@ -315 +388 @@
     pj_uint32_t wave_data_len;
     pj_status_t status;
+    pj_uint32_t data_len_pos = DATA_LEN_POS;
 
     /* Flush remaining buffers. */
@@ -342 +416 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 
+    /* Write samples_len in FACT chunk */
+    if (fport->fmt_tag != PJMEDIA_WAVE_FMT_TAG_PCM) {
+        enum { SAMPLES_LEN_POS = 44};
+        pj_uint32_t wav_samples_len;
+
+        /* Adjust wave_data_len & data_len_pos since there is FACT chunk */
+        wave_data_len -= 12;
+        data_len_pos += 12;
+        wav_samples_len = wave_data_len;
+
+        /* Seek to samples_len field. */
+        status = pj_file_setpos(fport->fd, SAMPLES_LEN_POS, PJ_SEEK_SET);
+        PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+
+        /* Write samples_len */
+        bytes = sizeof(wav_samples_len);
+        status = pj_file_write(fport->fd, &wav_samples_len, &bytes);
+        PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    }
+
     /* Seek to data_len field. */
-    status = pj_file_setpos(fport->fd, DATA_LEN_POS, PJ_SEEK_SET);
+    status = pj_file_setpos(fport->fd, data_len_pos, PJ_SEEK_SET);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);