mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-30 07:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseparse: cleanup struct and remove unused member

Browse source
This commit is contained in:
Mark Nauwelaerts 2010-09-16 11:51:20 +02:00 committed by Tim-Philipp Müller
parent 03164ad8ab
commit e274ebb292
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/audioparsers/gstbaseparse.c
View file

@ -802,7 +802,6 @@ gst_base_parse_convert (GstBaseParse * parse,
if (dest_format == GST_FORMAT_TIME) { if (dest_format == GST_FORMAT_TIME) {
/* BYTES -> TIME conversion */ /* BYTES -> TIME conversion */
GST_DEBUG_OBJECT (parse, "converting bytes -> time"); GST_DEBUG_OBJECT (parse, "converting bytes -> time");
*dest_value = gst_util_uint64_scale (src_value, duration, bytes); *dest_value = gst_util_uint64_scale (src_value, duration, bytes);
*dest_value *= GST_MSECOND; *dest_value *= GST_MSECOND;
GST_DEBUG_OBJECT (parse, "conversion result: %" G_GINT64_FORMAT " ms", GST_DEBUG_OBJECT (parse, "conversion result: %" G_GINT64_FORMAT " ms",
@ -810,8 +809,8 @@ gst_base_parse_convert (GstBaseParse * parse,
ret = TRUE; ret = TRUE;
} }
} else if (src_format == GST_FORMAT_TIME) { } else if (src_format == GST_FORMAT_TIME) {
GST_DEBUG_OBJECT (parse, "converting time -> bytes");
if (dest_format == GST_FORMAT_BYTES) { if (dest_format == GST_FORMAT_BYTES) {
GST_DEBUG_OBJECT (parse, "converting time -> bytes");
*dest_value = gst_util_uint64_scale (src_value / GST_MSECOND, bytes, *dest_value = gst_util_uint64_scale (src_value / GST_MSECOND, bytes,
duration); duration);
GST_DEBUG_OBJECT (parse, GST_DEBUG_OBJECT (parse,
@ -2267,6 +2266,5 @@ gst_base_parse_sink_setcaps (GstPad * pad, GstCaps * caps)
if (klass->set_sink_caps) if (klass->set_sink_caps)
res = klass->set_sink_caps (parse, caps); res = klass->set_sink_caps (parse, caps);
parse->negotiated = res;
return res && gst_pad_set_caps (pad, caps); return res && gst_pad_set_caps (pad, caps);
} }

15
gst/audioparsers/gstbaseparse.h
View file

@ -120,16 +120,16 @@ typedef struct _GstBaseParsePrivate GstBaseParsePrivate;
* The opaque #GstBaseParse data structure. * The opaque #GstBaseParse data structure.
*/ */
struct _GstBaseParse { struct _GstBaseParse {
GstElement element; GstElement element;
GstAdapter *adapter; GstAdapter *adapter;
/*< protected >*/ /*< protected >*/
/* source and sink pads */ /* source and sink pads */
GstPad *sinkpad; GstPad *sinkpad;
GstPad *srcpad; GstPad *srcpad;
/* MT-protected (with STREAM_LOCK) */ /* MT-protected (with STREAM_LOCK) */
GstSegment segment; GstSegment segment;
/* Newsegment event to be sent after SEEK */ /* Newsegment event to be sent after SEEK */
GstEvent *pending_segment; GstEvent *pending_segment;
@ -137,10 +137,7 @@ struct _GstBaseParse {
/* Segment event that closes the running segment prior to SEEK */ /* Segment event that closes the running segment prior to SEEK */
GstEvent *close_segment; GstEvent *close_segment;
/* Caps nego done already? */ GMutex *parse_lock;
gboolean negotiated;
GMutex *parse_lock;
/*< private >*/ /*< private >*/
gpointer _gst_reserved[GST_PADDING_LARGE]; gpointer _gst_reserved[GST_PADDING_LARGE];