mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

codectimestamper: Remove duplicated GstSegment struct

Browse source 
Use the one in priv struct. And use gst_segment_is_equal()
to compare GstSegment

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3380>
This commit is contained in:
Seungha Yang 2022-11-16 03:15:44 +09:00 committed by GStreamer Marge Bot
parent 6265fc8424
commit 721f059397
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
subprojects/gst-plugins-bad/gst/codectimestamper/gstcodectimestamper.c
View file

@ -189,6 +189,7 @@ gst_codec_timestamper_init (GstCodecTimestamper * self,
g_array_sized_new (FALSE, FALSE, sizeof (GstClockTime), 16); g_array_sized_new (FALSE, FALSE, sizeof (GstClockTime), 16);
g_rec_mutex_init (&priv->lock); g_rec_mutex_init (&priv->lock);
gst_segment_init (&priv->in_segment, GST_FORMAT_TIME);
} }
static void static void
@ -338,10 +339,10 @@ gst_codec_timestamper_sink_event (GstPad * pad, GstObject * parent,
} }
/* Drain on segment update */ /* Drain on segment update */
if (memcmp (&self->in_segment, &segment, sizeof (GstSegment))) if (!gst_segment_is_equal (&priv->in_segment, &segment))
gst_codec_timestamper_drain (self); gst_codec_timestamper_drain (self);
self->in_segment = segment; priv->in_segment = segment;
break; break;
} }
case GST_EVENT_EOS: case GST_EVENT_EOS:
@ -517,9 +518,9 @@ gst_codec_timestamper_chain (GstPad * pad, GstObject * parent,
GstClockTime start_time = GST_CLOCK_TIME_NONE; GstClockTime start_time = GST_CLOCK_TIME_NONE;
if (GST_CLOCK_TIME_IS_VALID (pts)) if (GST_CLOCK_TIME_IS_VALID (pts))
start_time = MAX (pts, self->in_segment.start); start_time = MAX (pts, priv->in_segment.start);
else if (GST_CLOCK_TIME_IS_VALID (dts)) else if (GST_CLOCK_TIME_IS_VALID (dts))
start_time = MAX (dts, self->in_segment.start); start_time = MAX (dts, priv->in_segment.start);
else else
start_time = priv->in_segment.start; start_time = priv->in_segment.start;

2
subprojects/gst-plugins-bad/gst/codectimestamper/gstcodectimestamper.h
View file

@ -40,8 +40,6 @@ struct _GstCodecTimestamper
GstPad *sinkpad; GstPad *sinkpad;
GstPad *srcpad; GstPad *srcpad;
GstSegment in_segment;
GstCodecTimestamperPrivate *priv; GstCodecTimestamperPrivate *priv;
}; };