Changeset 3047

Timestamp:

01/06/00 16:19:54 (13 years ago)

Author:

ucaccsp

Message:

Remove support for the video tool to send us its playout delay - we now
assume that it follows us always, if synchronization is desired.

Location:

rat/trunk

Files:

• mbus_engine.c (modified) (2 diffs)
• pdb.h (modified) (1 diff)
• rtp_callback.c (modified) (2 diffs)
• ui.c (modified) (1 diff)
• ui.h (modified) (1 diff)

rat/trunk/mbus_engine.c

@@ -787 +787 @@
         } else {
                 debug_msg("mbus: usage \"rtp_source_gain <ssrc> <bool>\"\n");
-        }
-        mbus_parse_done(sp->mbus_engine);
-}
-
-static void rx_rtp_source_playout(char *srce, char *args, session_t *sp)
-{
-        pdb_entry_t     *pdbe;
-        char            *ssrc;
-        int              playout;
-
-        UNUSED(srce);
-
-        mbus_parse_init(sp->mbus_engine, args);
-        if (mbus_parse_str(sp->mbus_engine, &ssrc) && mbus_parse_int(sp->mbus_engine, &playout)) {
-                ssrc = mbus_decode_str(ssrc);
-                if (pdb_item_get(sp->pdb, strtoul(ssrc, 0, 16), &pdbe)) {
-                        pdbe->video_playout_received = TRUE;
-                        pdbe->video_playout          = playout;
-                } else {
-                        debug_msg("Unknown source 0x%08lx\n", ssrc);
-                }
-        } else {
-                debug_msg("mbus: usage \"rtp_source_playout <ssrc> <playout>\"\n");
         }
         mbus_parse_done(sp->mbus_engine);
@@ -1261 +1238 @@
         { "rtp.source.mute",                       rx_rtp_source_mute },
         { "rtp.source.gain",                       rx_rtp_source_gain },
-        { "rtp.source.playout",                    rx_rtp_source_playout },
         { "mbus.quit",                             rx_mbus_quit },
         { "mbus.bye",                              rx_mbus_bye },

rat/trunk/pdb.h

@@ -66 +66 @@
         uint32_t        jit_toged;                   /* Packets discarded because late ("Thrown on ground") */
 
-        /* Variables for playout time calculation */
-        int             video_playout;               /* Playout delay in the video tool -- for lip-sync [csp] */
-        u_char          video_playout_received:1;    /* video playout is relevent */
-        int             sync_playout_delay;          /* same interpretation as delay, used when sync is on [dm] */
-
         /* Mapping between rtp time and NTP time for this sender */
         int             mapping_valid;

rat/trunk/rtp_callback.c

@@ -163 +163 @@
 
 static void
+process_sr(session_t *sp, uint32_t ssrc, rtcp_sr *s)
+{
+        UNUSED(sp);
+        UNUSED(ssrc);
+        UNUSED(s);
+}
+
+static void
 process_rr(session_t *sp, uint32_t ssrc, rtcp_rr *r)
 {
@@ -273 +281 @@
                 break;
         case RX_SR:
+                process_sr(sp, e->ssrc, (rtcp_sr*)e->data);
                 break;
         case RX_RR:

rat/trunk/ui.c

@@ -792 +792 @@
 
 
-void 
-ui_update_video_playout(session_t *sp, uint32_t ssrc, int playout)
-{
-        const char *cname = rtp_get_sdes(sp->rtp_session[0], ssrc, RTCP_SDES_CNAME);
-        char *arg = mbus_encode_str(cname);
-        mbus_qmsgf(sp->mbus_engine, sp->mbus_video_addr, FALSE, "rtp.source.cname",   "\"%08lx\" %s",   ssrc, arg);
-        mbus_qmsgf(sp->mbus_engine, sp->mbus_video_addr, FALSE, "rtp.source.playout", "\"%08lx\" %12d", ssrc, playout);
-        xfree(arg);
-}
-
 void
 ui_update_key(session_t *sp, char *key)

rat/trunk/ui.h

@@ -53 +53 @@
                               uint32_t misordered, uint32_t duplicates, uint32_t jitter, int jit_tog);
 void ui_update_duration      (struct s_session *s, uint32_t ssrc, int duration);
-void ui_update_video_playout (struct s_session *s, uint32_t ssrc, int playout);
 void ui_update_sync          (struct s_session *s, int sync);
 void ui_update_key           (struct s_session *s, char *key);