Changeset 2460 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/stream.c

Timestamp:

Feb 18, 2009 2:28:49 PM (16 years ago)

Author:

nanang

Message:

• Added APS-direct sound device management into pjsua-lib (and removed it from apps).
• Fixed bug in conf_switch.c to always update ts_rx (even if port is not transmitting).
• Minor updates: 'fmt_id' to 'id', added transmitter_Cnt in conf port info, explicit mapping in Symbian audio APS impl from pjmedia_format_id to Symbian APS fourcc.

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/stream.c (modified) (2 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/stream.c

@@ -868 +868 @@
     } else if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO &&
                frame->buf == NULL &&
-               stream->port.info.format.fmt_id == PJMEDIA_FORMAT_L16 &&
+               stream->port.info.format.id == PJMEDIA_FORMAT_L16 &&
                (stream->dir & PJMEDIA_DIR_ENCODING) &&
                stream->codec_param.info.frm_ptime *
@@ -1606 +1606 @@
     stream->port.info.clock_rate = info->fmt.clock_rate;
     stream->port.info.channel_count = info->fmt.channel_cnt;
-    stream->port.info.format.fmt_id = info->param->info.fmt_id;
-    stream->port.info.format.bitrate = info->param->info.avg_bps;
-    stream->port.info.format.vad = (info->param->setting.vad != 0);
+    stream->port.info.format.id = info->param->info.fmt_id;
     stream->port.port_data.pdata = stream;
-    if (stream->port.info.format.fmt_id == PJMEDIA_FORMAT_L16) {
+    if (stream->port.info.format.id == PJMEDIA_FORMAT_L16) {
         stream->port.put_frame = &put_frame;
         stream->port.get_frame = &get_frame;
     } else {
+        stream->port.info.format.bitrate = info->param->info.avg_bps;
+        stream->port.info.format.vad = (info->param->setting.vad != 0);
+
         stream->port.put_frame = &put_frame;
         stream->port.get_frame = &get_frame_ext;