FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] Fix deadlock on invalid timestamp error

Browse Source 
20080428223606-3e2dc-963e48b33efaf84c16d4ec4b789a6dfb2d9358ad.gz
This commit is contained in:
Olivier Crete 2008-04-28 22:36:06 +00:00 committed by Edward Hervey
parent 72efe4c3d7
commit 89566bfc8a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gst/liveadder/liveadder.c
View File

@ -798,13 +798,8 @@ gst_live_live_adder_chain (GstPad *pad, GstBuffer *buffer)
goto out; goto out;
} }
if (!GST_BUFFER_TIMESTAMP_IS_VALID(buffer)) { if (!GST_BUFFER_TIMESTAMP_IS_VALID(buffer))
GST_ELEMENT_ERROR (adder, STREAM, FAILED, goto invalid_timestamp;
("Buffer without a valid timestamp received"), (""));
ret = GST_FLOW_ERROR;
gst_buffer_unref (buffer);
goto out;
}
/* Just see if we receive invalid timestamp/durations */ /* Just see if we receive invalid timestamp/durations */
if (GST_CLOCK_TIME_IS_VALID (padprivate->expected_timestamp) && if (GST_CLOCK_TIME_IS_VALID (padprivate->expected_timestamp) &&
@ -972,6 +967,16 @@ gst_live_live_adder_chain (GstPad *pad, GstBuffer *buffer)
gst_object_unref (adder); gst_object_unref (adder);
return ret; return ret;
invalid_timestamp:
GST_OBJECT_UNLOCK (adder);
gst_buffer_unref (buffer);
GST_ELEMENT_ERROR (adder, STREAM, FAILED,
("Buffer without a valid timestamp received"),
("Invalid timestamp received on buffer"));
return GST_FLOW_ERROR;
} }
/* /*