Changeset 1667

Timestamp:

Jan 7, 2008 6:33:25 PM (16 years ago)

Author:

bennylp

Message:

Ticket #439: don't call encode() if input is FRAME_TYPE_NONE

File:

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

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

@@ -141 +141 @@
                                    'A', 'B', 'C', 'D'};
 
-/* Zero PCM frame */
-#define ZERO_PCM_MAX_SIZE   1920    /* 40ms worth of PCM @ 48KHz */
-static pj_int16_t zero_frame[ZERO_PCM_MAX_SIZE];
-
-
 /*
  * Print error.
@@ -574 +569 @@
         }
 
-    } else if (frame->type != PJMEDIA_FRAME_TYPE_NONE) {
+        /* No need to encode if this is a zero frame.
+         * See http://www.pjsip.org/trac/ticket/439 
+         */
+    } else if (frame->type != PJMEDIA_FRAME_TYPE_NONE &&
+               frame->buf != NULL) 
+    {
         unsigned ts, codec_samples_per_frame;
 
@@ -730 +730 @@
      *  silence frame.
      */
-    if (frame->type == PJMEDIA_FRAME_TYPE_NONE &&
-        samples_per_frame <= ZERO_PCM_MAX_SIZE) 
-    {
+    if (frame->type == PJMEDIA_FRAME_TYPE_NONE) {
         pj_memcpy(&tmp_zero_frame, frame, sizeof(pjmedia_frame));
         frame = &tmp_zero_frame;
 
-        tmp_zero_frame.buf = zero_frame;
+        tmp_zero_frame.buf = NULL;
         tmp_zero_frame.size = samples_per_frame * 2;
         tmp_zero_frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
@@ -756 +754 @@
         frame = &tmp_in_frame;
 
-        tmp_in_frame.buf = zero_frame;
+        tmp_in_frame.buf = NULL;
         tmp_in_frame.size = samples_per_frame * 2;
         tmp_in_frame.type = PJMEDIA_FRAME_TYPE_AUDIO;