mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 02:00:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

motioncells: improve logging

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=730141
This commit is contained in:
Nicola Murino 2014-05-20 07:34:56 +02:00 committed by Thiago Santos
parent f48358636b
commit 845d33098a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/opencv/MotionCells.cpp
View file

@ -200,7 +200,6 @@ MotionCells::performDetectionMotionCells (IplImage * p_frame,
if (motionmaskcells_count > 0) if (motionmaskcells_count > 0)
performMotionMask (motionmaskcellsidx, motionmaskcells_count); performMotionMask (motionmaskcellsidx, motionmaskcells_count);
if (getIsNonZero (m_pbwImage)) { //detect Motion if (getIsNonZero (m_pbwImage)) { //detect Motion
GST_DEBUG ("DETECT MOTION \n");
if (m_MotionCells.size () > 0) //it contains previous motioncells what we used when frames dropped if (m_MotionCells.size () > 0) //it contains previous motioncells what we used when frames dropped
m_MotionCells.clear (); m_MotionCells.clear ();
if (transparencyimg) if (transparencyimg)

9
ext/opencv/gstmotioncells.c
View file

@ -992,7 +992,8 @@ gst_motion_cells_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
gst_element_post_message (GST_ELEMENT (filter), m); gst_element_post_message (GST_ELEMENT (filter), m);
filter->sent_save_error_msg = TRUE; filter->sent_save_error_msg = TRUE;
} }
if (success == -2) { //frame dropped if (success == -2) {
GST_LOG_OBJECT (filter, "frame dropped");
gst_buffer_unmap (buf, &info); gst_buffer_unmap (buf, &info);
filter->prev_buff_timestamp = filter->cur_buff_timestamp; filter->prev_buff_timestamp = filter->cur_buff_timestamp;
//free //free
@ -1023,6 +1024,7 @@ gst_motion_cells_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
&& (filter->consecutive_motion >= minimum_motion_frames)) { && (filter->consecutive_motion >= minimum_motion_frames)) {
GstStructure *s; GstStructure *s;
GstMessage *m; GstMessage *m;
GST_DEBUG_OBJECT (filter, "motion started, post msg on the bus");
filter->previous_motion = TRUE; filter->previous_motion = TRUE;
filter->motion_begin_timestamp = GST_BUFFER_TIMESTAMP (buf); filter->motion_begin_timestamp = GST_BUFFER_TIMESTAMP (buf);
s = gst_structure_new ("motion", "motion_cells_indices", s = gst_structure_new ("motion", "motion_cells_indices",
@ -1033,6 +1035,7 @@ gst_motion_cells_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
} else if (filter->postallmotion) { } else if (filter->postallmotion) {
GstStructure *s; GstStructure *s;
GstMessage *m; GstMessage *m;
GST_DEBUG_OBJECT (filter, "motion, post msg on the bus");
filter->motion_timestamp = GST_BUFFER_TIMESTAMP (buf); filter->motion_timestamp = GST_BUFFER_TIMESTAMP (buf);
s = gst_structure_new ("motion", "motion_cells_indices", s = gst_structure_new ("motion", "motion_cells_indices",
G_TYPE_STRING, detectedmotioncells, "motion", G_TYPE_UINT64, G_TYPE_STRING, detectedmotioncells, "motion", G_TYPE_UINT64,
@ -1054,10 +1057,10 @@ gst_motion_cells_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
filter->last_motion_timestamp) / 1000000000l) >= filter->last_motion_timestamp) / 1000000000l) >=
filter->gap) filter->gap)
&& (filter->last_motion_timestamp > 0)) { && (filter->last_motion_timestamp > 0)) {
GST_DEBUG ("POST MOTION FINISHED MSG\n");
if (filter->previous_motion) { if (filter->previous_motion) {
GstStructure *s; GstStructure *s;
GstMessage *m; GstMessage *m;
GST_DEBUG_OBJECT (filter, "motion finished, post msg on the bus");
filter->previous_motion = FALSE; filter->previous_motion = FALSE;
s = gst_structure_new ("motion", "motion_finished", G_TYPE_UINT64, s = gst_structure_new ("motion", "motion_finished", G_TYPE_UINT64,
filter->last_motion_timestamp, NULL); filter->last_motion_timestamp, NULL);
@ -1071,7 +1074,7 @@ gst_motion_cells_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
if ((last_buf_timestamp - if ((last_buf_timestamp -
(filter->last_motion_timestamp / 1000000000l)) >= (filter->last_motion_timestamp / 1000000000l)) >=
filter->postnomotion) { filter->postnomotion) {
GST_DEBUG ("POST NO MOTION MSG\n"); GST_DEBUG_OBJECT (filter, "post no motion msg on the bus");
if ((last_buf_timestamp - if ((last_buf_timestamp -
(filter->last_nomotion_notified / 1000000000l)) >= (filter->last_nomotion_notified / 1000000000l)) >=
filter->postnomotion) { filter->postnomotion) {