Changeset 2834 for pjproject/trunk/pjmedia/src/pjmedia/stream.c

Timestamp:

Jul 15, 2009 5:55:16 PM (15 years ago)

Author:

nanang

Message:

Ticket #919:

• Added default ilbc mode into codec passthrough setting.
• Added iLBC mode 'negotiation' in iLBC codec_open().
• Updated stream_create() to prioritize codec_open(), that may update the codec params, over stream initializations involving codec params.

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1674 +1674 @@
     stream->port.info.channel_count = info->fmt.channel_cnt;
     stream->port.port_data.pdata = stream;
-    if (info->param==NULL || info->param->info.fmt_id == PJMEDIA_FORMAT_L16) {
-        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.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.put_frame = &put_frame;
-        stream->port.get_frame = &get_frame_ext;
-    }
-
 
     /* Init stream: */
@@ -1746 +1732 @@
         stream->codec_param.setting.frm_per_pkt = 1;
 
-    /* Set additional info. */
+    /* Open the codec. */
+    status = stream->codec->op->open(stream->codec, &stream->codec_param);
+    if (status != PJ_SUCCESS)
+        goto err_cleanup;
+
+    /* Set additional info and callbacks. */
     stream->port.info.bits_per_sample = 16;
     stream->port.info.samples_per_frame = info->fmt.clock_rate * 
@@ -1763 +1754 @@
     }
 
-    /* Open the codec: */
-
-    status = stream->codec->op->open(stream->codec, &stream->codec_param);
-    if (status != PJ_SUCCESS)
-        goto err_cleanup;
+    stream->port.info.format.id = stream->codec_param.info.fmt_id;
+    if (stream->codec_param.info.fmt_id == PJMEDIA_FORMAT_L16) {
+        stream->port.put_frame = &put_frame;
+        stream->port.get_frame = &get_frame;
+    } else {
+        stream->port.info.format.bitrate = stream->codec_param.info.avg_bps;
+        stream->port.info.format.vad = (stream->codec_param.setting.vad != 0);
+        stream->port.put_frame = &put_frame;
+        stream->port.get_frame = &get_frame_ext;
+    }
 
     /* If encoder and decoder's ptime are asymmetric, then we need to