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

Timestamp:

Jul 29, 2006 11:14:47 AM (18 years ago)

Author:

bennylp

Message:

Added pjmedia_port_info_init() to fill in pjmedia_port_info structure, avoiding manual initialization and thus improves consistency (and probably reduces size by a tiny bit). This involves modification in quite few places.

File:

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

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

@@ -70 +70 @@
     pjmedia_wave_hdr wave_hdr;
     pj_ssize_t size;
+    pj_str_t name;
     pj_status_t status;
 
@@ -87 +88 @@
 
     /* Initialize port info. */
-    fport->base.info.bits_per_sample = bits_per_sample;
-    fport->base.info.bytes_per_frame = samples_per_frame * bits_per_sample *
-                                       channel_count / 8;
-    fport->base.info.channel_count = channel_count;
-    fport->base.info.encoding_name = pj_str("pom");
-    fport->base.info.has_info = 1;
-    pj_strdup2(pool, &fport->base.info.name, filename);
-    fport->base.info.need_info = 0;
-    fport->base.info.pt = 0xFF;
-    fport->base.info.clock_rate = sampling_rate;
-    fport->base.info.samples_per_frame = samples_per_frame;
-    fport->base.info.signature = SIGNATURE;
-    fport->base.info.type = PJMEDIA_TYPE_AUDIO;
-    
+    pj_strdup2(pool, &name, filename);
+    pjmedia_port_info_init(&fport->base.info, &name, SIGNATURE,
+                           sampling_rate, channel_count, bits_per_sample,
+                           samples_per_frame);
+
     fport->base.get_frame = &file_get_frame;
     fport->base.put_frame = &file_put_frame;
@@ -221 +213 @@
 
     fport->cb_size = pos;
-    fport->base.user_data = user_data;
+    fport->base.port_data.pdata = user_data;
     fport->cb = cb;
 
@@ -294 +286 @@
         fport->cb = NULL;
 
-        status = (*cb)(this_port, this_port->user_data);
+        status = (*cb)(this_port, this_port->port_data.pdata);
         return status;
     }