Changeset 2917 for rat/trunk/source.c

Timestamp:

11/11/99 09:55:49 (14 years ago)

Author:

ucacoxh

Message:

- Errata

1. Do not adjust avg_transit when doing buffer skew adaptation
shifts. The difference between transit and avg_transit is used as
test for adaptation. If both adjust in skew adaptation it looks like
adaptation still necessary immediately after adaptation.

2. Forget using avg_transit when close to transit for new talkspurt.
Was just an experiment that backfired.

Files:

• rat/trunk/source.c (modified) (4 diffs)

rat/trunk/source.c

@@ -649 +649 @@
                 }
 
-                if (adjust_playout && src->packets_done && 
-                    ts_gt(ts_mul(src->pdbe->jitter, 3), ts_abs_diff(transit, src->pdbe->avg_transit))) {
-                        /* Use avg transit as it's close */
-                        transit = src->pdbe->avg_transit;
-                        debug_msg("transit %d  transit_avg %d\n", transit.ticks, src->pdbe->avg_transit.ticks);
-                }
-
                 playout = playout_calc(sp, e->ssrc, transit, adjust_playout);
                 playout = ts_add(e->transit, playout);
@@ -848 +841 @@
         }
 
+        return FALSE;
+
         actual  = source_get_audio_buffered(src);
         desired = source_get_playout_delay(src);
@@ -923 +918 @@
                 pb_shift_forward(src->media,   adjustment);
                 pb_shift_forward(src->channel, adjustment);
-                src->pdbe->transit      = ts_sub(src->pdbe->transit,      adjustment);
-                src->pdbe->last_transit = ts_sub(src->pdbe->last_transit, adjustment);
-                src->pdbe->avg_transit  = ts_sub(src->pdbe->avg_transit,  adjustment);
+
+                src->pdbe->transit      = ts_sub(src->pdbe->transit, adjustment);
+                /* avg_transit and last_transit are fine.  Difference in     */
+                /* avg_transit and transit triggered this adjustment.        */
 
                 if (ts_valid(src->last_repair)) {
@@ -952 +948 @@
                 pb_shift_units_back_after(src->media,   playout, adjustment);
                 pb_shift_units_back_after(src->channel, playout, adjustment);
-                src->pdbe->transit      = ts_add(src->pdbe->transit,      adjustment);
-                src->pdbe->last_transit = ts_add(src->pdbe->last_transit, adjustment);
-                src->pdbe->avg_transit  = ts_add(src->pdbe->avg_transit,  adjustment);
+                src->pdbe->transit = ts_add(src->pdbe->transit, adjustment);
 
                 if (ts_gt(adjustment, src->skew_adjust)) {