Changeset 5913

Timestamp:

Nov 22, 2018 3:33:42 AM (5 years ago)

Author:

nanang

Message:

Fix #2163:

• Frame rate calculation is now done using temporary variable, instead of using stream decoding channel state directly.
• Added condition for applying calculated frame rate: it must be greater than zero.
• Fixed frame rate comparison to use float, was using integer which might get overflow on 32 bit integer platforms.

File:

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

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

@@ -1254 +1254 @@
         {
             pj_uint32_t ts_diff;
-            pjmedia_video_format_detail *vfd;
+            pjmedia_ratio new_fps;
 
             ts_diff = frm_ts - stream->last_dec_ts;
-            vfd = pjmedia_format_get_video_format_detail(
-                                    &channel->port.info.fmt, PJ_TRUE);
-            if (stream->info.codec_info.clock_rate * vfd->fps.denum !=
-                vfd->fps.num * ts_diff)
+            
+            /* Calculate new FPS based on RTP timestamp diff */
+            if (stream->info.codec_info.clock_rate % ts_diff == 0) {
+                new_fps.num = stream->info.codec_info.clock_rate/ts_diff;
+                new_fps.denum = 1;
+            } else {
+                new_fps.num = stream->info.codec_info.clock_rate;
+                new_fps.denum = ts_diff;
+            }
+
+            /* Only apply the new FPS when it is >0, <=100, and increasing */
+            if (new_fps.num/new_fps.denum <= 100 &&
+                new_fps.num/new_fps.denum > 0 &&
+                new_fps.num*1.0/new_fps.denum >
+                stream->dec_max_fps.num*1.0/stream->dec_max_fps.denum)
             {
-                /* Frame rate changed, update decoding port info */
-                if (stream->info.codec_info.clock_rate % ts_diff == 0) {
-                    vfd->fps.num = stream->info.codec_info.clock_rate/ts_diff;
-                    vfd->fps.denum = 1;
-                } else {
-                    vfd->fps.num = stream->info.codec_info.clock_rate;
-                    vfd->fps.denum = ts_diff;
-                }
-
-                /* Update stream info */
-                stream->info.codec_param->dec_fmt.det.vid.fps = vfd->fps;
-
-                /* Update the decoding delay as FPS updated */
+                pjmedia_video_format_detail *vfd;
+                vfd = pjmedia_format_get_video_format_detail(
+                                        &channel->port.info.fmt, PJ_TRUE);
+
+                /* Update FPS in channel & stream info */
+                vfd->fps = new_fps;
+                stream->info.codec_param->dec_fmt.det.vid.fps = new_fps;
+
+                /* Update the decoding delay */
                 {
                     pjmedia_jb_state jb_state;
@@ -1290 +1297 @@
                 }
 
-                /* Publish PJMEDIA_EVENT_FMT_CHANGED event if frame rate
-                 * increased and not exceeding 100fps.
-                 */
-                if (vfd->fps.num/vfd->fps.denum <= 100 &&
-                    vfd->fps.num * stream->dec_max_fps.denum >
-                    stream->dec_max_fps.num * vfd->fps.denum)
+                /* Publish PJMEDIA_EVENT_FMT_CHANGED event */
                 {
                     pjmedia_event *event = &stream->fmt_event;
@@ -2116 +2118 @@
     if ((dir & PJMEDIA_DIR_ENCODING) && stream->enc) {
         stream->enc->paused = 0;
+        stream->force_keyframe = PJ_TRUE;
         PJ_LOG(4,(stream->enc->port.info.name.ptr, "Encoder stream resumed"));
     }
@@ -2121 +2124 @@
     if ((dir & PJMEDIA_DIR_DECODING) && stream->dec) {
         stream->dec->paused = 0;
+        stream->last_dec_seq = 0;
         PJ_LOG(4,(stream->dec->port.info.name.ptr, "Decoder stream resumed"));
     }