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

Timestamp:

Jun 6, 2008 12:15:23 PM (16 years ago)

Author:

nanang

Message:

Added field maximum bitrate to codec param, this is useful for providing safer frame size calculation, especially when peer's bitrate is unknown

File:

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

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

@@ -1264 +1264 @@
 
     channel->out_pkt_size = sizeof(pjmedia_rtp_hdr) + 
-                            stream->codec_param.info.avg_bps/8 * 
+                            stream->codec_param.info.max_bps * 
                             PJMEDIA_MAX_FRAME_DURATION_MS / 
-                            1000;
+                            8 / 1000;
 
     if (channel->out_pkt_size > PJMEDIA_MAX_MTU)
@@ -1374 +1374 @@
     }
 
+    /* Check for invalid max_bps. */
+    if (stream->codec_param.info.max_bps < stream->codec_param.info.avg_bps)
+        stream->codec_param.info.max_bps = stream->codec_param.info.avg_bps;
+
     /* Check for invalid frame per packet. */
     if (stream->codec_param.setting.frm_per_pkt < 1)
@@ -1385 +1389 @@
                                           stream->codec_param.setting.frm_per_pkt /
                                           1000;
-    stream->port.info.bytes_per_frame = stream->codec_param.info.avg_bps/8 * 
+    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 /
-                                        1000;
+                                        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;
+    }
 
     /* Open the codec: */
@@ -1442 +1451 @@
     }
 
-    /* Get the frame size: */
-
-    stream->frame_size = ((stream->codec_param.info.avg_bps + 7) / 8) * 
-                          stream->codec_param.info.frm_ptime / 1000;
-
+    /* Get the frame size */
+    stream->frame_size = stream->codec_param.info.max_bps * 
+                         stream->codec_param.info.frm_ptime / 8 / 1000;
+    if ((stream->codec_param.info.max_bps * stream->codec_param.info.frm_ptime) 
+        % 8000 != 0)
+    {
+        ++stream->frame_size;
+    }
 
 #if defined(PJMEDIA_HANDLE_G722_MPEG_BUG) && (PJMEDIA_HANDLE_G722_MPEG_BUG!=0)