From b4a05af66feb72254328cb104107c69f1945590b Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Thu, 19 Nov 2015 00:51:30 -0300 Subject: [PATCH] Revert "baseparse: simplify code a bit" This reverts commit 921816400bf3ad65f8978a50569a7d87ef05c806. --- libs/gst/base/gstbaseparse.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c index f83c86d835..f8f4380010 100644 --- a/libs/gst/base/gstbaseparse.c +++ b/libs/gst/base/gstbaseparse.c @@ -980,21 +980,19 @@ static GstFlowReturn gst_base_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame) { GstBuffer *buffer = frame->buffer; + gboolean is_header = GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_HEADER); - /* Avoid updating timestamps of header buffers */ - if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_HEADER)) { - if (!GST_BUFFER_PTS_IS_VALID (buffer) && - GST_CLOCK_TIME_IS_VALID (parse->priv->next_pts)) { - GST_BUFFER_PTS (buffer) = parse->priv->next_pts; - } - if (!GST_BUFFER_DTS_IS_VALID (buffer) && - GST_CLOCK_TIME_IS_VALID (parse->priv->next_dts)) { - GST_BUFFER_DTS (buffer) = parse->priv->next_dts; - } - if (!GST_BUFFER_DURATION_IS_VALID (buffer) && - GST_CLOCK_TIME_IS_VALID (parse->priv->frame_duration)) { - GST_BUFFER_DURATION (buffer) = parse->priv->frame_duration; - } + if (!GST_BUFFER_PTS_IS_VALID (buffer) && !is_header && + GST_CLOCK_TIME_IS_VALID (parse->priv->next_pts)) { + GST_BUFFER_PTS (buffer) = parse->priv->next_pts; + } + if (!GST_BUFFER_DTS_IS_VALID (buffer) && !is_header && + GST_CLOCK_TIME_IS_VALID (parse->priv->next_dts)) { + GST_BUFFER_DTS (buffer) = parse->priv->next_dts; + } + if (!GST_BUFFER_DURATION_IS_VALID (buffer) && !is_header && + GST_CLOCK_TIME_IS_VALID (parse->priv->frame_duration)) { + GST_BUFFER_DURATION (buffer) = parse->priv->frame_duration; } return GST_FLOW_OK; }