Changeset 3975 for pjproject/trunk

Timestamp:

Mar 14, 2012 12:36:42 PM (13 years ago)

Author:

nanang

Message:

Misc (re #1446): Re-enable remote video frame-rate detection in vid_stream.c. Note that currently such remote frame-rate update will not trigger format changed event.

File:

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

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

@@ -1012 +1012 @@
 
     /* Learn remote frame rate after successful decoding */
-    if (0 && frame->type == PJMEDIA_FRAME_TYPE_VIDEO && frame->size)
+    if (frame->type == PJMEDIA_FRAME_TYPE_VIDEO && frame->size)
     {
         /* Only check remote frame rate when timestamp is not wrapping and
@@ -1026 +1026 @@
             vfd = pjmedia_format_get_video_format_detail(
                                     &channel->port.info.fmt, PJ_TRUE);
-            if ((int)(stream->info.codec_info.clock_rate / ts_diff) !=
-                vfd->fps.num / vfd->fps.denum)
+            if (stream->info.codec_info.clock_rate * vfd->fps.denum !=
+                vfd->fps.num * ts_diff)
             {
                 /* Frame rate changed, update decoding port info */
-                vfd->fps.num = stream->info.codec_info.clock_rate;
-                vfd->fps.denum = ts_diff;
+                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;
 
-                PJ_LOG(5, (channel->port.info.name.ptr,
-                           "Frame rate changed to %d/%d(~%d)fps",
+                PJ_LOG(6, (channel->port.info.name.ptr,
+                          "Frame rate update: %d/%d(~%.2f)fps",
                            vfd->fps.num, vfd->fps.denum,
-                           vfd->fps.num / vfd->fps.denum));
+                           vfd->fps.num*1.0 / vfd->fps.denum));
 
                 /* Publish PJMEDIA_EVENT_FMT_CHANGED event */
-                {
+                if (0) {
                     pjmedia_event event;