mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpbin: rename some variables for less confusion

Browse source
This commit is contained in:
Wim Taymans 2010-08-27 11:07:34 +02:00
parent 0f59664c6a
commit e3479630ae
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/rtpmanager/gstrtpbin.c
View file

@ -893,7 +893,7 @@ free_client (GstRtpBinClient * client, GstRtpBin * bin)
static void static void
gst_rtp_bin_associate (GstRtpBin * bin, GstRtpBinStream * stream, guint8 len, gst_rtp_bin_associate (GstRtpBin * bin, GstRtpBinStream * stream, guint8 len,
guint8 * data, guint64 last_unix, guint64 last_extrtptime, guint8 * data, guint64 last_unix, guint64 last_extrtptime,
guint64 clock_base, guint64 clock_base_time, guint clock_rate) guint64 base_rtptime, guint64 base_time, guint clock_rate)
{ {
GstRtpBinClient *client; GstRtpBinClient *client;
gboolean created; gboolean created;
@ -927,18 +927,18 @@ gst_rtp_bin_associate (GstRtpBin * bin, GstRtpBinStream * stream, guint8 len,
/* take the extended rtptime we found in the SR packet and map it to the /* take the extended rtptime we found in the SR packet and map it to the
* local rtptime. The local rtp time is used to construct timestamps on the * local rtptime. The local rtp time is used to construct timestamps on the
* buffers. */ * buffers. */
local_rtp = last_extrtptime - clock_base; local_rtp = last_extrtptime - base_rtptime;
GST_DEBUG_OBJECT (bin, GST_DEBUG_OBJECT (bin,
"base %" G_GUINT64_FORMAT ", extrtptime %" G_GUINT64_FORMAT "base %" G_GUINT64_FORMAT ", extrtptime %" G_GUINT64_FORMAT
", local RTP %" G_GUINT64_FORMAT ", clock-rate %d", clock_base, ", local RTP %" G_GUINT64_FORMAT ", clock-rate %d", base_rtptime,
last_extrtptime, local_rtp, clock_rate); last_extrtptime, local_rtp, clock_rate);
/* calculate local NTP time in gstreamer timestamp, we essentially perform the /* calculate local NTP time in gstreamer timestamp, we essentially perform the
* same conversion that a jitterbuffer would use to convert an rtp timestamp * same conversion that a jitterbuffer would use to convert an rtp timestamp
* into a corresponding gstreamer timestamp. */ * into a corresponding gstreamer timestamp. */
local_unix = gst_util_uint64_scale_int (local_rtp, GST_SECOND, clock_rate); local_unix = gst_util_uint64_scale_int (local_rtp, GST_SECOND, clock_rate);
local_unix += clock_base_time; local_unix += base_time;
/* calculate delta between server and receiver. last_unix is created by /* calculate delta between server and receiver. last_unix is created by
* converting the ntptime in the last SR packet to a gstreamer timestamp. This * converting the ntptime in the last SR packet to a gstreamer timestamp. This
@ -1044,8 +1044,8 @@ gst_rtp_bin_handle_sync (GstElement * jitterbuffer, GstStructure * s,
guint64 ntptime; guint64 ntptime;
gboolean have_sr, have_sdes; gboolean have_sr, have_sdes;
gboolean more; gboolean more;
guint64 clock_base; guint64 base_rtptime;
guint64 clock_base_time; guint64 base_time;
guint clock_rate; guint clock_rate;
guint64 extrtptime; guint64 extrtptime;
GstBuffer *buffer; GstBuffer *buffer;
@ -1058,9 +1058,9 @@ gst_rtp_bin_handle_sync (GstElement * jitterbuffer, GstStructure * s,
* timestamps. We get this info directly from the jitterbuffer which * timestamps. We get this info directly from the jitterbuffer which
* constructs gstreamer timestamps from rtp timestamps and so it know exactly * constructs gstreamer timestamps from rtp timestamps and so it know exactly
* what the current situation is. */ * what the current situation is. */
clock_base = g_value_get_uint64 (gst_structure_get_value (s, "base-rtptime")); base_rtptime =
clock_base_time = g_value_get_uint64 (gst_structure_get_value (s, "base-rtptime"));
g_value_get_uint64 (gst_structure_get_value (s, "base-time")); base_time = g_value_get_uint64 (gst_structure_get_value (s, "base-time"));
clock_rate = g_value_get_uint (gst_structure_get_value (s, "clock-rate")); clock_rate = g_value_get_uint (gst_structure_get_value (s, "clock-rate"));
extrtptime = extrtptime =
g_value_get_uint64 (gst_structure_get_value (s, "sr-ext-rtptime")); g_value_get_uint64 (gst_structure_get_value (s, "sr-ext-rtptime"));
@ -1115,7 +1115,7 @@ gst_rtp_bin_handle_sync (GstElement * jitterbuffer, GstStructure * s,
/* associate the stream to CNAME */ /* associate the stream to CNAME */
gst_rtp_bin_associate (bin, stream, len, data, gst_rtp_bin_associate (bin, stream, len, data,
gst_rtcp_ntp_to_unix (ntptime), extrtptime, gst_rtcp_ntp_to_unix (ntptime), extrtptime,
clock_base, clock_base_time, clock_rate); base_rtptime, base_time, clock_rate);
GST_RTP_BIN_UNLOCK (bin); GST_RTP_BIN_UNLOCK (bin);
} }
} }