From d5216a1a66e54a681b7d9a95984eb04608d58bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Stadler?= Date: Tue, 7 Apr 2009 04:53:02 +0300 Subject: baseparse: Fix slightly broken buffer-in-segment check (aacparse, amrparse, flacparse) --- gst/aacparse/gstbaseparse.c | 2 +- gst/amrparse/gstbaseparse.c | 2 +- gst/flacparse/gstbaseparse.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gst/aacparse/gstbaseparse.c b/gst/aacparse/gstbaseparse.c index ee94ccd2..3c322709 100644 --- a/gst/aacparse/gstbaseparse.c +++ b/gst/aacparse/gstbaseparse.c @@ -796,7 +796,7 @@ gst_base_parse_handle_and_push_buffer (GstBaseParse * parse, } else if (GST_BUFFER_TIMESTAMP_IS_VALID (buffer) && GST_BUFFER_DURATION_IS_VALID (buffer) && GST_CLOCK_TIME_IS_VALID (parse->segment.start) && - GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION_IS_VALID (buffer) + GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) < parse->segment.start) { /* FIXME: subclass needs way to override the start as downstream might * need frames before for proper decoding */ diff --git a/gst/amrparse/gstbaseparse.c b/gst/amrparse/gstbaseparse.c index 7de3c93f..00e2d7f8 100644 --- a/gst/amrparse/gstbaseparse.c +++ b/gst/amrparse/gstbaseparse.c @@ -796,7 +796,7 @@ gst_base_parse_handle_and_push_buffer (GstBaseParse * parse, } else if (GST_BUFFER_TIMESTAMP_IS_VALID (buffer) && GST_BUFFER_DURATION_IS_VALID (buffer) && GST_CLOCK_TIME_IS_VALID (parse->segment.start) && - GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION_IS_VALID (buffer) + GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) < parse->segment.start) { /* FIXME: subclass needs way to override the start as downstream might * need frames before for proper decoding */ diff --git a/gst/flacparse/gstbaseparse.c b/gst/flacparse/gstbaseparse.c index ea06474e..23cd8a9a 100644 --- a/gst/flacparse/gstbaseparse.c +++ b/gst/flacparse/gstbaseparse.c @@ -1763,7 +1763,7 @@ gst_base_parse_frame_in_segment (GstBaseParse * parse, GstBuffer * buffer, } else if (GST_BUFFER_TIMESTAMP_IS_VALID (buffer) && GST_BUFFER_DURATION_IS_VALID (buffer) && GST_CLOCK_TIME_IS_VALID (segment->start) && - GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION_IS_VALID (buffer) + GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) < segment->start) { return FALSE; } -- cgit v1.2.1