mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 07:38:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "baseparse: simplify code a bit"

Browse source 
This reverts commit 921816400b.
This commit is contained in:
Thiago Santos 2015-11-19 00:51:30 -03:00
parent d5c86cde30
commit b4a05af66f
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libs/gst/base/gstbaseparse.c
View file

@ -980,21 +980,19 @@ static GstFlowReturn
gst_base_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame) gst_base_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
{ {
GstBuffer *buffer = frame->buffer; 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_PTS_IS_VALID (buffer) && !is_header &&
if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_HEADER)) { GST_CLOCK_TIME_IS_VALID (parse->priv->next_pts)) {
if (!GST_BUFFER_PTS_IS_VALID (buffer) && GST_BUFFER_PTS (buffer) = parse->priv->next_pts;
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)) {
if (!GST_BUFFER_DTS_IS_VALID (buffer) && GST_BUFFER_DTS (buffer) = parse->priv->next_dts;
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)) {
if (!GST_BUFFER_DURATION_IS_VALID (buffer) && GST_BUFFER_DURATION (buffer) = parse->priv->frame_duration;
GST_CLOCK_TIME_IS_VALID (parse->priv->frame_duration)) {
GST_BUFFER_DURATION (buffer) = parse->priv->frame_duration;
}
} }
return GST_FLOW_OK; return GST_FLOW_OK;
} }