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

Timestamp:

Aug 24, 2010 10:45:01 AM (14 years ago)

Author:

nanang

Message:

Fix #1114:

• Fixed bytes_per_frame calculation in stream port.
• Fixed sample streamutil.c to use codec info/param for codec bandwidth calculation (was using bytes_per_frame info of stream port).
• Doc fix for bytes_per_frame field in pjmedia_port_info.

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (1 diff)

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

@@ -2031 +2031 @@
                                           stream->codec_param.setting.frm_per_pkt /
                                           1000;
-    stream->port.info.bytes_per_frame = stream->codec_param.info.max_bps * 
-                                        stream->codec_param.info.frm_ptime *
-                                        stream->codec_param.setting.frm_per_pkt /
-                                        8 / 1000;
-    if ((stream->codec_param.info.max_bps * stream->codec_param.info.frm_ptime *
-        stream->codec_param.setting.frm_per_pkt) % 8000 != 0)
-    {
-        ++stream->port.info.bytes_per_frame;
-    }
-
     stream->port.info.format.id = stream->codec_param.info.fmt_id;
     if (stream->codec_param.info.fmt_id == PJMEDIA_FORMAT_L16) {
+        /* Raw format */
+        stream->port.info.bytes_per_frame = stream->port.info.samples_per_frame *
+                                            stream->port.info.bits_per_sample / 8;
+
         stream->port.put_frame = &put_frame;
         stream->port.get_frame = &get_frame;
     } else {
+        /* Encoded format */
+        stream->port.info.bytes_per_frame = stream->codec_param.info.max_bps * 
+                                            stream->codec_param.info.frm_ptime *
+                                            stream->codec_param.setting.frm_per_pkt /
+                                            8 / 1000;
+        if ((stream->codec_param.info.max_bps * stream->codec_param.info.frm_ptime *
+            stream->codec_param.setting.frm_per_pkt) % 8000 != 0)
+        {
+            ++stream->port.info.bytes_per_frame;
+        }
         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;