Changeset 3664 for pjproject/trunk/pjmedia/src/pjmedia/wav_player.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_player.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -33 +33 @@
 
 
-#define SIGNATURE           PJMEDIA_PORT_SIGNATURE('F', 'P', 'l', 'y')
+#define SIGNATURE           PJMEDIA_SIG_PORT_WAV_PLAYER
 #define BITS_PER_SAMPLE     16
 
@@ -188 +188 @@
     pj_ssize_t size_to_read, size_read;
     struct file_reader_port *fport;
+    pjmedia_audio_format_detail *ad;
     pj_off_t pos;
+    pj_str_t name;
+    unsigned samples_per_frame;
     pj_status_t status = PJ_SUCCESS;
 
@@ -353 +356 @@
 
     /* Update port info. */
-    fport->base.info.channel_count = wave_hdr.fmt_hdr.nchan;
-    fport->base.info.clock_rate = wave_hdr.fmt_hdr.sample_rate;
-    fport->base.info.bits_per_sample = BITS_PER_SAMPLE;
-    fport->base.info.samples_per_frame = fport->base.info.clock_rate *
-                                         wave_hdr.fmt_hdr.nchan *
-                                         ptime / 1000;
-    fport->base.info.bytes_per_frame = 
-        fport->base.info.samples_per_frame * 
-        fport->base.info.bits_per_sample / 8;
-
-    pj_strdup2(pool, &fport->base.info.name, filename);
+    ad = pjmedia_format_get_audio_format_detail(&fport->base.info.fmt, 1);
+    pj_strdup2(pool, &name, filename);
+    samples_per_frame = ptime * wave_hdr.fmt_hdr.sample_rate *
+                        wave_hdr.fmt_hdr.nchan / 1000;
+    pjmedia_port_info_init(&fport->base.info, &name, SIGNATURE,
+                           wave_hdr.fmt_hdr.sample_rate,
+                           wave_hdr.fmt_hdr.nchan,
+                           BITS_PER_SAMPLE,
+                           samples_per_frame);
 
     /* If file is shorter than buffer size, adjust buffer size to file
@@ -380 +381 @@
      * doesn't handle this case).
      */
-    if (fport->base.info.samples_per_frame * fport->bytes_per_sample >=
-        fport->bufsize)
-    {
+    if (samples_per_frame * fport->bytes_per_sample >= fport->bufsize) {
         pj_file_close(fport->fd);
         return PJ_EINVAL;
@@ -416 +415 @@
               (int)fport->base.info.name.slen,
               fport->base.info.name.ptr,
-              fport->base.info.clock_rate,
-              fport->base.info.channel_count,
+              ad->clock_rate,
+              ad->channel_count,
               fport->bufsize / 1000,
               (unsigned long)(fport->fsize / 1000)));