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

Timestamp:

Oct 5, 2012 10:04:54 AM (12 years ago)

Author:

ming

Message:

Re #1586: Add support for SILK multiple frames per packet

File:

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

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

@@ -2178 +2178 @@
 
     /* 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 (stream->codec_param.info.max_rx_frame_size > 0) {
+        stream->frame_size = stream->codec_param.info.max_rx_frame_size;
+    } else {
+        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;
+        }
     }