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

rpicamsrc: Improve timeout error

Browse Source 
Propagate timeout errors so they're not reported
generically
This commit is contained in:
Jan Schmidt 2018-07-16 19:30:26 +10:00 committed by Tim-Philipp Müller
parent 41f41f1fdd
commit c907deb15f
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/rpicamsrc/RaspiCapture.c
View File

@ -942,7 +942,7 @@ raspi_capture_fill_buffer(RASPIVID_STATE *state, GstBuffer **bufp,
buffer = mmal_queue_timedwait(state->encoded_buffer_q, 500); buffer = mmal_queue_timedwait(state->encoded_buffer_q, 500);
if (G_UNLIKELY(buffer == NULL)) { if (G_UNLIKELY(buffer == NULL)) {
return GST_FLOW_ERROR; return GST_FLOW_ERROR_TIMEOUT;
} }
if (G_LIKELY (config->useSTC && clock)) { if (G_LIKELY (config->useSTC && clock)) {

2
sys/rpicamsrc/RaspiCapture.h
View File

@ -66,6 +66,8 @@ GST_DEBUG_CATEGORY_EXTERN (gst_rpi_cam_src_debug);
#undef vcos_log_warn #undef vcos_log_warn
#define vcos_log_warn GST_WARNING #define vcos_log_warn GST_WARNING
#define GST_FLOW_ERROR_TIMEOUT GST_FLOW_CUSTOM_ERROR
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum typedef enum

7
sys/rpicamsrc/gstrpicamsrc.c
View File

@ -1439,6 +1439,13 @@ gst_rpi_cam_src_create (GstPushSrc * parent, GstBuffer ** buf)
GST_BUFFER_DURATION (*buf) = src->duration; GST_BUFFER_DURATION (*buf) = src->duration;
} }
if (ret == GST_FLOW_ERROR_TIMEOUT) {
GST_ELEMENT_ERROR (src, STREAM, FAILED,
("Camera capture timed out."),
("Waiting for a buffer from the camera took too long."));
ret = GST_FLOW_ERROR;
}
if (clock) if (clock)
gst_object_unref (clock); gst_object_unref (clock);
return ret; return ret;