From 71e46b2478f6eda5e00d8ec563ab5709e09a792f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 14 Nov 2012 00:03:15 +0000 Subject: [PATCH] gst_adapter_prev_timestamp -> gst_adapter_prev_pts https://bugzilla.gnome.org/show_bug.cgi?id=675598 --- ext/libvisual/gstaudiovisualizer.c | 2 +- gst-libs/gst/audio/gstaudiodecoder.c | 2 +- gst-libs/gst/audio/gstaudioencoder.c | 2 +- gst-libs/gst/rtp/gstrtpbaseaudiopayload.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/libvisual/gstaudiovisualizer.c b/ext/libvisual/gstaudiovisualizer.c index f7215ddafb..a7bd4c77d5 100644 --- a/ext/libvisual/gstaudiovisualizer.c +++ b/ext/libvisual/gstaudiovisualizer.c @@ -907,7 +907,7 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent, GstVideoFrame outframe; /* get timestamp of the current adapter content */ - ts = gst_adapter_prev_timestamp (scope->adapter, &dist); + ts = gst_adapter_prev_pts (scope->adapter, &dist); if (GST_CLOCK_TIME_IS_VALID (ts)) { /* convert bytes to time */ dist /= bps; diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c index 9085becfea..af888dffe8 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.c +++ b/gst-libs/gst/audio/gstaudiodecoder.c @@ -1229,7 +1229,7 @@ gst_audio_decoder_push_buffers (GstAudioDecoder * dec, gboolean force) len = av; } /* track upstream ts, but do not get stuck if nothing new upstream */ - ts = gst_adapter_prev_timestamp (priv->adapter, &distance); + ts = gst_adapter_prev_pts (priv->adapter, &distance); if (ts != priv->prev_ts || distance <= priv->prev_distance) { priv->prev_ts = ts; priv->prev_distance = distance; diff --git a/gst-libs/gst/audio/gstaudioencoder.c b/gst-libs/gst/audio/gstaudioencoder.c index 9ee74a81ab..89cc710ba3 100644 --- a/gst-libs/gst/audio/gstaudioencoder.c +++ b/gst-libs/gst/audio/gstaudioencoder.c @@ -674,7 +674,7 @@ gst_audio_encoder_finish_frame (GstAudioEncoder * enc, GstBuffer * buf, if (!enc->priv->perfect_ts) { guint64 ts, distance; - ts = gst_adapter_prev_timestamp (priv->adapter, &distance); + ts = gst_adapter_prev_pts (priv->adapter, &distance); g_assert (distance % ctx->info.bpf == 0); distance /= ctx->info.bpf; GST_LOG_OBJECT (enc, "%" G_GUINT64_FORMAT " samples past prev_ts %" diff --git a/gst-libs/gst/rtp/gstrtpbaseaudiopayload.c b/gst-libs/gst/rtp/gstrtpbaseaudiopayload.c index ef027429a5..603fe5b07d 100644 --- a/gst-libs/gst/rtp/gstrtpbaseaudiopayload.c +++ b/gst-libs/gst/rtp/gstrtpbaseaudiopayload.c @@ -583,7 +583,7 @@ gst_rtp_base_audio_payload_flush (GstRTPBaseAudioPayload * baseaudiopayload, if (timestamp == -1) { /* calculate the timestamp */ - timestamp = gst_adapter_prev_timestamp (adapter, &distance); + timestamp = gst_adapter_prev_pts (adapter, &distance); GST_LOG_OBJECT (baseaudiopayload, "last timestamp %" GST_TIME_FORMAT ", distance %" G_GUINT64_FORMAT,