Changeset 3392 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/stereo_port.c

Timestamp:

Dec 10, 2010 11:04:30 AM (13 years ago)

Author:

bennylp

Message:

Migration of current video works from private repository to this repository. This closed #1176

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/stereo_port.c (modified) (10 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/stereo_port.c

@@ -40 +40 @@
 
 static pj_status_t stereo_put_frame(pjmedia_port *this_port,
-                                    const pjmedia_frame *frame);
+                                    pjmedia_frame *frame);
 static pj_status_t stereo_get_frame(pjmedia_port *this_port, 
                                     pjmedia_frame *frame);
@@ -61 +61 @@
 
     /* Only supports 16bit samples per frame */
-    PJ_ASSERT_RETURN(dn_port->info.bits_per_sample == 16, PJMEDIA_ENCBITS);
+    PJ_ASSERT_RETURN(PJMEDIA_PIA_BITS(&dn_port->info) == 16,
+                     PJMEDIA_ENCBITS);
 
     /* Validate channel counts */
-    PJ_ASSERT_RETURN(((dn_port->info.channel_count>1 && channel_count==1) ||
-                      (dn_port->info.channel_count==1 && channel_count>1)),
+    PJ_ASSERT_RETURN(((PJMEDIA_PIA_CCNT(&dn_port->info)>1 &&
+                              channel_count==1) ||
+                      (PJMEDIA_PIA_CCNT(&dn_port->info)==1 &&
+                              channel_count>1)),
                       PJ_EINVAL);
 
@@ -72 +75 @@
     PJ_ASSERT_RETURN(sport != NULL, PJ_ENOMEM);
 
-    samples_per_frame = dn_port->info.samples_per_frame * channel_count /
-                        dn_port->info.channel_count;
+    samples_per_frame = PJMEDIA_PIA_SPF(&dn_port->info) * channel_count /
+                          PJMEDIA_PIA_CCNT(&dn_port->info);
 
     pjmedia_port_info_init(&sport->base.info, &name, SIGNATURE, 
-                           dn_port->info.clock_rate,
+                           PJMEDIA_PIA_SRATE(&dn_port->info),
                            channel_count, 
-                           dn_port->info.bits_per_sample, 
+                           PJMEDIA_PIA_BITS(&dn_port->info),
                            samples_per_frame);
 
@@ -86 +89 @@
     /* We always need buffer for put_frame */
     sport->put_buf = (pj_int16_t*)
-                     pj_pool_alloc(pool, dn_port->info.bytes_per_frame);
+                     pj_pool_alloc(pool,
+                                   PJMEDIA_PIA_AVG_FSZ(&dn_port->info));
 
     /* See if we need buffer for get_frame */
-    if (dn_port->info.channel_count > channel_count) {
+    if (PJMEDIA_PIA_CCNT(&dn_port->info) > channel_count) {
         sport->get_buf = (pj_int16_t*)
-                         pj_pool_alloc(pool, dn_port->info.bytes_per_frame);
+                         pj_pool_alloc(pool,
+                                       PJMEDIA_PIA_AVG_FSZ(&dn_port->info));
     }
 
@@ -107 +112 @@
 
 static pj_status_t stereo_put_frame(pjmedia_port *this_port,
-                                    const pjmedia_frame *frame)
+                                    pjmedia_frame *frame)
 {
     struct stereo_port *sport = (struct stereo_port*) this_port;
+    const pjmedia_audio_format_detail *s_afd, *dn_afd;
     pjmedia_frame tmp_frame;
 
@@ -117 +123 @@
     }
 
+    s_afd = pjmedia_format_get_audio_format_detail(&this_port->info.fmt, 1);
+    dn_afd = pjmedia_format_get_audio_format_detail(&sport->dn_port->info.fmt,
+                                                    1);
+
     if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO) {
         tmp_frame.buf = sport->put_buf;
-        if (sport->dn_port->info.channel_count == 1) {
+        if (dn_afd->channel_count == 1) {
             pjmedia_convert_channel_nto1((pj_int16_t*)tmp_frame.buf, 
                                          (const pj_int16_t*)frame->buf,
-                                         sport->base.info.channel_count, 
-                                         sport->base.info.samples_per_frame, 
+                                         s_afd->channel_count,
+                                         PJMEDIA_AFD_SPF(s_afd),
                                          (sport->options & PJMEDIA_STEREO_MIX),
                                          0);
@@ -129 +139 @@
             pjmedia_convert_channel_1ton((pj_int16_t*)tmp_frame.buf, 
                                          (const pj_int16_t*)frame->buf,
-                                         sport->dn_port->info.channel_count, 
-                                         sport->base.info.samples_per_frame,
+                                         dn_afd->channel_count,
+                                         PJMEDIA_AFD_SPF(s_afd),
                                          sport->options);
         }
-        tmp_frame.size = sport->dn_port->info.bytes_per_frame;
+        tmp_frame.size = PJMEDIA_AFD_AVG_FSZ(dn_afd);
     } else {
         tmp_frame.buf = frame->buf;
@@ -151 +161 @@
 {
     struct stereo_port *sport = (struct stereo_port*) this_port;
+    const pjmedia_audio_format_detail *s_afd, *dn_afd;
     pjmedia_frame tmp_frame;
     pj_status_t status;
@@ -160 +171 @@
     }
 
+    s_afd = pjmedia_format_get_audio_format_detail(&this_port->info.fmt, 1);
+    dn_afd = pjmedia_format_get_audio_format_detail(&sport->dn_port->info.fmt,
+                                                    1);
+
     tmp_frame.buf = sport->get_buf? sport->get_buf : frame->buf;
-    tmp_frame.size = sport->dn_port->info.bytes_per_frame;
+    tmp_frame.size = PJMEDIA_PIA_AVG_FSZ(&sport->dn_port->info);
     tmp_frame.timestamp.u64 = frame->timestamp.u64;
     tmp_frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
@@ -178 +193 @@
     }
 
-    if (sport->base.info.channel_count == 1) {
+    if (s_afd->channel_count == 1) {
         pjmedia_convert_channel_nto1((pj_int16_t*)frame->buf, 
                                      (const pj_int16_t*)tmp_frame.buf,
-                                     sport->dn_port->info.channel_count, 
-                                     sport->dn_port->info.samples_per_frame, 
+                                     dn_afd->channel_count,
+                                     PJMEDIA_AFD_SPF(s_afd),
                                      (sport->options & PJMEDIA_STEREO_MIX), 0);
     } else {
         pjmedia_convert_channel_1ton((pj_int16_t*)frame->buf, 
                                      (const pj_int16_t*)tmp_frame.buf,
-                                     sport->base.info.channel_count, 
-                                     sport->dn_port->info.samples_per_frame,
+                                     s_afd->channel_count,
+                                     PJMEDIA_AFD_SPF(dn_afd),
                                      sport->options);
     }
 
-    frame->size = sport->base.info.bytes_per_frame;
+    frame->size = PJMEDIA_AFD_AVG_FSZ(s_afd);
     frame->type = PJMEDIA_FRAME_TYPE_AUDIO;