Changeset 3664 for pjproject/trunk/pjmedia/src/pjmedia/wav_playlist.c

Timestamp:

Jul 19, 2011 3:42:28 AM (13 years ago)

Author:

nanang

Message:

Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/wav_playlist.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wav_playlist.c

@@ -33 +33 @@
 #define THIS_FILE           "wav_playlist.c"
 
-#define SIGNATURE           PJMEDIA_PORT_SIGNATURE('P', 'l', 's', 't')
+#define SIGNATURE           PJMEDIA_SIG_PORT_WAV_PLAYLIST
 #define BYTES_PER_SAMPLE    2
 
@@ -237 +237 @@
 {
     struct playlist_port *fport;
+    pjmedia_audio_format_detail *afd;
     pj_off_t pos;
     pj_status_t status;
@@ -280 +281 @@
         return PJ_ENOMEM;
     }
+
+    afd = pjmedia_format_get_audio_format_detail(&fport->base.info.fmt, 1);
 
     /* start with the first file. */
@@ -467 +470 @@
          */
         if (!has_wave_info) {
-            fport->base.info.channel_count = wavehdr.fmt_hdr.nchan;
-            fport->base.info.clock_rate = wavehdr.fmt_hdr.sample_rate;
-            fport->base.info.bits_per_sample = wavehdr.fmt_hdr.bits_per_sample;
-            fport->base.info.samples_per_frame = fport->base.info.clock_rate *
-                                                 wavehdr.fmt_hdr.nchan *
-                                                 ptime / 1000;
-            fport->base.info.bytes_per_frame =
-                fport->base.info.samples_per_frame *
-                fport->base.info.bits_per_sample / 8;
+            afd->channel_count = wavehdr.fmt_hdr.nchan;
+            afd->clock_rate = wavehdr.fmt_hdr.sample_rate;
+            afd->bits_per_sample = wavehdr.fmt_hdr.bits_per_sample;
+            afd->frame_time_usec = ptime * 1000;
+            afd->avg_bps = afd->max_bps = afd->clock_rate *
+                                          afd->channel_count *
+                                          afd->bits_per_sample / 8;
 
             has_wave_info = PJ_TRUE;
@@ -484 +485 @@
              * files.
              */
-            if (wavehdr.fmt_hdr.nchan != fport->base.info.channel_count ||
-                wavehdr.fmt_hdr.sample_rate != fport->base.info.clock_rate ||
-                wavehdr.fmt_hdr.bits_per_sample != fport->base.info.bits_per_sample)
+            if (wavehdr.fmt_hdr.nchan != afd->channel_count ||
+                wavehdr.fmt_hdr.sample_rate != afd->clock_rate ||
+                wavehdr.fmt_hdr.bits_per_sample != afd->bits_per_sample)
             {
                 /* This file has different characteristics than the other 
@@ -520 +521 @@
              (int)port_label->slen,
              port_label->ptr,
-             fport->base.info.clock_rate,
-             fport->base.info.channel_count,
+             afd->clock_rate,
+             afd->channel_count,
              fport->bufsize / 1000));