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

pjproject/trunk/pjmedia/src/pjmedia/port.c

@@ -22 +22 @@
 #include <pj/assert.h>
 #include <pj/log.h>
+#include <pj/pool.h>
 
 #define THIS_FILE       "port.c"
@@ -38 +39 @@
                                             unsigned samples_per_frame)
 {
+#define USEC_IN_SEC (pj_uint64_t)1000000
+    unsigned frame_time_usec, avg_bps;
+
     pj_bzero(info, sizeof(*info));
 
+    info->signature = signature;
+    info->dir = PJMEDIA_DIR_ENCODING_DECODING;
     info->name = *name;
-    info->signature = signature;
-    info->type = PJMEDIA_TYPE_AUDIO;
-    info->has_info = PJ_TRUE;
-    info->need_info = PJ_FALSE;
-    info->pt = 0xFF;
-    info->encoding_name = pj_str("pcm");
-    info->clock_rate = clock_rate;
-    info->channel_count = channel_count;
-    info->bits_per_sample = bits_per_sample;
-    info->samples_per_frame = samples_per_frame;
-    info->bytes_per_frame = samples_per_frame * bits_per_sample / 8;
+
+    frame_time_usec = (unsigned)(samples_per_frame * USEC_IN_SEC /
+                                 channel_count / clock_rate);
+    avg_bps = clock_rate * channel_count * bits_per_sample;
+
+    pjmedia_format_init_audio(&info->fmt, PJMEDIA_FORMAT_L16, clock_rate,
+                              channel_count, bits_per_sample, frame_time_usec,
+                              avg_bps, avg_bps);
 
     return PJ_SUCCESS;
 }
 
+PJ_DEF(pj_status_t) pjmedia_port_info_init2( pjmedia_port_info *info,
+                                             const pj_str_t *name,
+                                             unsigned signature,
+                                             pjmedia_dir dir,
+                                             const pjmedia_format *fmt)
+{
+    pj_bzero(info, sizeof(*info));
+    info->signature = signature;
+    info->dir = dir;
+    info->name = *name;
+
+    pjmedia_format_copy(&info->fmt, fmt);
+
+    return PJ_SUCCESS;
+}
+
+/**
+ * Get a clock source from the port.
+ */
+PJ_DEF(pjmedia_clock_src *) pjmedia_port_get_clock_src( pjmedia_port *port,
+                                                        pjmedia_dir dir )
+{
+    if (port && port->get_clock_src)
+        return port->get_clock_src(port, dir);
+    else
+        return NULL;
+}
 
 /**
@@ -78 +108 @@
  */
 PJ_DEF(pj_status_t) pjmedia_port_put_frame( pjmedia_port *port,
-                                            const pjmedia_frame *frame )
+                                            pjmedia_frame *frame )
 {
     PJ_ASSERT_RETURN(port && frame, PJ_EINVAL);
@@ -88 +118 @@
 }
 
+/*
+ * Get event publisher
+ */
+PJ_DEF(pjmedia_event_publisher*)
+pjmedia_port_get_event_publisher(pjmedia_port *port)
+{
+    PJ_ASSERT_RETURN(port, NULL);
+
+    if (port->get_event_pub)
+        return (*port->get_event_pub)(port);
+
+    return NULL;
+}
 
 /**