diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-03-22 21:20:57 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-03-25 10:36:49 +0000 |
| commit | ab1bbcd58d2a6f5c07b516c14d9e5a8b6e0b2749 (patch) | |
| tree | 5cc3551c77b50a6d4024ae6e05114e326e6d0892 /ext/jpeg/gstjpegdec.c | |
| parent | ad5702d492d35fee3ed5f3ee39ca4ed6cf3d4485 (diff) | |
jpegdec: put GstSegment inside the element struct instead of allocating it separately
Diffstat (limited to 'ext/jpeg/gstjpegdec.c')
| -rw-r--r-- | ext/jpeg/gstjpegdec.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index 49b88a0b..e1313d58 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -161,9 +161,6 @@ gst_jpeg_dec_finalize (GObject * object) if (dec->tempbuf) gst_buffer_unref (dec->tempbuf); - if (dec->segment) - gst_segment_free (dec->segment); - G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -301,8 +298,6 @@ gst_jpeg_dec_init (GstJpegDec * dec) gst_pad_use_fixed_caps (dec->srcpad); gst_element_add_pad (GST_ELEMENT (dec), dec->srcpad); - dec->segment = gst_segment_new (); - /* setup jpeglib */ memset (&dec->cinfo, 0, sizeof (dec->cinfo)); memset (&dec->jerr, 0, sizeof (dec->jerr)); @@ -979,7 +974,7 @@ gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buf) jpeg_finish_decompress (&dec->cinfo); /* Clipping */ - if (dec->segment->format == GST_FORMAT_TIME) { + if (dec->segment.format == GST_FORMAT_TIME) { gint64 start, stop, clip_start, clip_stop; GST_LOG_OBJECT (dec, "Attempting clipping"); @@ -990,7 +985,7 @@ gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buf) else stop = start + GST_BUFFER_DURATION (outbuf); - if (gst_segment_clip (dec->segment, GST_FORMAT_TIME, + if (gst_segment_clip (&dec->segment, GST_FORMAT_TIME, start, stop, &clip_start, &clip_stop)) { GST_LOG_OBJECT (dec, "Clipping start to %" GST_TIME_FORMAT, GST_TIME_ARGS (clip_start)); @@ -1103,7 +1098,7 @@ gst_jpeg_dec_sink_event (GstPad * pad, GstEvent * event) GST_TIME_ARGS (start), GST_TIME_ARGS (stop), GST_TIME_ARGS (position)); - gst_segment_set_newsegment_full (dec->segment, update, rate, + gst_segment_set_newsegment_full (&dec->segment, update, rate, applied_rate, format, start, stop, position); break; @@ -1172,7 +1167,7 @@ gst_jpeg_dec_change_state (GstElement * element, GstStateChange transition) dec->caps_height = -1; dec->packetized = FALSE; dec->next_ts = 0; - gst_segment_init (dec->segment, GST_FORMAT_UNDEFINED); + gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED); default: break; } |