Changeset 3292

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.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/port.h (modified) (1 diff)
• pjmedia/src/pjmedia/stream.c (modified) (1 diff)
• pjsip-apps/src/samples/streamutil.c (modified) (6 diffs)

pjproject/trunk/pjmedia/include/pjmedia/port.h

@@ -219 +219 @@
     unsigned        bits_per_sample;    /**< Bits/sample                    */
     unsigned        samples_per_frame;  /**< No of samples per frame.       */
-    unsigned        bytes_per_frame;    /**< No of samples per frame.       */
+    unsigned        bytes_per_frame;    /**< No of bytes per frame.         */
 } pjmedia_port_info;
 

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;

pjproject/trunk/pjsip-apps/src/samples/streamutil.c

@@ -90 +90 @@
 
 /* Prototype */
-static void print_stream_stat(pjmedia_stream *stream);
+static void print_stream_stat(pjmedia_stream *stream, 
+                              const pjmedia_codec_param *codec_param);
 
 /* Prototype for LIBSRTP utility in file datatypes.c */
@@ -274 +275 @@
     /* Default values */
     const pjmedia_codec_info *codec_info;
+    pjmedia_codec_param codec_param;
     pjmedia_dir dir = PJMEDIA_DIR_DECODING;
     pj_sockaddr_in remote_addr;
@@ -488 +490 @@
         goto on_exit;
 
+    /* Get codec default param for info */
+    status = pjmedia_codec_mgr_get_default_param(
+                                    pjmedia_endpt_get_codec_mgr(med_endpt), 
+                                    codec_info, 
+                                    &codec_param);
+    /* Should be ok, as create_stream() above succeeded */
+    pj_assert(status == PJ_SUCCESS);
 
     /* Get the port interface of the stream */
@@ -623 +632 @@
 
         if (tmp[0] == 's')
-            print_stream_stat(stream);
+            print_stream_stat(stream, &codec_param);
         else if (tmp[0] == 'q')
             break;
@@ -724 +733 @@
  * Print stream statistics
  */
-static void print_stream_stat(pjmedia_stream *stream)
+static void print_stream_stat(pjmedia_stream *stream,
+                              const pjmedia_codec_param *codec_param)
 {
     char duration[80], last_update[80];
@@ -753 +763 @@
         port->info.clock_rate,
         port->info.samples_per_frame * 1000 / port->info.clock_rate,
-        good_number(bps, port->info.bytes_per_frame * port->info.clock_rate /
-                    port->info.samples_per_frame),
-        good_number(ipbps, (port->info.bytes_per_frame+32) * 
-                            port->info.clock_rate / port->info.clock_rate));
+        good_number(bps, (codec_param->info.avg_bps+7)/8),
+        good_number(ipbps, ((codec_param->info.avg_bps+7)/8) + 
+                           (40 * 1000 /
+                            codec_param->setting.frm_per_pkt /
+                            codec_param->info.frm_ptime)));
 
     if (stat.rx.update_cnt == 0)