Changeset 3514

Timestamp:

Apr 10, 2011 11:51:30 PM (14 years ago)

Author:

bennylp

Message:

Re #1182: fixed misc error with RTCP XR

Location:

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples

Files:

• streamutil.c (modified) (2 diffs)
• vid_streamutil.c (modified) (1 diff)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/streamutil.c

@@ -898 +898 @@
 
             SAMPLES_TO_USEC(jmin, xr_stat.rx.stat_sum.jitter.min, 
-                            port->info.clock_rate);
+                            port->info.fmt.det.aud.clock_rate);
             SAMPLES_TO_USEC(jmax, xr_stat.rx.stat_sum.jitter.max, 
-                            port->info.clock_rate);
+                            port->info.fmt.det.aud.clock_rate);
             SAMPLES_TO_USEC(jmean, xr_stat.rx.stat_sum.jitter.mean, 
-                            port->info.clock_rate);
+                            port->info.fmt.det.aud.clock_rate);
             SAMPLES_TO_USEC(jdev, 
                            pj_math_stat_get_stddev(&xr_stat.rx.stat_sum.jitter),
-                           port->info.clock_rate);
+                           port->info.fmt.det.aud.clock_rate);
             sprintf(jitter, "%7.3f %7.3f %7.3f %7.3f", 
                     jmin/1000.0, jmean/1000.0, jmax/1000.0, jdev/1000.0);
@@ -961 +961 @@
 
             SAMPLES_TO_USEC(jmin, xr_stat.tx.stat_sum.jitter.min, 
-                            port->info.clock_rate);
+                            port->info.fmt.det.aud.clock_rate);
             SAMPLES_TO_USEC(jmax, xr_stat.tx.stat_sum.jitter.max, 
-                            port->info.clock_rate);
+                            port->info.fmt.det.aud.clock_rate);
             SAMPLES_TO_USEC(jmean, xr_stat.tx.stat_sum.jitter.mean, 
-                            port->info.clock_rate);
+                            port->info.fmt.det.aud.clock_rate);
             SAMPLES_TO_USEC(jdev, 
                            pj_math_stat_get_stddev(&xr_stat.tx.stat_sum.jitter),
-                           port->info.clock_rate);
+                           port->info.fmt.det.aud.clock_rate);
             sprintf(jitter, "%7.3f %7.3f %7.3f %7.3f", 
                     jmin/1000.0, jmean/1000.0, jmax/1000.0, jdev/1000.0);

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/vid_streamutil.c

@@ -203 +203 @@
         info.codec_param = codec_param;
     
-#if PJMEDIA_HAS_RTCP_XR && PJMEDIA_STREAM_ENABLE_XR
-    /* Set default RTCP XR enabled/disabled */
-    info.rtcp_xr_enabled = PJ_TRUE;
-#endif
-
     /* Copy remote address */
     pj_memcpy(&info.rem_addr, rem_addr, sizeof(pj_sockaddr_in));