Changeset 4115

Timestamp:

Apr 30, 2012 2:34:40 AM (12 years ago)

Author:

nanang

Message:

Fix #1501: Added max incoming framerate state in video stream to check for increasing framerate (before triggering PJMEDIA_EVENT_FMT_CHANGED event).

File:

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

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -126 +126 @@
 
     unsigned                 dec_max_size;  /**< Size of decoded/raw picture*/
+    pjmedia_ratio            dec_max_fps;   /**< Max fps of decoding dir.   */
     pjmedia_frame            dec_frame;     /**< Current decoded frame.     */
     pjmedia_event            fmt_event;     /**< Buffered fmt_changed event
@@ -1081 +1082 @@
                 vfd->fps.num * ts_diff)
             {
-                pjmedia_ratio old_fps;
-
-                old_fps = vfd->fps;
-
                 /* Frame rate changed, update decoding port info */
                 if (stream->info.codec_info.clock_rate % ts_diff == 0) {
@@ -1100 +1097 @@
                  * increased and not exceeding 100fps.
                  */
-                if (vfd->fps.num/vfd->fps.denum < 100 &&
-                    vfd->fps.num*old_fps.denum > old_fps.num*vfd->fps.denum)
+                if (vfd->fps.num/vfd->fps.denum <= 100 &&
+                    vfd->fps.num * stream->dec_max_fps.denum >
+                    stream->dec_max_fps.num * vfd->fps.denum)
                 {
                     pjmedia_event *event = &stream->fmt_event;
+
+                    /* Update max fps of decoding dir */
+                    stream->dec_max_fps = vfd->fps;
 
                     /* Use the buffered format changed event:
@@ -1496 +1497 @@
      */
     vfd_dec->fps.num = vfd_dec->fps.num * 3 / 2;
+    stream->dec_max_fps = vfd_dec->fps;
 
     /* Create decoder channel */