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

Timestamp:

Feb 17, 2009 3:19:45 PM (16 years ago)

Author:

bennylp

Message:

Added bitrate and vad info in pjmedia_format, and changed audio route to use enumeration rather than boolean

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.u32 == PJMEDIA_FORMAT_L16 &&
+               stream->port.info.format.fmt_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 = info->param->info.format;
+    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.port_data.pdata = stream;
-    if (stream->port.info.format.u32 == PJMEDIA_FORMAT_L16) {
+    if (stream->port.info.format.fmt_id == PJMEDIA_FORMAT_L16) {
         stream->port.put_frame = &put_frame;
         stream->port.get_frame = &get_frame;