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

pjproject/trunk/pjmedia/src/pjmedia/echo_port.c

@@ -27 +27 @@
 
 #define THIS_FILE   "ec_port.c"
-#define SIGNATURE   PJMEDIA_PORT_SIGNATURE('E', 'C', 'H', 'O')
+#define SIGNATURE   PJMEDIA_SIG_PORT_ECHO
 #define BUF_COUNT   32
 
@@ -39 +39 @@
 
 static pj_status_t ec_put_frame(pjmedia_port *this_port, 
-                                const pjmedia_frame *frame);
+                                pjmedia_frame *frame);
 static pj_status_t ec_get_frame(pjmedia_port *this_port, 
                                 pjmedia_frame *frame);
@@ -53 +53 @@
 {
     const pj_str_t AEC = { "EC", 2 };
+    pjmedia_audio_format_detail *afd;
     struct ec *ec;
     pj_status_t status;
 
     PJ_ASSERT_RETURN(pool && dn_port && p_port, PJ_EINVAL);
-    PJ_ASSERT_RETURN(dn_port->info.bits_per_sample==16 && tail_ms, 
+
+    afd = pjmedia_format_get_audio_format_detail(&dn_port->info.fmt, PJ_TRUE);
+
+    PJ_ASSERT_RETURN(afd->bits_per_sample==16 && tail_ms,
                      PJ_EINVAL);
 
@@ -64 +68 @@
     
     pjmedia_port_info_init(&ec->base.info, &AEC, SIGNATURE,
-                           dn_port->info.clock_rate, 
-                           dn_port->info.channel_count, 
-                           dn_port->info.bits_per_sample,
-                           dn_port->info.samples_per_frame);
+                           afd->clock_rate,
+                           afd->channel_count,
+                           afd->bits_per_sample,
+                           PJMEDIA_AFD_SPF(afd));
 
-    status = pjmedia_echo_create2(pool, dn_port->info.clock_rate, 
-                                  dn_port->info.channel_count,
-                                  dn_port->info.samples_per_frame,
+    status = pjmedia_echo_create2(pool, afd->clock_rate,
+                                  afd->channel_count,
+                                  PJMEDIA_AFD_SPF(afd),
                                   tail_ms, latency_ms, options, &ec->ec);
     if (status != PJ_SUCCESS)
@@ -90 +94 @@
 
 static pj_status_t ec_put_frame( pjmedia_port *this_port, 
-                                 const pjmedia_frame *frame)
+                                 pjmedia_frame *frame)
 {
     struct ec *ec = (struct ec*)this_port;
@@ -100 +104 @@
     }
 
-    PJ_ASSERT_RETURN(frame->size == this_port->info.samples_per_frame * 2,
+    PJ_ASSERT_RETURN(frame->size == PJMEDIA_PIA_AVG_FSZ(&this_port->info),
                      PJ_EINVAL);
 
@@ -120 +124 @@
     if (status!=PJ_SUCCESS || frame->type!=PJMEDIA_FRAME_TYPE_AUDIO) {
         pjmedia_zero_samples((pj_int16_t*)frame->buf, 
-                             this_port->info.samples_per_frame);
+                              PJMEDIA_PIA_SPF(&this_port->info));
     }