Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix segment handling in interpipesrc #98

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Fix segment handling in interpipesrc #98

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3064a06
Fix restart-ts for multiple listeners
mariannasb Aug 4, 2021
2fdcbd8
Merge pull request #1 from mariannasb/restart-ts-patch
mariannasb Aug 4, 2021
4d78cba
Fix event queue handling
mariannasb Aug 6, 2021
dba90fc
Merge pull request #2 from mariannasb/event-queue-fix
mariannasb Aug 6, 2021
b261bf6
Fix segment handling in interpipesrc
mariannasb Aug 9, 2021
7d09a3a
Merge pull request #3 from mariannasb/segment-handling-patch
mariannasb Aug 9, 2021
ccbcb49
Fix event timestamp calculation
mariannasb Aug 10, 2021
afda5ae
Merge pull request #4 from mariannasb/event-timestamp-patch
mariannasb Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions gst/interpipe/gstinterpipesrc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,14 @@ gst_inter_pipe_src_create (GstBaseSrc * base, guint64 offset, guint size,
"Dequeue buffer %p with timestamp (PTS) %" GST_TIME_FORMAT, *buf,
GST_TIME_ARGS (GST_BUFFER_PTS (*buf)));

if (!g_queue_is_empty (src->pending_serial_events)) {
while (!g_queue_is_empty (src->pending_serial_events)) {
guint curr_bytes;
/*Pending Serial Events Queue */
serial_event = g_queue_peek_head (src->pending_serial_events);

GST_DEBUG_OBJECT (src,
"Got event with timestamp %" GST_TIME_FORMAT,
"Got event %s with timestamp %" GST_TIME_FORMAT,
GST_EVENT_TYPE_NAME (serial_event),
GST_TIME_ARGS (GST_EVENT_TIMESTAMP (serial_event)));

curr_bytes = gst_app_src_get_current_level_bytes (GST_APP_SRC (src));
Expand All @@ -490,11 +491,27 @@ gst_inter_pipe_src_create (GstBaseSrc * base, guint64 offset, guint size,
GST_EVENT_TYPE_NAME (serial_event));

serial_event = g_queue_pop_head (src->pending_serial_events);
gst_pad_push_event (srcpad, serial_event);

if (GST_EVENT_TYPE (serial_event) == GST_EVENT_SEGMENT) {
const GstSegment *segment = NULL;

gst_event_parse_segment (serial_event, &segment);
g_assert (segment != NULL);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for runtime errors, this project uses GST_ERROR_OBJECT instead of assertions

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


GST_DEBUG_OBJECT (src,
"Update new segment %" GST_PTR_FORMAT, serial_event);
if (!gst_base_src_new_segment (base, segment)) {
GST_ERROR_OBJECT (src,
"Couldn't set new segment %" GST_PTR_FORMAT, serial_event);
}
} else {
gst_pad_push_event (srcpad, serial_event);
}
} else {
GST_DEBUG_OBJECT (src, "Event %s timestamp is greater than the "
"buffer timestamp, can't send serial event yet",
GST_EVENT_TYPE_NAME (serial_event));
break;
}
}

Expand Down Expand Up @@ -671,6 +688,7 @@ gst_inter_pipe_src_push_buffer (GstInterPipeIListener * iface,
GST_TIME_ARGS (GST_BUFFER_PTS (buffer)));
} else if (GST_INTER_PIPE_SRC_RESTART_TIMESTAMP == src->stream_sync) {
/* Remove the incoming timestamp to be generated according this basetime */
buffer = gst_buffer_make_writable (buffer);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove this change from this pull request this corresponds to a different fix

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

GST_BUFFER_PTS (buffer) = GST_CLOCK_TIME_NONE;
GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
}
Expand Down Expand Up @@ -719,8 +737,11 @@ gst_inter_pipe_src_push_event (GstInterPipeIListener * iface, GstEvent * event,
srcbasetime = gst_element_get_base_time (GST_ELEMENT (appsrc));

if (srcbasetime > basetime) {
GST_EVENT_TIMESTAMP (event) =
GST_EVENT_TIMESTAMP (event) - (srcbasetime - basetime);
if (GST_EVENT_TIMESTAMP (event) > (srcbasetime - basetime))
GST_EVENT_TIMESTAMP (event) =
GST_EVENT_TIMESTAMP (event) - (srcbasetime - basetime);
else
GST_EVENT_TIMESTAMP (event) = 0;
Comment on lines +740 to +744
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove these changes from this pull request that correspond to a different fix

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix is now in #103

} else {
GST_EVENT_TIMESTAMP (event) =
GST_EVENT_TIMESTAMP (event) + (basetime - srcbasetime);
Expand Down