From 8cbe2b99124680955be1c51f2e770dfa915b099c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 2 Aug 2008 18:15:49 +0000 Subject: gst/deinterlace2/gstdeinterlace2.c: Respect the latency of the deinterlacing algorithm for the timestamps of every bu... Original commit message from CVS: * gst/deinterlace2/gstdeinterlace2.c: (gst_deinterlace2_chain): Respect the latency of the deinterlacing algorithm for the timestamps of every buffer. --- gst/deinterlace2/gstdeinterlace2.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'gst/deinterlace2/gstdeinterlace2.c') diff --git a/gst/deinterlace2/gstdeinterlace2.c b/gst/deinterlace2/gstdeinterlace2.c index 8f3525e1..26e9cd8f 100644 --- a/gst/deinterlace2/gstdeinterlace2.c +++ b/gst/deinterlace2/gstdeinterlace2.c @@ -592,9 +592,14 @@ gst_deinterlace2_chain (GstPad * pad, GstBuffer * buf) /* do magic calculus */ gst_deinterlace_method_deinterlace_frame (self->method, self); - buf = gst_deinterlace2_pop_history (self); + g_assert (self->history_count - 1 - + gst_deinterlace_method_get_latency (self->method) >= 0); + buf = + self->field_history[self->history_count - 1 - + gst_deinterlace_method_get_latency (self->method)].buf; timestamp = GST_BUFFER_TIMESTAMP (buf); - gst_buffer_unref (buf); + + gst_buffer_unref (gst_deinterlace2_pop_history (self)); GST_BUFFER_TIMESTAMP (self->out_buf) = timestamp; if (self->fields == GST_DEINTERLACE2_ALL) @@ -611,8 +616,7 @@ gst_deinterlace2_chain (GstPad * pad, GstBuffer * buf) else if (self->field_history[cur_field_idx].flags == PICTURE_INTERLACED_TOP && self->fields == GST_DEINTERLACE2_BF) { GST_DEBUG ("Removing unused top field"); - buf = gst_deinterlace2_pop_history (self); - gst_buffer_unref (buf); + gst_buffer_unref (gst_deinterlace2_pop_history (self)); } cur_field_idx = self->history_count - fields_required; @@ -635,9 +639,14 @@ gst_deinterlace2_chain (GstPad * pad, GstBuffer * buf) /* do magic calculus */ gst_deinterlace_method_deinterlace_frame (self->method, self); - buf = gst_deinterlace2_pop_history (self); + g_assert (self->history_count - 1 - + gst_deinterlace_method_get_latency (self->method) >= 0); + buf = + self->field_history[self->history_count - 1 - + gst_deinterlace_method_get_latency (self->method)].buf; timestamp = GST_BUFFER_TIMESTAMP (buf); - gst_buffer_unref (buf); + + gst_buffer_unref (gst_deinterlace2_pop_history (self)); GST_BUFFER_TIMESTAMP (self->out_buf) = timestamp; if (self->fields == GST_DEINTERLACE2_ALL) @@ -655,8 +664,7 @@ gst_deinterlace2_chain (GstPad * pad, GstBuffer * buf) else if (self->field_history[cur_field_idx].flags == PICTURE_INTERLACED_BOTTOM && self->fields == GST_DEINTERLACE2_TF) { GST_DEBUG ("Removing unused bottom field"); - buf = gst_deinterlace2_pop_history (self); - gst_buffer_unref (buf); + gst_buffer_unref (gst_deinterlace2_pop_history (self)); } } -- cgit v1.2.1